From e82a9ec37a1a7ba214da63ac8c9bdb1de4bcf6b5 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 28 Aug 2013 02:25:17 +0800 Subject: [PATCH] more less cleanup --- public/css/account.less | 18 ++++++ public/css/admin.less | 12 +++- public/css/style.less | 110 ++++++------------------------------ public/css/topic.less | 37 ++++++++++++ public/css/users.less | 23 ++++++++ public/templates/footer.tpl | 5 -- 6 files changed, 105 insertions(+), 100 deletions(-) create mode 100644 public/css/users.less diff --git a/public/css/account.less b/public/css/account.less index 8791302abb..0867d35720 100644 --- a/public/css/account.less +++ b/public/css/account.less @@ -66,3 +66,21 @@ font-size:20px; font-weight:bold; } + + + +.user-recent-posts { + div { + color: #333; + margin-bottom: 10px; + .pointer; + overflow:hidden; + p { + color: #333; + } + } + + span { + padding-top: 10px; + } +} diff --git a/public/css/admin.less b/public/css/admin.less index 125075967a..558305fafb 100644 --- a/public/css/admin.less +++ b/public/css/admin.less @@ -154,4 +154,14 @@ } } } -} \ No newline at end of file +} + + + +#admin-redis-info { + span { + display:inline-block; + width:220px; + } +} + diff --git a/public/css/style.less b/public/css/style.less index 858bc13265..4d0f58edc3 100644 --- a/public/css/style.less +++ b/public/css/style.less @@ -39,13 +39,23 @@ button, a { .block, .show { display: block; } + .badge { vertical-align: 17%; } -.nav .badge { - vertical-align: 2%; + +.bold { + font-weight: bold; } +a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { + text-decoration:none; +} + + + + + #alert_window { position: fixed; right: 20px; @@ -104,38 +114,6 @@ footer.footer { } } - -#thread_active_users { - float: right; - color: rgb(153,153,153); - - strong { - color: rgb(100,100,100); - font-weight: 600; - .pointer; - } -} - -.bold { - font-weight: bold; -} - -.user-recent-posts { - div { - color: #333; - margin-bottom: 10px; - .pointer; - overflow:hidden; - p { - color: #333; - } - } - span { - padding-top: 10px; - } -} - - .jumbotron { // goes into theme background: #56BCDA; @@ -144,33 +122,6 @@ footer.footer { word-wrap: break-word; } -#users-container { - padding: 0; -} -.users-box{ - display: inline-block; - margin-top: 20px; - text-align: center; - vertical-align: top; - max-width: 104px; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - - img { - width:80px; - height:80px; - } - - a { - margin:5px; - } -} - -a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { - text-decoration:none; -} - .formatting-bar { .no-select; @@ -193,38 +144,6 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { float:right; } -#admin-redis-info { - span { - display:inline-block; - width:220px; - } -} - -.post-signature { - color: #666; - font-size: 12px; - border-top: 1px solid #ddd; - display: inline-block; - - img { - max-width:200px; - max-height:60px; - } -} - -.username-field { - .icon-circle { - font-size: 12px; - color: green; - margin-right:3px; - } - .icon-circle-blank { - font-size: 12px; - color: red; - margin-right:3px; - } -} - #chat-content { width:95%; height:200px; @@ -236,7 +155,7 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { } #content{ - padding-bottom:20px; + padding-bottom:20px; } @@ -361,4 +280,7 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { margin-right: -11px; } +.nav .badge { + vertical-align: 2%; +} //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 277d8c74d8..2545262374 100644 --- a/public/css/topic.less +++ b/public/css/topic.less @@ -33,6 +33,16 @@ } .post-signature { + color: #666; + font-size: 12px; + border-top: 1px solid #ddd; + display: inline-block; + + img { + max-width:200px; + max-height:60px; + } + margin-left: 5px; } @@ -264,4 +274,31 @@ border-radius: 5px; padding: 0.5em; } +} + + +.username-field { + .icon-circle { + font-size: 12px; + color: green; + margin-right:3px; + } + .icon-circle-blank { + font-size: 12px; + color: red; + margin-right:3px; + } +} + + + +#thread_active_users { + float: right; + color: rgb(153,153,153); + + strong { + color: rgb(100,100,100); + font-weight: 600; + .pointer; + } } \ No newline at end of file diff --git a/public/css/users.less b/public/css/users.less new file mode 100644 index 0000000000..5f6b486ee4 --- /dev/null +++ b/public/css/users.less @@ -0,0 +1,23 @@ + +#users-container { + padding: 0; +} +.users-box{ + display: inline-block; + margin-top: 20px; + text-align: center; + vertical-align: top; + max-width: 104px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + + img { + width:80px; + height:80px; + } + + a { + margin:5px; + } +} diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl index dc5b688d6c..0a9c7a46c9 100644 --- a/public/templates/footer.tpl +++ b/public/templates/footer.tpl @@ -38,11 +38,6 @@ - -