Browse Source

Replaced GlyphIcons with Font Awesome in remaining views. #177

Rafał Pitoń 12 years ago
parent
commit
ec5152aa7f

+ 15 - 14
static/cranefly/css/cranefly.css

@@ -743,7 +743,8 @@ footer .container .credits p{margin-bottom:0;color:#555;font-size:90%}footer .co
 .navbar-header .navbar-inner .navbar-search-form .navbar-search-border>.extra .form-actions a:link,.navbar-header .navbar-inner .navbar-search-form .navbar-search-border>.extra .form-actions a:visited{margin-left:7px;position:relative;top:1px;color:#999;font-weight:bold}
 .navbar-header .navbar-inner .navbar-search-form .navbar-search-border>.extra .form-actions a:active,.navbar-header .navbar-inner .navbar-search-form .navbar-search-border>.extra .form-actions a:hover{color:#333}
 .navbar-header .navbar-inner .navbar-blocks{margin-left:6px}.navbar-header .navbar-inner .navbar-blocks li{margin-left:6px}.navbar-header .navbar-inner .navbar-blocks li form{margin:0;padding:0}
-.navbar-header .navbar-inner .navbar-blocks li a:link,.navbar-header .navbar-inner .navbar-blocks li a:visited,.navbar-header .navbar-inner .navbar-blocks li .btn-link{background-color:#f8f8f8;border:1px solid #dfdfdf;border-radius:3px;padding:5px 0;margin-top:9px;min-width:30px;color:#555;text-align:center}.navbar-header .navbar-inner .navbar-blocks li a:link .label,.navbar-header .navbar-inner .navbar-blocks li a:visited .label,.navbar-header .navbar-inner .navbar-blocks li .btn-link .label{background-color:#cf402e;margin-left:4px;padding-left:6px;padding-right:5px;position:relative;bottom:1px}
+.navbar-header .navbar-inner .navbar-blocks li a:link,.navbar-header .navbar-inner .navbar-blocks li a:visited,.navbar-header .navbar-inner .navbar-blocks li .btn-link{background-color:#f8f8f8;border:1px solid #dfdfdf;border-radius:3px;padding:5px 0;margin-top:9px;min-width:30px;color:#555;text-align:center}.navbar-header .navbar-inner .navbar-blocks li a:link.fluid,.navbar-header .navbar-inner .navbar-blocks li a:visited.fluid,.navbar-header .navbar-inner .navbar-blocks li .btn-link.fluid{padding:5px 8px}
+.navbar-header .navbar-inner .navbar-blocks li a:link .label,.navbar-header .navbar-inner .navbar-blocks li a:visited .label,.navbar-header .navbar-inner .navbar-blocks li .btn-link .label{background-color:#cf402e;margin-left:7px;padding-left:6px;padding-right:5px;position:relative;bottom:1px}
 .navbar-header .navbar-inner .navbar-blocks li a:hover,.navbar-header .navbar-inner .navbar-blocks li a:active,.navbar-header .navbar-inner .navbar-blocks li .btn-link:hover,.navbar-header .navbar-inner .navbar-blocks li .btn-link:active{background-color:#08c;border-color:#069;color:#fff;text-shadow:0 1px 1px #069}.navbar-header .navbar-inner .navbar-blocks li a:hover.danger,.navbar-header .navbar-inner .navbar-blocks li a:active.danger,.navbar-header .navbar-inner .navbar-blocks li .btn-link:hover.danger,.navbar-header .navbar-inner .navbar-blocks li .btn-link:active.danger{background-color:#cf402e;border-color:#a53325;text-shadow:0 1px 1px #a53325}
 .navbar-header .navbar-inner .navbar-blocks li a:hover.hot,.navbar-header .navbar-inner .navbar-blocks li a:active.hot,.navbar-header .navbar-inner .navbar-blocks li .btn-link:hover.hot,.navbar-header .navbar-inner .navbar-blocks li .btn-link:active.hot{background-color:#f89406;border-color:#c67605;text-shadow:0 1px 1px #c67605}
 .navbar-header .navbar-inner .navbar-blocks li a:hover.fresh,.navbar-header .navbar-inner .navbar-blocks li a:active.fresh,.navbar-header .navbar-inner .navbar-blocks li .btn-link:hover.fresh,.navbar-header .navbar-inner .navbar-blocks li .btn-link:active.fresh{background-color:#46a546;border-color:#378137;text-shadow:0 1px 1px #378137}
@@ -841,7 +842,7 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:.9;filter:alpha(opac
 .index-sidebar{position:relative;bottom:9px}
 .index-category{background-color:#fff;border:1px solid #d5d5d5;border-radius:2px;-webkit-box-shadow:0 0 0 3px #eee;-moz-box-shadow:0 0 0 3px #eee;box-shadow:0 0 0 3px #eee;margin-bottom:20px}.index-category .header{background-color:#fbfbfb;border:1px solid #d5d5d5;border-radius:2px 2px 0 0;margin:-1px;margin-bottom:0;padding:3.966666666666667px 9.9px}.index-category .header h2{margin:0;padding:0;color:#333;font-size:11.9px;font-weight:bold;line-height:20px;text-align:left}.index-category .header h2 small{margin-left:7px;color:#999;font-size:11.9px}
 .index-category .forum{border-bottom:1px solid #d5d5d5;height:21px;overflow:visible;padding:14.75px 9.9px}.index-category .forum.last{border-bottom:none}
-.index-category .forum .forum-icon{float:left;position:relative;bottom:1px;width:36px;color:#999;font-size:24px;text-align:center}.index-category .forum .forum-icon.forum-icon-new{color:#cf402e}
+.index-category .forum .forum-icon{float:left;position:relative;bottom:1px;width:36px;color:#e1e1e1;font-size:24px;text-align:center}.index-category .forum .forum-icon.forum-icon-new{color:#cf402e}
 .index-category .forum .forum-icon.forum-icon-redirect{color:#62bc62}
 .index-category .forum .forum-icon .icon-comment,.index-category .forum .forum-icon .icon-comment-alt{position:relative;bottom:3px}
 .index-category .forum .forum-main{margin-left:45.9px}.index-category .forum .forum-main h3{float:left;margin:0;padding:0;font-size:17.5px;font-weight:normal;line-height:20px}.index-category .forum .forum-main h3 a:link,.index-category .forum .forum-main h3 a:visited{color:#333}
@@ -897,8 +898,7 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:.9;filter:alpha(opac
 .forum-map-category.forum-map-category-info .header{background-color:#3c85a3;border:1px solid #2e677e}.forum-map-category.forum-map-category-info .header h2{color:#fff;text-shadow:0 1px 0 #1a3946}.forum-map-category.forum-map-category-info .header h2 small{color:#1a3946;text-shadow:none}
 .watched-threads .thread-last-reply{border-left:none !important;padding-left:0 !important}
 .watched-threads .thread-options{float:right;overflow:auto;position:relative;top:8px}.watched-threads .thread-options form{display:inline-block;float:left;margin:0;padding:0;overflow:auto}.watched-threads .thread-options form .btn{float:right;padding:3px 5px;padding-bottom:0;margin-left:16px}
-.user-alerts td{vertical-align:middle}.user-alerts td.alert-icon .label{background-color:#555;border:1px solid #2f2f2f;border-radius:3px;padding:4px;padding-top:3px}.user-alerts td.alert-icon .label i{background-image:url("../img/glyphicons-halflings-white.png")}
-.user-alerts td.alert-icon .label.label-warning{background-color:#cf402e;border:1px solid #902d20}
+.user-alerts td{vertical-align:middle}.user-alerts td.alert-icon{color:#e1e1e1;font-size:17.5px}.user-alerts td.alert-icon.alert-new{color:#cf402e}
 .user-alerts td.alert-message{color:#555;font-size:16.8px}.user-alerts td.alert-message a:link,.user-alerts td.alert-message a:visited{color:#333;font-weight:bold}
 .user-alerts td.alert-date{color:#999;text-align:right}
 .news-feed .media{overflow:auto}.news-feed .media .media-object{border-radius:3px;width:52px;height:52px}
@@ -907,9 +907,10 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:.9;filter:alpha(opac
 .news-feed hr{border:none;border-top:1px solid #eee;margin:20px 0}
 .category-forums-list{background-color:#fff;border:1px solid #d5d5d5;border-radius:2px;-webkit-box-shadow:0 0 0 3px #eee;-moz-box-shadow:0 0 0 3px #eee;box-shadow:0 0 0 3px #eee;margin-bottom:20px}.category-forums-list .header{background-color:#fbfbfb;border:1px solid #d5d5d5;border-radius:2px 2px 0 0;margin:-1px;margin-bottom:0;padding:3.966666666666667px 9.9px}.category-forums-list .header h2{margin:0;padding:0;color:#333;font-size:11.9px;font-weight:bold;line-height:20px;text-align:left}.category-forums-list .header h2 small{margin-left:7px;color:#999;font-size:11.9px}
 .category-forums-list .forum{border-bottom:1px solid #d5d5d5;height:21px;overflow:visible;padding:14.75px 9.9px}.category-forums-list .forum.last{border-bottom:none}
-.category-forums-list .forum .forum-icon{float:left}.category-forums-list .forum .forum-icon .forum-icon-wrap{background-color:#555;border:1px solid #3b3b3b;border-radius:3px;padding:1px 4px;position:relative;bottom:2px}.category-forums-list .forum .forum-icon .forum-icon-wrap.forum-icon-new{background-color:#cf402e;border:1px solid #a53325}
-.category-forums-list .forum .forum-icon .forum-icon-wrap.forum-icon-redirect{background-color:#62bc62;border:1px solid #46a546}
-.category-forums-list .forum .forum-main{margin-left:34px}.category-forums-list .forum .forum-main h3{float:left;margin:0;padding:0;font-size:17.5px;font-weight:normal;line-height:20px}.category-forums-list .forum .forum-main h3 a:link,.category-forums-list .forum .forum-main h3 a:visited{color:#333}
+.category-forums-list .forum .forum-icon{float:left;position:relative;bottom:1px;width:36px;color:#e1e1e1;font-size:24px;text-align:center}.category-forums-list .forum .forum-icon.forum-icon-new{color:#cf402e}
+.category-forums-list .forum .forum-icon.forum-icon-redirect{color:#62bc62}
+.category-forums-list .forum .forum-icon .icon-comment,.category-forums-list .forum .forum-icon .icon-comment-alt{position:relative;bottom:3px}
+.category-forums-list .forum .forum-main{margin-left:45.9px}.category-forums-list .forum .forum-main h3{float:left;margin:0;padding:0;font-size:17.5px;font-weight:normal;line-height:20px}.category-forums-list .forum .forum-main h3 a:link,.category-forums-list .forum .forum-main h3 a:visited{color:#333}
 .category-forums-list .forum .forum-main .dropdown{float:right;right:14px}.category-forums-list .forum .forum-main .dropdown .subforum:link,.category-forums-list .forum .forum-main .dropdown .subforum:visited{color:#999;font-weight:bold}
 .category-forums-list .forum .forum-main .dropdown .subforum:hover,.category-forums-list .forum .forum-main .dropdown .subforum:active{color:#333}
 .category-forums-list .forum .forum-main .dropdown .dropdown-toggle{padding:4px 8px;opacity:.6;filter:alpha(opacity=60);color:#333;font-weight:bold}.category-forums-list .forum .forum-main .dropdown .dropdown-toggle:hover,.category-forums-list .forum .forum-main .dropdown .dropdown-toggle:active,.category-forums-list .forum .forum-main .dropdown .dropdown-toggle:focus{opacity:1;filter:alpha(opacity=100);text-decoration:none}
@@ -941,9 +942,10 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:.9;filter:alpha(opac
 .user-profile .content-list .media .media-body .media-footer{margin:0;color:#999;font-size:10.5px;font-weight:normal}.user-profile .content-list .media .media-body .media-footer a{color:#555}
 .forum-subforums-list{background-color:#fff;border:1px solid #d5d5d5;border-radius:2px;-webkit-box-shadow:0 0 0 3px #eee;-moz-box-shadow:0 0 0 3px #eee;box-shadow:0 0 0 3px #eee;margin-bottom:20px}.forum-subforums-list .header{background-color:#fbfbfb;border:1px solid #d5d5d5;border-radius:2px 2px 0 0;margin:-1px;margin-bottom:0;padding:3.966666666666667px 9.9px}.forum-subforums-list .header h2{margin:0;padding:0;color:#333;font-size:11.9px;font-weight:bold;line-height:20px;text-align:left}.forum-subforums-list .header h2 small{margin-left:7px;color:#999;font-size:11.9px}
 .forum-subforums-list .forum{border-bottom:1px solid #d5d5d5;height:21px;overflow:visible;padding:14.75px 9.9px}.forum-subforums-list .forum.last{border-bottom:none}
-.forum-subforums-list .forum .forum-icon{float:left}.forum-subforums-list .forum .forum-icon .forum-icon-wrap{background-color:#555;border:1px solid #3b3b3b;border-radius:3px;padding:1px 4px;position:relative;bottom:2px}.forum-subforums-list .forum .forum-icon .forum-icon-wrap.forum-icon-new{background-color:#cf402e;border:1px solid #a53325}
-.forum-subforums-list .forum .forum-icon .forum-icon-wrap.forum-icon-redirect{background-color:#62bc62;border:1px solid #46a546}
-.forum-subforums-list .forum .forum-main{margin-left:34px}.forum-subforums-list .forum .forum-main h3{float:left;margin:0;padding:0;font-size:17.5px;font-weight:normal;line-height:20px}.forum-subforums-list .forum .forum-main h3 a:link,.forum-subforums-list .forum .forum-main h3 a:visited{color:#333}
+.forum-subforums-list .forum .forum-icon{float:left;position:relative;bottom:1px;width:36px;color:#e1e1e1;font-size:24px;text-align:center}.forum-subforums-list .forum .forum-icon.forum-icon-new{color:#cf402e}
+.forum-subforums-list .forum .forum-icon.forum-icon-redirect{color:#62bc62}
+.forum-subforums-list .forum .forum-icon .icon-comment,.forum-subforums-list .forum .forum-icon .icon-comment-alt{position:relative;bottom:3px}
+.forum-subforums-list .forum .forum-main{margin-left:45.9px}.forum-subforums-list .forum .forum-main h3{float:left;margin:0;padding:0;font-size:17.5px;font-weight:normal;line-height:20px}.forum-subforums-list .forum .forum-main h3 a:link,.forum-subforums-list .forum .forum-main h3 a:visited{color:#333}
 .forum-subforums-list .forum .forum-main .dropdown{float:right;right:14px}.forum-subforums-list .forum .forum-main .dropdown .subforum:link,.forum-subforums-list .forum .forum-main .dropdown .subforum:visited{color:#999;font-weight:bold}
 .forum-subforums-list .forum .forum-main .dropdown .subforum:hover,.forum-subforums-list .forum .forum-main .dropdown .subforum:active{color:#333}
 .forum-subforums-list .forum .forum-main .dropdown .dropdown-toggle{padding:4px 8px;opacity:.6;filter:alpha(opacity=60);color:#333;font-weight:bold}.forum-subforums-list .forum .forum-main .dropdown .dropdown-toggle:hover,.forum-subforums-list .forum .forum-main .dropdown .dropdown-toggle:active,.forum-subforums-list .forum .forum-main .dropdown .dropdown-toggle:focus{opacity:1;filter:alpha(opacity=100);text-decoration:none}
@@ -965,20 +967,19 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:.9;filter:alpha(opac
 .forum-threads-list .header .check-cell{padding:0}.forum-threads-list .header .check-cell label{margin:0}
 .forum-threads-list .thread-row{border-bottom:1px solid #d5d5d5;height:38px;overflow:hidden;padding:9.9px 0}.forum-threads-list .thread-row .row-fluid>div{min-height:auto;padding:2px 10px;padding-bottom:0}
 .forum-threads-list .thread-row.thread-last{border-bottom:none}.forum-threads-list .thread-row.thread-last>div{padding-bottom:1px}
-.forum-threads-list .thread-row .thread-icon{display:block;float:left;position:relative;bottom:2px;color:#999;font-size:22px}.forum-threads-list .thread-row .thread-icon:hover,.forum-threads-list .thread-row .thread-icon:active{color:#999;text-decoration:none}
+.forum-threads-list .thread-row .thread-icon{display:block;float:left;position:relative;bottom:2px;color:#e1e1e1;font-size:22px}.forum-threads-list .thread-row .thread-icon:hover,.forum-threads-list .thread-row .thread-icon:active{color:#e1e1e1;text-decoration:none}
 .forum-threads-list .thread-row.thread-new .thread-icon{color:#cf402e}
 .forum-threads-list .thread-row.thread-new .thread-name{color:#333 !important}
 .forum-threads-list .thread-row.threads-list-empty{height:auto;padding:11px 19px;font-size:17.5px;text-align:center}
 .forum-threads-list .thread-row .thread-name{margin-left:10px;color:#5e5e5e;font-size:16px;font-weight:bold}
 .forum-threads-list .thread-row .thread-details,.forum-threads-list .thread-row .thread-last-reply{color:#999;line-height:14px}.forum-threads-list .thread-row .thread-details a:link,.forum-threads-list .thread-row .thread-last-reply a:link,.forum-threads-list .thread-row .thread-details a:visited,.forum-threads-list .thread-row .thread-last-reply a:visited{color:#333}
 .forum-threads-list .thread-row .thread-details{margin-left:29px;font-size:10.5px}
-.forum-threads-list .thread-row .thread-flags{float:right;margin:0;position:relative;right:-30px;top:5px;padding:0}.forum-threads-list .thread-row .thread-flags li{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;display:block;float:left;margin-left:3px;padding:2px 5px}.forum-threads-list .thread-row .thread-flags li.flag-reported{background-color:#f89406}
+.forum-threads-list .thread-row .thread-flags{float:right;margin:0;position:relative;right:-30px;top:5px;padding:0}.forum-threads-list .thread-row .thread-flags li{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;display:block;float:left;margin-left:3px;padding:2px 5px;color:#fff}.forum-threads-list .thread-row .thread-flags li.flag-reported{background-color:#f89406}
 .forum-threads-list .thread-row .thread-flags li.flag-notreviewed{background-color:#7a43b6}
 .forum-threads-list .thread-row .thread-flags li.flag-announcement{background-color:#049cdb}
 .forum-threads-list .thread-row .thread-flags li.flag-sticky{background-color:#3c85a3}
 .forum-threads-list .thread-row .thread-flags li.flag-deleted{background-color:#333}
 .forum-threads-list .thread-row .thread-flags li.flag-closed{background-color:#cf402e}
-.forum-threads-list .thread-row .thread-flags i{background-image:url("../img/glyphicons-halflings-white.png")}
 .forum-threads-list .thread-row .thread-activity{border-left:1px dotted #e0e0e0;position:relative;bottom:3px}.forum-threads-list .thread-row .thread-activity .thread-last-avatar{float:left}.forum-threads-list .thread-row .thread-activity .thread-last-avatar img{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;margin:0;margin-right:14px;width:40px;height:40px}
 .forum-threads-list .thread-row .thread-activity .thread-replies{float:left;margin-top:-1px;margin-right:14px;color:#999;font-size:11.9px}.forum-threads-list .thread-row .thread-activity .thread-replies .lead{font-size:14px;font-weight:bold;line-height:20px}
 .forum-threads-list .thread-row .thread-activity .thread-replies a:link,.forum-threads-list .thread-row .thread-activity .thread-replies a:active,.forum-threads-list .thread-row .thread-activity .thread-replies a:visited,.forum-threads-list .thread-row .thread-activity .thread-replies a:hover{color:#555}
@@ -1050,7 +1051,7 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:.9;filter:alpha(opac
 .thread-participants .invite-participant form input{width:70%}
 .thread-participants .invite-participant form button{float:right}
 .post-votes-list .vote-user,.post-votes-list .vote-user:link,.post-votes-list .vote-user:visited{color:#555;font-size:17.5px;font-weight:bold}
-.post-votes-list .vote-user .vote-icon{background-color:#999;border-radius:3px;padding:2px 3px;position:relative;bottom:1.75px;font-size:14px}.post-votes-list .vote-user .vote-icon i{background-image:url("../img/glyphicons-halflings-white.png")}
+.post-votes-list .vote-user .vote-icon{background-color:#999;border-radius:3px;display:inline-block;padding:2px 3px;position:relative;bottom:1.75px;width:18px;color:#fff;font-size:14px;text-align:center}
 .post-votes-list a.vote-user:hover,.post-votes-list a.vote-user:active{color:#333;text-decoration:none}
 .post-votes-list .post-likes .vote-icon{background-color:#46a546}
 .post-votes-list .post-dislikes .vote-icon{background-color:#cf402e}

+ 1 - 1
static/cranefly/css/cranefly.less

@@ -63,7 +63,7 @@
 // Responsiveness
 @import "bootstrap/responsive-1200px-min.less";
 
-// Sora theme
+// Cranefly theme
 @import "cranefly/header.less";
 @import "cranefly/scaffolding.less";
 @import "cranefly/navbar.less";

+ 5 - 15
static/cranefly/css/cranefly/alerts.less

@@ -6,22 +6,12 @@
     vertical-align: middle;
 
     &.alert-icon {
-      .label {
-        background-color: @gray;
-        border: 1px solid darken(@gray, 15%);
-        border-radius: @baseBorderRadius;
-        padding: 4px;
-        padding-top: 3px;
+    	color: @itemOldColor;
+    	font-size: @fontSizeLarge;
 
-        i {
-          background-image: url("@{iconWhiteSpritePath}");
-        }
-
-        &.label-warning {
-          background-color: @red;
-          border: 1px solid darken(@red, 15%);
-        }
-      }
+    	&.alert-new {
+    		color: @itemNewColor;
+    	}
     }
 
     &.alert-message {

+ 18 - 17
static/cranefly/css/cranefly/category.less

@@ -47,29 +47,30 @@
 
     .forum-icon {
       float: left;
+    	position: relative;
+    	bottom: 1px;
+      width: @forumIconSize * 1.5;
 
-      .forum-icon-wrap {
-        background-color: @itemOldColor;
-        border: 1px solid darken(@itemOldColor, 10%);
-        border-radius: @baseBorderRadius;
-        padding: ((@forumIconSize - 22px) / 2) ((@forumIconSize - 16px) / 2);
-        position: relative;
-        bottom: (@forumIconSize - @baseLineHeight) / 2;
-
-        &.forum-icon-new {
-          background-color: @itemNewColor;
-          border: 1px solid darken(@itemNewColor, 10%);
-        }
+    	color: @itemOldColor;
+    	font-size: @forumIconSize;
+    	text-align: center;
 
-        &.forum-icon-redirect {
-          background-color: @itemMovedColor;
-          border: 1px solid darken(@itemMovedColor, 10%);
-        }
+      &.forum-icon-new {
+        color: @itemNewColor;
+      }
+
+      &.forum-icon-redirect {
+        color: @itemMovedColor;
+      }
+
+      .icon-comment, .icon-comment-alt {
+      	position: relative;
+      	bottom: 3px;
       }
     }
 
     .forum-main {
-      margin-left: @forumIconSize + 10px;
+      margin-left: (@forumIconSize * 1.5) + (@fontSizeSmall - 2px);
 
       h3 {
         float: left;

+ 22 - 23
static/cranefly/css/cranefly/forum.less

@@ -48,29 +48,30 @@
 
     .forum-icon {
       float: left;
+    	position: relative;
+    	bottom: 1px;
+      width: @forumIconSize * 1.5;
 
-      .forum-icon-wrap {
-        background-color: @itemOldColor;
-        border: 1px solid darken(@itemOldColor, 10%);
-        border-radius: @baseBorderRadius;
-        padding: ((@forumIconSize - 22px) / 2) ((@forumIconSize - 16px) / 2);
-        position: relative;
-        bottom: (@forumIconSize - @baseLineHeight) / 2;
-
-        &.forum-icon-new {
-          background-color: @itemNewColor;
-          border: 1px solid darken(@itemNewColor, 10%);
-        }
+    	color: @itemOldColor;
+    	font-size: @forumIconSize;
+    	text-align: center;
 
-        &.forum-icon-redirect {
-          background-color: @itemMovedColor;
-          border: 1px solid darken(@itemMovedColor, 10%);
-        }
+      &.forum-icon-new {
+        color: @itemNewColor;
+      }
+
+      &.forum-icon-redirect {
+        color: @itemMovedColor;
+      }
+
+      .icon-comment, .icon-comment-alt {
+      	position: relative;
+      	bottom: 3px;
       }
     }
 
     .forum-main {
-      margin-left: 34px;
+      margin-left: (@forumIconSize * 1.5) + (@fontSizeSmall - 2px);
 
       h3 {
         float: left;
@@ -374,11 +375,11 @@
       position: relative;
       bottom: 2px;
 
-      color: @grayLight;
+      color: @itemOldColor;
       font-size: @threadIconSize;
 
       &:hover, &:active {
-      	color: @grayLight;
+      	color: @itemOldColor;
       	text-decoration: none;
       }
     }
@@ -439,6 +440,8 @@
         margin-left: 3px;
         padding: 2px 5px;
 
+        color: @white;
+
         &.flag-reported {
           background-color: @flagReported;
         }
@@ -463,10 +466,6 @@
           background-color: @flagClosed;
         }
       }
-
-      i {
-        background-image: url("@{iconWhiteSpritePath}");
-      }
     }
 
     .thread-activity {

+ 1 - 1
static/cranefly/css/cranefly/index.less

@@ -59,7 +59,7 @@
     	bottom: 1px;
       width: @forumIconSize * 1.5;
 
-    	color: @grayLight;
+    	color: @itemOldColor;
     	font-size: @forumIconSize;
     	text-align: center;
 

+ 4 - 4
static/cranefly/css/cranefly/karmas.less

@@ -12,15 +12,15 @@
     .vote-icon {
       background-color: @grayLight;
       border-radius: @baseBorderRadius;
+      display: inline-block;
       padding: 2px 3px;
       position: relative;
       bottom: (@fontSizeLarge - @baseFontSize) / 2;
+      width: 18px;
 
+      color: @white;
       font-size: @baseFontSize;
-
-      i {
-        background-image: url("@{iconWhiteSpritePath}");
-      }
+      text-align: center;
     }
   }
 

+ 5 - 1
static/cranefly/css/cranefly/navbar.less

@@ -165,9 +165,13 @@
           color: @gray;
           text-align: center;
 
+          &.fluid {
+          	padding: 5px 8px;
+          }
+
           .label {
             background-color: @red;
-            margin-left: 4px;
+            margin-left: @baseFontSize / 2;
             padding-left: 6px;
             padding-right: 5px;
             position: relative;

+ 1 - 1
static/cranefly/css/variables.less

@@ -82,7 +82,7 @@
 
 // State icons styles
 // -------------------------
-@itemOldColor:                      @gray;
+@itemOldColor:                      darken(@grayLighter, 5%);
 @itemNewColor:                      @red;
 @itemMovedColor:                    lighten(@green, 10%);
 

+ 7 - 1
templates/cranefly/alerts.html

@@ -55,7 +55,13 @@ You have {{ alerts }} new alerts
     <tbody>
       {% for alert in alerts %}
       <tr>
-        <td class="alert-icon"><span class="label {% if alert.new %} label-warning{% endif %} tooltip-top" title="{% if alert.new %}{% trans %}New notification{% endtrans %}{% else %}{% trans %}Old notification{% endtrans %}{% endif %}"><i class="icon-fire"></i></label></td>
+        <td class="alert-icon{% if alert.new %} alert-new{% endif %}">
+          {% if alert.new %}
+          <i class="icon-star tooltip-top" title="{% trans %}New notification{% endtrans %}"></i>
+          {% else %}
+          <i class="icon-star-empty tooltip-top" title="{% trans %}Old notification{% endtrans %}"></i>
+          {% endif %}
+        </td>
         <td class="alert-message">{{ (_(alert.message) % alert.vars())|safe }}</td>
         <td class="alert-date">{{ alert.date|reltimesince }}</td>
       </tr>

+ 2 - 2
templates/cranefly/category.html

@@ -29,8 +29,8 @@
   <div id="subforums" class="category-forums-list{% if category.style %} category-forums-{{ category.style }}{% endif %}">
     {% for forum in category.subforums %}
     <div class="forum{% if loop.last %} last{% endif %}">
-      <div class="forum-icon">
-        <div class="forum-icon-wrap{% if forum.type == 'redirect' %} forum-icon-redirect{% elif not forum.is_read %} forum-icon-new{% endif %}"><i class="icon-{% if forum.type == 'redirect' %}circle-arrow-right{% else %}comments{% endif %}"></i></div>
+      <div class="forum-icon{% if forum.type == 'redirect' %} forum-icon-redirect{% elif not forum.is_read %} forum-icon-new{% endif %}">
+        <i class="icon-{% if forum.type == 'redirect' %}link{% elif not forum.is_read %}comment{% else %}comment-alt{% endif %}"></i>
       </div>
       <div id="forum-{{ forum.id }}" class="forum-main">
         <h3 class="forum-title{% if not forum.is_read %} forum-title-new{% endif %}"><a href="{{ url(forum.type, slug=forum.slug, forum=forum.id) }}">{{ forum.name }}</a></h3>

+ 8 - 8
templates/cranefly/layout.html

@@ -76,13 +76,13 @@
         <ul id="fancy-user-nav" class="nav navbar-blocks navbar-compact pull-right">
           {{ hook_user_menu_important_prepend|safe }}
           {% if acl.reports.can_handle() and monitor.reported_posts %}
-          <li><a href="{{ url('reports') }}" title="{% trans %}There are unresolved reports!{% endtrans %}" class="tooltip-bottom"><i class="icon-fire"></i><span class="label label-important">{{ monitor.reported_posts }}</span></a></li>
+          <li><a href="{{ url('reports') }}" title="{% trans %}There are unresolved reports!{% endtrans %}" class="tooltip-bottom fluid"><i class="icon-fire"></i><span class="label label-important">{{ monitor.reported_posts }}</span></a></li>
           {% endif %}
           {% if user.alerts %}
-          <li><a href="{{ url('alerts') }}" title="{% trans %}You have new notifications!{% endtrans %}" class="tooltip-bottom"><i class="icon-asterisk"></i><span class="label label-important">{{ user.alerts }}</span></a></li>
+          <li><a href="{{ url('alerts') }}" title="{% trans %}You have new notifications!{% endtrans %}" class="tooltip-bottom fluif"><i class="icon-asterisk"></i><span class="label label-important">{{ user.alerts }}</span></a></li>
           {% endif %}
           {% if settings.enable_private_threads and acl.private_threads.can_participate() and user.unread_pds %}
-          <li><a href="{{ url('private_threads') }}" title="{% trans %}There are unread Private Threads!{% endtrans %}" class="tooltip-bottom"><i class="icon-inbox"></i><span class="label label-important">{{ user.unread_pds }}</span></a></li>
+          <li><a href="{{ url('private_threads') }}" title="{% trans %}There are unread Private Threads!{% endtrans %}" class="tooltip-bottom fluid"><i class="icon-inbox"></i><span class="label label-important">{{ user.unread_pds }}</span></a></li>
           {% endif %}
           {{ hook_user_menu_important_append|safe }}
           <li class="user-profile dropdown">
@@ -110,12 +110,12 @@
         <noscript>
           <ul class="nav navbar-blocks pull-right">
             {{ hook_user_menu_prepend|safe }}
-            <li><a href="{{ url('alerts') }}" title="{% if user.alerts %}{% trans %}You have new notifications!{% endtrans %}{% else %}{% trans %}Your Notifications{% endtrans %}{% endif %}" class="tooltip-bottom"><i class="icon-asterisk"></i>{% if user.alerts %}<span class="label label-important">{{ user.alerts }}</span>{% endif %}</a></li>
+            <li><a href="{{ url('alerts') }}" title="{% if user.alerts %}{% trans %}You have new notifications!{% endtrans %}{% else %}{% trans %}Your Notifications{% endtrans %}{% endif %}" class="tooltip-bottom fluid"><i class="icon-asterisk"></i>{% if user.alerts %}<span class="label label-important">{{ user.alerts }}</span>{% endif %}</a></li>
             {% if acl.reports.can_handle() %}
-            <li><a href="{{ url('reports') }}" title="{% if monitor.reported_posts %}{% trans %}There are unresolved reports!{% endtrans %}{% else %}{% trans %}Reports{% endtrans %}{% endif %}" class="tooltip-bottom"><i class="icon-fire"></i>{% if monitor.reported_posts %}<span class="label label-important">{{ monitor.reported_posts }}</span>{% endif %}</a></li>
+            <li><a href="{{ url('reports') }}" title="{% if monitor.reported_posts %}{% trans %}There are unresolved reports!{% endtrans %}{% else %}{% trans %}Reports{% endtrans %}{% endif %}" class="tooltip-bottom fluid"><i class="icon-fire"></i>{% if monitor.reported_posts %}<span class="label label-important">{{ monitor.reported_posts }}</span>{% endif %}</a></li>
             {% endif %}
             {% if settings.enable_private_threads and acl.private_threads.can_participate() %}
-            <li><a href="{{ url('private_threads') }}" title="{% if user.unread_pds %}{% trans %}There are unread Private Threads!{% endtrans %}{% else %}{% trans %}Your Private Threads{% endtrans %}{% endif %}" class="tooltip-bottom"><i class="icon-inbox"></i>{% if user.unread_pds %}<span class="label label-important">{{ user.unread_pds }}</span>{% endif %}</a></li>
+            <li><a href="{{ url('private_threads') }}" title="{% if user.unread_pds %}{% trans %}There are unread Private Threads!{% endtrans %}{% else %}{% trans %}Your Private Threads{% endtrans %}{% endif %}" class="tooltip-bottom fluid"><i class="icon-inbox"></i>{% if user.unread_pds %}<span class="label label-important">{{ user.unread_pds }}</span>{% endif %}</a></li>
             {% endif %}
             <li><a href="{{ url('newsfeed') }}" title="{% trans %}Your News Feed{% endtrans %}" class="tooltip-bottom"><i class="icon-signal"></i></a></li>
             <li><a href="{{ url('watched_threads') }}" title="{% trans %}Threads you are watching{% endtrans %}" class="tooltip-bottom"><i class="icon-bookmark"></i></a></li>
@@ -128,8 +128,8 @@
         {% else %}
         <ul class="nav navbar-user-nav pull-right">
           {{ hook_guest_menu_prepend|safe }}
-          <li><a href="{{ url('sign_in') }}" title="{% trans %}Sign In to Your Account{% endtrans %}" class="tooltip-bottom btn btn-danger"><i class="icon-check"></i> {% trans %}Sign In{% endtrans %}</a></li>{% if settings.account_activation != 'block' %}
-          <li><a href="{{ url('register') }}" title="{% trans %}Register new account{% endtrans %}" class="tooltip-bottom btn btn-inverse"><i class="icon-edit"></i> {% trans %}Register{% endtrans %}</a></li>{% endif %}
+          <li><a href="{{ url('sign_in') }}" title="{% trans %}Sign In to Your Account{% endtrans %}" class="tooltip-bottom btn btn-danger">{% trans %}Sign In{% endtrans %}</a></li>{% if settings.account_activation != 'block' %}
+          <li><a href="{{ url('register') }}" title="{% trans %}Register new account{% endtrans %}" class="tooltip-bottom btn btn-inverse">{% trans %}Register{% endtrans %}</a></li>{% endif %}
           {{ hook_guest_menu_append|safe }}
         </ul>
         {% endif %}

+ 4 - 4
templates/cranefly/new_threads.html

@@ -27,15 +27,15 @@
       <div class="row-fluid">
         <div class="span7">
           {% if thread.is_read %}
-          <a href="{{ url('thread_new', thread=thread.pk, slug=thread.slug) }}" class="thread-icon thread-icon-last tooltip-top" title="{% trans %}Click to see last post{% endtrans %}"><i class="icon-asterisk"></i></a>
+          <a href="{{ url('thread_new', thread=thread.pk, slug=thread.slug) }}" class="thread-icon thread-icon-last tooltip-top" title="{% trans %}Click to see last post{% endtrans %}"><i class="icon-circle-blank"></i></a>
           {% else %}
-          <a href="{{ url('thread_new', thread=thread.pk, slug=thread.slug) }}" class="thread-icon thread-icon-new tooltip-top" title="{% trans %}Click to see first unread post{% endtrans %}"><i class="icon-fire"></i></a>
+          <a href="{{ url('thread_new', thread=thread.pk, slug=thread.slug) }}" class="thread-icon thread-icon-new tooltip-top" title="{% trans %}Click to see first unread post{% endtrans %}"><i class="icon-circle"></i></a>
           {% endif %}
 
           <a href="{{ url('thread', thread=thread.pk, slug=thread.slug) }}" class="thread-name">{{ thread.name }}</a>
 
           {{ macros.thread_flags(thread) }}
-          
+
           <div class="thread-details">
             {% trans user=thread_starter(thread), forum=thread_forum(thread), start=thread.start|reltimesince|low %}by {{ user }} in {{ forum }} {{ start }}{% endtrans %}
           </div>
@@ -57,7 +57,7 @@
             <strong class="lead">{{ thread_reply(thread) }}, {{ thread.last|reldate|low }}</strong><br>
             {{ replies(thread.replies) }}, <span{% if (thread.upvotes-thread.downvotes) > 0 %} class="text-success"{% elif (thread.upvotes-thread.downvotes) < 0 %} class="text-error"{% endif %}><strong>{% if (thread.upvotes-thread.downvotes) > 0 %}+{% elif (thread.upvotes-thread.downvotes) < 0 %}-{% endif %}</strong>{% trans rating=(thread.upvotes-thread.downvotes)|abs|intcomma %}{{ rating }} thread rating{% endtrans %}</span>
           </div>
-          
+
         </div>
       </div>
     </div>

+ 3 - 3
templates/cranefly/popular_threads.html

@@ -27,15 +27,15 @@
       <div class="row-fluid">
         <div class="span7">
           {% if thread.is_read %}
-          <a href="{{ url('thread_new', thread=thread.pk, slug=thread.slug) }}" class="thread-icon thread-icon-last tooltip-top" title="{% trans %}Click to see last post{% endtrans %}"><i class="icon-asterisk"></i></a>
+          <a href="{{ url('thread_new', thread=thread.pk, slug=thread.slug) }}" class="thread-icon thread-icon-last tooltip-top" title="{% trans %}Click to see last post{% endtrans %}"><i class="icon-circle-blank"></i></a>
           {% else %}
-          <a href="{{ url('thread_new', thread=thread.pk, slug=thread.slug) }}" class="thread-icon thread-icon-new tooltip-top" title="{% trans %}Click to see first unread post{% endtrans %}"><i class="icon-fire"></i></a>
+          <a href="{{ url('thread_new', thread=thread.pk, slug=thread.slug) }}" class="thread-icon thread-icon-new tooltip-top" title="{% trans %}Click to see first unread post{% endtrans %}"><i class="icon-circle"></i></a>
           {% endif %}
 
           {{ macros.thread_flags(thread) }}
 
           <a href="{{ url('thread', thread=thread.pk, slug=thread.slug) }}" class="thread-name">{{ thread.name }}</a>
-          
+
           <div class="thread-details">
             {% trans user=thread_starter(thread), forum=thread_forum(thread), start=thread.start|reltimesince|low %}by {{ user }} in {{ forum }} {{ start }}{% endtrans %}
           </div>

+ 14 - 10
templates/cranefly/threads/karmas.html

@@ -29,12 +29,12 @@
 <div class="container container-primary">
   <div class="post-votes-list">
     <div class="post-likes">
-      <h2>{% trans count=upvotes|length, votes=upvotes|length|intcomma -%}
+      {% if upvotes %}
+      <h2 class="text-success"><i class="icon-thumbs-up-alt"></i> {% trans count=upvotes|length, votes=upvotes|length|intcomma -%}
         One like
         {%- pluralize -%}
         {{ votes }} likes
         {%- endtrans %}</h2>
-      {% if upvotes %}
       <table class="table table-striped">
         <tbody>
           {% for row in upvotes|batch(4, '') %}
@@ -42,7 +42,7 @@
             {% for vote in row %}
             <td class="span3">
               {% if vote %}
-              {{ vote_details(vote, 'thumbs-up') }}
+              {{ vote_details(vote) }}
               {% else %}
               &nbsp;
               {% endif %}
@@ -53,19 +53,19 @@
         </tbody>
       </table>
       {% else %}
-      <p class="lead">{% trans %}Nobody liked this post.{% endtrans %}</p>
+      <p class="lead"><i class="icon-meh"></i> {% trans %}Nobody liked this post.{% endtrans %}</p>
       {% endif %}
     </div>
 
     <hr>
 
     <div class="post-dislikes">
-      <h2>{% trans count=downvotes|length, votes=downvotes|length|intcomma -%}
+      {% if downvotes %}
+      <h2 class="text-error"><i class="icon-thumbs-down-alt"></i> {% trans count=downvotes|length, votes=downvotes|length|intcomma -%}
         One dislike
         {%- pluralize -%}
         {{ votes }} dislikes
         {%- endtrans %}</h2>
-      {% if downvotes %}
       <table class="table table-striped">
         <tbody>
           {% for row in downvotes|batch(4, '') %}
@@ -73,7 +73,7 @@
             {% for vote in row %}
             <td class="span3">
               {% if vote %}
-              {{ vote_details(vote, 'thumbs-down') }}
+              {{ vote_details(vote) }}
               {% else %}
               &nbsp;
               {% endif %}
@@ -84,7 +84,7 @@
         </tbody>
       </table>
       {% else %}
-      <p class="lead">{% trans %}Nobody disliked this post.{% endtrans %}</p>
+      <p class="lead"><i class="icon-smile"></i> {% trans %}Nobody disliked this post.{% endtrans %}</p>
       {% endif %}
     </div>
   </div>
@@ -111,6 +111,10 @@
   </script>
 {% endblock %}
 
-{% macro vote_details(vote, icon) %}
-{% if vote.user_id %}<a href="{{ url('user', user=vote.user_id, username=vote.user_slug) }}" class="vote-user vote-{{ vote.pk }}"><span class="vote-icon"><i class="icon-{{ icon }}"></i></span> {{ vote.user_name }}</a>{% else %}<span class="vote-user vote-{{ vote.pk }}"><span class="vote-icon"><i class="icon-{{ icon }}"></i></span> {{ vote.user_name }}</span>{% endif %}
+{% macro vote_details(vote) %}
+{% if vote.user_id %}
+<a href="{{ url('user', user=vote.user_id, username=vote.user_slug) }}" class="vote-user vote-{{ vote.pk }}">{{ vote.user_name }}</a>
+{% else %}
+<span class="vote-user vote-{{ vote.pk }}">{{ vote.user_name }}</span>
+{% endif %}
 {% endmacro %}

+ 2 - 2
templates/cranefly/threads/list.html

@@ -35,8 +35,8 @@
     </div>
     {% for subforum in forum.subforums %}
     <div class="forum{% if loop.last %} last{% endif %}">
-      <div class="forum-icon">
-        <div class="forum-icon-wrap{% if subforum.type == 'redirect' %} forum-icon-redirect{% elif not subforum.is_read %} forum-icon-new{% endif %}"><i class="icon-{% if subforum.type == 'redirect' %}circle-arrow-right{% else %}comments{% endif %}"></i></div>
+      <div class="forum-icon{% if forum.type == 'redirect' %} forum-icon-redirect{% elif not forum.is_read %} forum-icon-new{% endif %}">
+        <i class="icon-{% if forum.type == 'redirect' %}link{% elif not forum.is_read %}comment{% else %}comment-alt{% endif %}"></i>
       </div>
       <div id="forum-{{ subforum.id }}" class="forum-main">
         <h3 class="forum-title{% if not subforum.is_read %} forum-title-new{% endif %}"><a href="{{ url(subforum.type, slug=subforum.slug, forum=subforum.id) }}">{{ subforum.name }}</a></h3>

+ 2 - 2
templates/cranefly/watched.html

@@ -39,9 +39,9 @@
       <div class="row-fluid">
         <div class="span7">
           {% if thread.is_read %}
-          <a href="{{ thread_url(thread, 'new') }}" class="thread-icon thread-icon-last tooltip-top" title="{% trans %}Click to see last post{% endtrans %}"><i class="icon-asterisk"></i></a>
+          <a href="{{ thread_url(thread, 'new') }}" class="thread-icon thread-icon-last tooltip-top" title="{% trans %}Click to see last post{% endtrans %}"><i class="icon-circle-blank"></i></a>
           {% else %}
-          <a href="{{ thread_url(thread, 'new') }}" class="thread-icon thread-icon-new tooltip-top" title="{% trans %}Click to see first unread post{% endtrans %}"><i class="icon-fire"></i></a>
+          <a href="{{ thread_url(thread, 'new') }}" class="thread-icon thread-icon-new tooltip-top" title="{% trans %}Click to see first unread post{% endtrans %}"><i class="icon-circle"></i></a>
           {% endif %}
 
           {{ macros.thread_flags(thread) }}