Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-11 16:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

more cleanup, account.less, removed mobile sidebar functionality completely

Browse Source
This commit is contained in:
psychobunny
2013-08-28 02:11:13 +08:00
parent 251beb7f9b
commit 7be69b0b54
9 changed files with 138 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/css/account.less Normal file
View File

@@ -0,0 +1,13 @@
.account {
.topic-row {
width: 100%;
}
}
.favourites {
.topic-row {
width: 100%;
margin-bottom: 10px;
}
}

15
public/css/header.less
View File

@@ -14,4 +14,19 @@
font-weight: 400; font-weight: 400;
color: #ded; 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;
} }

71
public/css/home.less
View File

@@ -74,4 +74,73 @@
&:hover { &:hover {
background: lighten(@color, 10%); background: lighten(@color, 10%);
} }
} }
@-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: */
}

3
public/css/nodebb.less
View File

@@ -4,4 +4,5 @@
@import "category"; @import "category";
@import "noscript"; @import "noscript";
@import "home"; @import "home";
@import "header"; @import "header";
@import "account";

163
public/css/style.less
View File

@@ -7,10 +7,10 @@ html {
body { body {
/*background: #fdfdfd;*/ // port to default theme when it is implemented. /*background: #fdfdfd;*/ // port to default theme when it is implemented.
-webkit-transition: margin-bottom 250ms ease; -webkit-transition: margin-bottom 250ms ease;
-moz-transition: margin-bottom 250ms ease; -moz-transition: margin-bottom 250ms ease;
-ms-transition: margin-bottom 250ms ease; -ms-transition: margin-bottom 250ms ease;
-o-transition: margin-bottom 250ms ease; -o-transition: margin-bottom 250ms ease;
transition: margin-bottom 250ms ease; transition: margin-bottom 250ms ease;
&.composing { &.composing {
margin-bottom: 350px; 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, .btn-none,
@@ -548,7 +531,14 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
} }
} }
#mobile-menu { #mobile-menu {
position: fixed;
bottom: 0px;
height: 50px;
background: #333;
width: 100%;
left: 0px;
button { button {
color: #eee; color: #eee;
padding: 10px; 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); background: rgba(0, 0, 0, 0.85);
position: fixed; position: fixed;
top: 0px; 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 { .category-box {
height:90px; height:90px;
@@ -645,75 +635,6 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
margin-bottom:15px; 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 // go into header
.search-result-post { .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; margin-right: -11px;
} }
//END: FIXES FOR BS3, may need to remove these when we get out of the RC releases //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;
}

16
public/css/topic.less
View File

@@ -248,4 +248,20 @@
font-weight: 300; font-weight: 300;
font-size: 16px; 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;
}
} }

54
public/src/app.js
View File

@@ -392,8 +392,6 @@ var socket,
} }
jQuery('document').ready(function() { jQuery('document').ready(function() {
addTouchEvents();
$('#search-form').on('submit', function() { $('#search-form').on('submit', function() {
var input = $(this).find('input'); var input = $(this).find('input');
ajaxify.go("search/"+input.val(), null, "search"); ajaxify.go("search/"+input.val(), null, "search");
@@ -407,56 +405,4 @@ var socket,
loadConfig(); 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();
});
}
}()); }());

2
public/templates/category.tpl
View File

@@ -60,7 +60,7 @@
<!-- END topics --> <!-- END topics -->
</ul> </ul>
</div> </div>
<div class="col-md-3 {show_sidebar} category-sidebar mobile-sidebar"> <div class="col-md-3 {show_sidebar} category-sidebar">
<div class="sidebar-block img-thumbnail"> <div class="sidebar-block img-thumbnail">
<div class="block-header"> <div class="block-header">

3
public/templates/footer.tpl
View File

@@ -28,9 +28,6 @@
<div id="alert_window"></div> <div id="alert_window"></div>
<!--<div id="mobile-sidebar"> disabling until this can be pluginified.
</div>-->
<!-- START Forum Info --> <!-- START Forum Info -->
<div id="footer" class="container" style="padding-top: 50px; display: none"> <div id="footer" class="container" style="padding-top: 50px; display: none">
<div class="alert alert-info"> <div class="alert alert-info">