diff --git a/public/css/account.less b/public/css/account.less new file mode 100644 index 0000000000..70be837f82 --- /dev/null +++ b/public/css/account.less @@ -0,0 +1,13 @@ + +.account { + .topic-row { + width: 100%; + } +} + +.favourites { + .topic-row { + width: 100%; + margin-bottom: 10px; + } +} diff --git a/public/css/header.less b/public/css/header.less index 9906dfad03..5f8dc5291b 100644 --- a/public/css/header.less +++ b/public/css/header.less @@ -14,4 +14,19 @@ font-weight: 400; color: #ded; } +} + + + +#pagination { + position: absolute; + background: rgb(34, 34, 34); + right: 0px; + top: 50px; + color: white; + padding: 10px; + padding-bottom: 5px; + padding-top: 5px; + font-size: 15px; + display: none; } \ No newline at end of file diff --git a/public/css/home.less b/public/css/home.less index 5cadae2f3d..cf176c8680 100644 --- a/public/css/home.less +++ b/public/css/home.less @@ -74,4 +74,73 @@ &:hover { background: lighten(@color, 10%); } -} \ No newline at end of file +} + +@-webkit-keyframes scroll-2 /* Safari and Chrome */ +{ + 0% {top: 0px;} + 25% {top: -90px;} + 50% {top: -180px;} + 75% {top: -270px;} + 100% {top: -360px;} +} + +@keyframes scroll-2 +{ + 0% {top: 0px;} + 25% {top: -90px;} + 50% {top: -180px;} + 75% {top: -270px;} + 100% {top: -360px;} +} + +@-webkit-keyframes scroll-1 /* Safari and Chrome */ +{ + 0% {top: 0px;} + 33% {top: -90px;} + 66% {top: -180px;} + 100% {top: -270px;} +} + +@keyframes scroll-1 +{ + 0% {top: 0px;} + 33% {top: -90px;} + 66% {top: -180px;} + 100% {top: -270px;} +} + +@-webkit-keyframes scroll-0 /* Safari and Chrome */ +{ + 0% {top: 0px;} + 50% {top: -90px;} + 100% {top: -180px;} +} + +@keyframes scroll-0 +{ + 0% {top: 0px;} + 50% {top: -90px;} + 100% {top: -180px;} +} + +.category-slider-2:hover { + position:relative; + + -webkit-animation: scroll-2 10s ease 0.5s infinite normal; + animation: scroll-2 10s ease 0.5s infinite normal;/* Safari and Chrome: */ +} + +.category-slider-1:hover { + position:relative; + + -webkit-animation: scroll-1 8s ease 0.5s infinite normal; + animation: scroll-1 8s ease 0.5s infinite normal;/* Safari and Chrome: */ +} + +.category-slider-0:hover { + position:relative; + + -webkit-animation: scroll-0 6s ease 0.5s infinite normal; + animation: scroll-0 6s ease 0.5s infinite normal;/* Safari and Chrome: */ +} diff --git a/public/css/nodebb.less b/public/css/nodebb.less index 91d14eecfd..d5f2c2ce82 100644 --- a/public/css/nodebb.less +++ b/public/css/nodebb.less @@ -4,4 +4,5 @@ @import "category"; @import "noscript"; @import "home"; -@import "header"; \ No newline at end of file +@import "header"; +@import "account"; \ No newline at end of file diff --git a/public/css/style.less b/public/css/style.less index c4783ca0d2..8bba9737dd 100644 --- a/public/css/style.less +++ b/public/css/style.less @@ -7,10 +7,10 @@ html { body { /*background: #fdfdfd;*/ // port to default theme when it is implemented. -webkit-transition: margin-bottom 250ms ease; - -moz-transition: margin-bottom 250ms ease; - -ms-transition: margin-bottom 250ms ease; - -o-transition: margin-bottom 250ms ease; - transition: margin-bottom 250ms ease; + -moz-transition: margin-bottom 250ms ease; + -ms-transition: margin-bottom 250ms ease; + -o-transition: margin-bottom 250ms ease; + transition: margin-bottom 250ms ease; &.composing { margin-bottom: 350px; @@ -494,23 +494,6 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { -#mobile-menu { - position: fixed; - bottom: 0px; - height: 50px; - background: #333; - width: 100%; - left: 0px; -} - -#mobile-menu, #mobile-menu-overlay { - z-index: 999; - - @media (min-width: 979px) - { - display: none !important; - } -} .btn-none, @@ -548,7 +531,14 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { } } + #mobile-menu { + position: fixed; + bottom: 0px; + height: 50px; + background: #333; + width: 100%; + left: 0px; button { color: #eee; padding: 10px; @@ -557,8 +547,16 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { } } -#mobile-menu-overlay { +#mobile-menu, #mobile-menu-overlay { + z-index: 999; + + @media (min-width: 979px) + { + display: none !important; + } +} +#mobile-menu-overlay { background: rgba(0, 0, 0, 0.85); position: fixed; top: 0px; @@ -611,14 +609,6 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { } } -#mobile-sidebar { - height: 100%; - position: absolute; - left: 100%; - top: 0px; - overflow: hidden; - margin-top: 60px; -} .category-box { height:90px; @@ -645,75 +635,6 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { margin-bottom:15px; } -@-webkit-keyframes scroll-2 /* Safari and Chrome */ -{ - 0% {top: 0px;} - 25% {top: -90px;} - 50% {top: -180px;} - 75% {top: -270px;} - 100% {top: -360px;} -} - -@keyframes scroll-2 -{ - 0% {top: 0px;} - 25% {top: -90px;} - 50% {top: -180px;} - 75% {top: -270px;} - 100% {top: -360px;} -} - -@-webkit-keyframes scroll-1 /* Safari and Chrome */ -{ - 0% {top: 0px;} - 33% {top: -90px;} - 66% {top: -180px;} - 100% {top: -270px;} -} - -@keyframes scroll-1 -{ - 0% {top: 0px;} - 33% {top: -90px;} - 66% {top: -180px;} - 100% {top: -270px;} -} - -@-webkit-keyframes scroll-0 /* Safari and Chrome */ -{ - 0% {top: 0px;} - 50% {top: -90px;} - 100% {top: -180px;} -} - -@keyframes scroll-0 -{ - 0% {top: 0px;} - 50% {top: -90px;} - 100% {top: -180px;} -} - -.category-slider-2:hover { - position:relative; - - -webkit-animation: scroll-2 10s ease 0.5s infinite normal; - animation: scroll-2 10s ease 0.5s infinite normal;/* Safari and Chrome: */ -} - -.category-slider-1:hover { - position:relative; - - -webkit-animation: scroll-1 8s ease 0.5s infinite normal; - animation: scroll-1 8s ease 0.5s infinite normal;/* Safari and Chrome: */ -} - -.category-slider-0:hover { - position:relative; - - -webkit-animation: scroll-0 6s ease 0.5s infinite normal; - animation: scroll-0 6s ease 0.5s infinite normal;/* Safari and Chrome: */ -} - // go into header .search-result-post { @@ -731,33 +652,6 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { } -.account { - .topic-row { - width: 100%; - } -} - -.favourites { - .topic-row { - width: 100%; - margin-bottom: 10px; - } -} - -//topic -.category-list { - li { - .inline-block; - .pointer; - padding: 0.5em 0; - text-align: center; - margin: 0.5em; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - padding: 0.5em; - } -} @@ -774,19 +668,4 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { margin-right: -11px; } -//END: FIXES FOR BS3, may need to remove these when we get out of the RC releases - - - -#pagination { - position: absolute; - background: rgb(34, 34, 34); - right: 0px; - top: 50px; - color: white; - padding: 10px; - padding-bottom: 5px; - padding-top: 5px; - font-size: 15px; - display: none; -} \ No newline at end of file +//END: FIXES FOR BS3, may need to remove these when we get out of the RC releases \ No newline at end of file diff --git a/public/css/topic.less b/public/css/topic.less index 439293892b..277d8c74d8 100644 --- a/public/css/topic.less +++ b/public/css/topic.less @@ -248,4 +248,20 @@ font-weight: 300; font-size: 16px; } +} + + + +.category-list { + li { + .inline-block; + .pointer; + padding: 0.5em 0; + text-align: center; + margin: 0.5em; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding: 0.5em; + } } \ No newline at end of file diff --git a/public/src/app.js b/public/src/app.js index 9f106bf30d..11341a9c78 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -392,8 +392,6 @@ var socket, } jQuery('document').ready(function() { - addTouchEvents(); - $('#search-form').on('submit', function() { var input = $(this).find('input'); ajaxify.go("search/"+input.val(), null, "search"); @@ -407,56 +405,4 @@ var socket, loadConfig(); - function addTouchEvents() { - return; // later. - - - // click simulation just for testing/sanity purposes. - - var el = jQuery("#content"), - sidebar = jQuery('#mobile-sidebar'), - width = el.width(); - - function onTouchMove(ev) { - var coordinates = window.event ? window.event.touches[0] : ev.touches[0]; - - el.css({ - marginLeft: -parseInt(width - coordinates.pageX) + 'px', - paddingRight: parseInt(width - coordinates.pageX) + 'px'}); - - sidebar.css({ - marginLeft: -parseInt(width - coordinates.pageX) + 'px', - width: parseInt(width - coordinates.pageX) + 'px' - }); - } - - function onMouseMove(ev) { - ev.touches = [{pageX: ev.pageX, pageY: ev.pageY}]; - onTouchMove(ev); - } - - function onTouchEnd() { - el.css({ - marginLeft: '0px', - paddingRight: '0px' - }); - - sidebar.css({ - marginLeft: '0px', - width: '0px' - }); - } - - el.on('touchmove', onTouchMove); - el.on('mousedown', function() { - el.on('mousemove', onMouseMove); - }); - - el.on('touchend', onTouchEnd); - el.on('mouseup', function() { - el.off('mousemove'); - onTouchEnd(); - }); - - } }()); diff --git a/public/templates/category.tpl b/public/templates/category.tpl index eaa4539820..5b6b272457 100644 --- a/public/templates/category.tpl +++ b/public/templates/category.tpl @@ -60,7 +60,7 @@ -
+
diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl index 2b34d205b4..dc5b688d6c 100644 --- a/public/templates/footer.tpl +++ b/public/templates/footer.tpl @@ -28,9 +28,6 @@
- -