From 933ac7b8fe7afd3e06ad54a1e0f96d915c6cbb50 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 9 Jan 2013 18:01:23 +0800 Subject: [PATCH] Ray's changes for icon css --- app/assets/stylesheets/item.css | 2 +- app/assets/stylesheets/style.css.erb | 26 +++++++++++++++----------- app/assets/stylesheets/widget.css | 2 +- app/assets/stylesheets/widgets.css | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/item.css b/app/assets/stylesheets/item.css index a71a3af1..bc5041e6 100644 --- a/app/assets/stylesheets/item.css +++ b/app/assets/stylesheets/item.css @@ -16,7 +16,7 @@ .item h3 { margin: 5px 0; } -.item h3 [class^="icons-"] { +.item h3 [class^="icon"] { margin: 3px 5px 0 3px; } .item .detail { diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index 00ee8e0a..733a8869 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -49,8 +49,10 @@ #main-sidebar #position span { color: #FFF; } -#main-sidebar #position [class^="icons"] { - color: #FFF; +#main-sidebar #position [class^="icon"] { + color: white; + font-size: 1.5em; + line-height: 1.5em; } #main-sidebar #position a { display: block; @@ -79,7 +81,7 @@ color: #CFCFCF; text-shadow: 0 -1px 0px rgba(36, 36, 36, 0.65); } -#main-sidebar #position #collapse-menu [class^="icon-"] { +#main-sidebar #position #collapse-menu [class^="icon"] { display: inline; } #main-sidebar #position a:hover { @@ -91,11 +93,11 @@ #main-sidebar .nav > li { margin: 1px 0; } -#main-sidebar .nav > li > a [class^="icons-"] { +#main-sidebar .nav > li > a [class^="icon"] { float: left; color: #333; } -#main-sidebar .nav > li.active > a [class^="icons-"] { +#main-sidebar .nav > li.active > a [class^="icon"] { opacity: 1; -moz-opacity: 1; filter:alpha(opacity=10); @@ -133,7 +135,7 @@ -webkit-box-shadow: inset -5px 0px 15px rgba(0, 0, 0, .15); -moz-box-shadow: inset -5px 0px 15px rgba(0, 0, 0, .15); } -#main-sidebar .overview > .nav > li:hover > a [class^="icons-"] { +#main-sidebar .overview > .nav > li:hover > a [class^="icon"] { color: #fff; } #main-sidebar .nav > li > .nav { @@ -156,7 +158,7 @@ #main-sidebar .nav > li > .nav > li { position: relative; } -#main-sidebar .nav > li > .nav > li [class^="icon-"] { +#main-sidebar .nav > li > .nav > li [class^="icon"] { position: absolute; color: #FFF; top: 4px; @@ -183,8 +185,8 @@ #main-sidebar .nav > li > .nav > li.active > a:hover { background-color: #6B6B6B; } -#main-sidebar .nav > li > .nav > li.active > a [class^="icon-"], -#main-sidebar .nav > li > .nav > li > a:hover [class^="icon-"] { +#main-sidebar .nav > li > .nav > li.active > a [class^="icon"], +#main-sidebar .nav > li > .nav > li > a:hover [class^="icon"] { display: block; } #main-wrap { @@ -543,8 +545,10 @@ width: 28px; white-space: nowrap; } -.folded #main-sidebar .nav > li > a [class^="icons-"] { +.folded #main-sidebar .nav > li > a [class^="icon"] { margin-left: 1px; + font-size: 1.5em; + line-height: 1.5em; } /*.folded #main-sidebar .viewport { width: 39px; @@ -629,7 +633,7 @@ #banner_tab li a { padding-right: 32px; } -#banner_tab li [class^="icons-"] { +#banner_tab li [class^="icon"] { float: right; margin-top: 8px; } diff --git a/app/assets/stylesheets/widget.css b/app/assets/stylesheets/widget.css index e99a5668..6181b32f 100644 --- a/app/assets/stylesheets/widget.css +++ b/app/assets/stylesheets/widget.css @@ -25,7 +25,7 @@ background-image: linear-gradient(top, #B7B7B7, #9d9d9d); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#B7B7B7', endColorstr='#9d9d9d', GradientType=0); } -.widget-box .widget-title [class^="icons-"] { +.widget-box .widget-title [class^="icon"] { margin: 3px 5px 0 2px; } .widget-box .widget-content { diff --git a/app/assets/stylesheets/widgets.css b/app/assets/stylesheets/widgets.css index aee09615..f4f72e9c 100644 --- a/app/assets/stylesheets/widgets.css +++ b/app/assets/stylesheets/widgets.css @@ -25,7 +25,7 @@ background-image: linear-gradient(top, #B7B7B7, #9d9d9d); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#B7B7B7', endColorstr='#9d9d9d', GradientType=0); } -.widget-box .widget-title [class^="icons-"] { +.widget-box .widget-title [class^="icon"] { margin: 3px 5px 0 2px; } .widget-box .widget-content {