From 7434d36e9b192fda3855c4bfdf918c140c2ea90a Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 9 Jan 2013 19:20:04 +0800 Subject: [PATCH] Ray's changes for icon size --- app/assets/stylesheets/orbit-bar.css.erb | 306 +++++++++++------------ app/assets/stylesheets/style.css.erb | 31 +-- 2 files changed, 169 insertions(+), 168 deletions(-) diff --git a/app/assets/stylesheets/orbit-bar.css.erb b/app/assets/stylesheets/orbit-bar.css.erb index 154f1158..5cebe273 100644 --- a/app/assets/stylesheets/orbit-bar.css.erb +++ b/app/assets/stylesheets/orbit-bar.css.erb @@ -1,234 +1,234 @@ - #orbit-bar { - margin-bottom: 0; + margin-bottom:0; position:fixed; width:100%; - z-index: 99; - top: 0; - left: 0; + z-index:99; + top:0; + left:0; } #orbit-bar .navbar-inner { - min-height: 28px; - height: 28px; - border: none; - -moz-border-radius: 0px; - -webkit-border-radius: 0px; - border-radius: 0px; - padding-top: 2px; - padding-bottom: 1px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset; - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset; - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset; - background-image: -moz-linear-gradient(top, #545b60, #191a1c); - background-image: -ms-linear-gradient(top, #545b60, #191a1c); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#545b60), to(#191a1c)); - background-image: -webkit-linear-gradient(top, #545b60, #191a1c); - background-image: -o-linear-gradient(top, #545b60, #191a1c); - background-image: linear-gradient(top, #545b60, #191a1c); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#545b60', endColorstr='#191a1c', GradientType=0); + min-height:28px; + height:28px; + border:none; + -moz-border-radius:0px; + -webkit-border-radius:0px; + border-radius:0px; + padding-top:2px; + padding-bottom:1px; + -webkit-box-shadow:0 1px 3px rgba(0,0,0,0.8),inset 0 1px 0 #7f95a5,0 -1px 0 #1f2024 inset; + -moz-box-shadow:0 1px 3px rgba(0,0,0,0.8),inset 0 1px 0 #7f95a5,0 -1px 0 #1f2024 inset; + box-shadow:0 1px 3px rgba(0,0,0,0.8),inset 0 1px 0 #7f95a5,0 -1px 0 #1f2024 inset; + background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#545b60), to(#191a1c)); + background-image:-webkit-linear-gradient(top, #545b60, #191a1c); + background-image:-moz-linear-gradient(top, #545b60, #191a1c); + background-image:-ms-linear-gradient(top, #545b60, #191a1c); + background-image:-o-linear-gradient(top, #545b60, #191a1c); + background-image:linear-gradient(top, #545b60, #191a1c); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#545b60', endColorstr='#191a1c', GradientType=0); } #orbit-bar .navbar-search { - left: 30px; - margin: 0; - position: absolute; - text-align: right; - top: -1px; - z-index: 0; - opacity: 0; - -moz-opacity: 0; + left:30px; + margin:0; + position:absolute; + text-align:right; + top:-1px; + z-index:0; + opacity:0; + -moz-opacity:0; filter:alpha(opacity=0); } #orbit-bar .nav.pull-right { - margin-right: -20px; + margin-right:-20px; } #orbit-bar .search-query { - padding: 7px 9px 5px; - height: 12px; - margin-top: 3px; - border: none; - line-height: 14px; - border-radius: 3px; + padding:7px 9px 5px; + height:12px; + margin-top:3px; + border:none; + line-height:14px; + border-radius:3px; } #orbit-bar .search-query:focus { - background-position: 5px 2px; + background-position:5px 2px; } #orbit-bar .container { width:100%; } #orbit-bar .orbit-logo .brand { - background: url(<%= asset_path 'orbit-bar.png' %>) no-repeat -162px -5px; + background:url(<%= asset_path 'orbit-bar.png' %>) no-repeat -162px -5px; text-indent:-9999px; - padding: 5px 20px 4px; + padding:5px 20px 4px; } #orbit-bar .orbit-logo .brand:hover { - background-color: rgba(0,157,220,1); + background-color:#009ddc; } #orbit-bar .orbit-logo.open .brand { - background-color: rgba(0,157,220,1); + background-color:#009ddc; } #orbit-bar .orbit-logo .dropdown-menu { - left: -15px; + left:-15px; } -#orbit-bar .nav > li { - height: 28px; -} -#orbit-bar .nav > li > a:hover { - background-color: rgba(0,157,220,1); -} -#orbit-bar .nav > li > a { - /*background-image: url(<%= asset_path 'orbit-bar.png' %>);*/ - background-repeat:no-repeat; - display: inline-block; - width: 17px; - height: 16px; - padding: 6px 6px 6px 5px; -} -#orbit-bar .nav > li > a[data-icon]:before { +#orbit-bar .dropdown-menu>li [class^="icon"], +#orbit-bar .dropdown-menu>li [class*=" icon"] { font-size: 1.5em; - color: #fff; - line-height: 16px; - text-shadow: none; + margin-right: 10px; } -#orbit-bar .nav > li.search { - overflow: hidden; - width: 28px; - position: relative; +#orbit-bar .nav>li { + height:28px; } -#orbit-bar .nav > li > a.orbit-bar-home { - background-position: -10px -10px; +#orbit-bar .nav>li>a:hover { + background-color:#009ddc; } -#orbit-bar .nav > li > a.orbit-bar-desktop { - background-position: -106px -9px; +#orbit-bar .nav>li>a { + background-repeat:no-repeat; + display:inline-block; + width:17px; + height:16px; + padding:6px 6px 6px 5px; } -#orbit-bar .nav > li > a.orbit-bar-member { - background-position: -4px -37px; +#orbit-bar .nav>li>a[data-icon]:before { + font-size:1.5em; + color:#fff; + line-height:16px; + text-shadow:none; } -#orbit-bar .nav > li > a.orbit-bar-member { - background-position: -10px -43px; +#orbit-bar .nav>li.search { + overflow:hidden; + width:28px; + position:relative; } -#orbit-bar .nav > li > a.orbit-bar-language { - background-position: -42px -42px; +#orbit-bar .nav>li>a.orbit-bar-home { + background-position:-10px -10px; } -#orbit-bar .nav > li > a.orbit-bar-search { - background-position: -75px -10px; - overflow: hidden; - position: absolute; - right: 0; - z-index: 1; +#orbit-bar .nav>li>a.orbit-bar-desktop { + background-position:-106px -9px; } -#orbit-bar .nav > li.language.open > a.orbit-bar-language { - background-color: rgba(0,157,220,1); +#orbit-bar .nav>li>a.orbit-bar-member { + background-position:-4px -37px; +} +#orbit-bar .nav>li>a.orbit-bar-member { + background-position:-10px -43px; +} +#orbit-bar .nav>li>a.orbit-bar-language { + background-position:-42px -42px; +} +#orbit-bar .nav>li>a.orbit-bar-search { + background-position:-75px -10px; + overflow:hidden; + position:absolute; + right:0; + z-index:1; +} +#orbit-bar .nav>li.language.open>a.orbit-bar-language { + background-color:#009ddc; } .language-menu .active { - color: #ffffff; - text-decoration: none; - background-color: #0088cc; + color:#ffffff; + text-decoration:none; + background-color:#0088cc; } -#orbit-bar .nav > li > a.orbit-bar-account { - background-image: none; - height: 22px; - padding: 3px; - text-indent: inherit; - min-width: 110px; - width: auto !important; - text-align: left; - color: #FFFFFF; - text-shadow: none; - background-color: rgba(0, 0, 0, 0.5); +#orbit-bar .nav>li>a.orbit-bar-account { + background-image:none; + height:22px; + padding:3px; + text-indent:inherit; + min-width:110px; + width:auto !important; + text-align:left; + color:#FFFFFF; + text-shadow:none; + background-color:rgba(0,0,0,0.5); } -#orbit-bar .nav > li > a.orbit-bar-account:hover { - background-color: #08C; +#orbit-bar .nav>li>a.orbit-bar-account:hover { + background-color:#08C; } #orbit-bar .nav span.member-name { - display: inline-block; - line-height: 22px; - padding: 0 10px; - vertical-align: top; + display:inline-block; + line-height:22px; + padding:0 10px; + vertical-align:top; } #orbit-bar .nav img.member-img { - display: inline-block; - max-width: 24px; - margin-top: -2px; + display:inline-block; + max-width:24px; + margin-top:-2px; } #orbit-bar .clear { - clear: none; + clear:none; } #orbit-bar .account-menu { - right: 5px; + right:5px; } -#orbit-bar .bar-login { - -} -#orbit-bar .bar-login .open, #orbit-bar .open .orbit-bar-account { - background-color: #009DDC; +#orbit-bar .bar-login .open,#orbit-bar .open .orbit-bar-account { + background-color:#009DDC; } #orbit-bar .bar-login .dropdown-menu { - padding: 0 0 10px; - max-width: 260px; + padding:0 0 10px; + max-width:260px; } #orbit-bar .bar-login .dropdown-menu .log { - margin: 10px 15px 0; - list-style: none outside none; + margin:10px 15px 0; + list-style:none outside none; } #orbit-bar .bar-login .dropdown-menu .log .title { - background: url(<%= asset_path 'sign-in-logo2.png' %>) no-repeat center center; - height: 70px; + background:url(<%= asset_path 'sign-in-logo2.png' %>) no-repeat center center; + height:70px; } #orbit-bar .bar-login .dropdown-menu .log form { - margin: 0 0 8px; + margin:0 0 8px; } #orbit-bar .bar-login .dropdown-menu .log input { - display: inline-block; - margin: 0; + display:inline-block; + margin:0; } #orbit-bar .bar-login .dropdown-menu .log .span2 { - width: 182px; + width:182px; } #orbit-bar .bar-login .dropdown-menu .log .forgot { - margin-bottom: 20px; - padding: 3px 0 0; - float: right; - display: inline-block; - color: #0088CC; + margin-bottom:20px; + padding:3px 0 0; + float:right; + display:inline-block; + color:#0088CC; } #orbit-bar .bar-login .dropdown-menu .log .input-prepend { - margin-top: 20px; + margin-top:20px; } #orbit-bar .bar-login .dropdown-menu .log .remember { - margin-top: 5px; + margin-top:5px; } #orbit-bar .bar-login .dropdown-menu .log .forgot:hover { - padding: 3px 0 0; - float: right; - display: inline-block; - color: #005580; - text-decoration: underline; - background-color: transparent; + padding:3px 0 0; + float:right; + display:inline-block; + color:#005580; + text-decoration:underline; + background-color:transparent; } #orbit-bar .bar-login .dropdown-menu .log .btn { - width: 220px; + width:220px; } #orbit-bar .bar-login .dropdown-menu .log .divider { position:relative; - overflow: inherit; - margin: 20px 0; + overflow:inherit; + margin:20px 0; } #orbit-bar .bar-login .dropdown-menu .log .divider span { - position: absolute; - width: 20px; - height: 20px; - background-color: #FFF; - color: #666; - top: -9px; - left: 100px; - font-size: 1.4em; - text-align: center; + position:absolute; + width:20px; + height:20px; + background-color:#FFF; + color:#666; + top:-9px; + left:100px; + font-size:1.4em; + text-align:center; } #orbit-bar .bar-login .dropdown-menu .register { - color: #FFFFFF; - margin: 0 15px; - width: 188px; + color:#FFFFFF; + margin:0 15px; + width:188px; } #orbit-bar .add-on i { - font-size: 12px; + font-size:12px; } \ No newline at end of file diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index 733a8869..d599b0c3 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -49,10 +49,11 @@ #main-sidebar #position span { color: #FFF; } -#main-sidebar #position [class^="icon"] { - color: white; +#main-sidebar #position>a [class^="icon"] { + color: #FFF; font-size: 1.5em; - line-height: 1.5em; + line-height: 2em; + margin-right: 10px; } #main-sidebar #position a { display: block; @@ -83,6 +84,7 @@ } #main-sidebar #position #collapse-menu [class^="icon"] { display: inline; + line-height: 3px; } #main-sidebar #position a:hover { text-decoration: none; @@ -96,6 +98,8 @@ #main-sidebar .nav > li > a [class^="icon"] { float: left; color: #333; + font-size: 1.5em; + line-height: 1.5em; } #main-sidebar .nav > li.active > a [class^="icon"] { opacity: 1; @@ -200,6 +204,11 @@ height: auto; min-height: 36px; } +#main-wrap .subnav .breadcrumb { + margin: 0; + border-bottom: 1px solid #DBDBDB; + border-radius: 0; +} #main-wrap .pagination { margin: 18px 0 0; text-align: center; @@ -455,14 +464,8 @@ .sign-in .error .help-inline { display:inline-block; } -.web-symbol:after { - font-family: 'WebSymbolsRegular'; - content: "{"; - margin-left: 2px; - margin-top: 8px; -} -.active .web-symbol:after { - content: "}"; +.active .icons-arrow-down-5:before { + content: "\e0cf"; } .img-peview { margin-left: 12px; @@ -545,11 +548,9 @@ width: 28px; white-space: nowrap; } -.folded #main-sidebar .nav > li > a [class^="icon"] { +/*.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; background-color: rgba(100,100,100,.3)