From aedab01ae69ac2d3dcd0444c9df4623e992c5a55 Mon Sep 17 00:00:00 2001 From: devin chen Date: Wed, 10 Apr 2013 12:08:26 +0800 Subject: [PATCH] minor update --- .../stylesheets/desktop/_desktop-helper.scss | 2 -- .../stylesheets/desktop/desktop-component.css | 2 +- .../desktop/desktop-component.scss | 2 +- .../stylesheets/desktop/desktop-main.css | 19 +++++-------------- .../stylesheets/desktop/desktop-main.scss | 16 ++++++++-------- 5 files changed, 15 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/desktop/_desktop-helper.scss b/app/assets/stylesheets/desktop/_desktop-helper.scss index fda67a86c..2b52ab42f 100644 --- a/app/assets/stylesheets/desktop/_desktop-helper.scss +++ b/app/assets/stylesheets/desktop/_desktop-helper.scss @@ -3,12 +3,10 @@ $gray: #ddd; @mixin font-main($font-size) { font-family: "Source Sans Pro", sans-serif; font-size: #{$font-size}px; - font-weight: 300; } @mixin font-sub($font-size) { font-family: "Source Sans Pro", Arial, sans-serif; font-size: #{$font-size}px; - font-weight: 300; } @mixin transition-type($property, $sec) { -webkit-transition: #{$property} #{$sec}s ease; diff --git a/app/assets/stylesheets/desktop/desktop-component.css b/app/assets/stylesheets/desktop/desktop-component.css index 0b1eaf886..9ad83872b 100644 --- a/app/assets/stylesheets/desktop/desktop-component.css +++ b/app/assets/stylesheets/desktop/desktop-component.css @@ -162,7 +162,7 @@ font-size: 15px; } .s_form label { font-size: 13px; - font-weight: normal; + font-weight: bold; display: inline-block; vertical-align: middle; width: 100px; diff --git a/app/assets/stylesheets/desktop/desktop-component.scss b/app/assets/stylesheets/desktop/desktop-component.scss index 81709db26..58910b9c2 100644 --- a/app/assets/stylesheets/desktop/desktop-component.scss +++ b/app/assets/stylesheets/desktop/desktop-component.scss @@ -135,7 +135,7 @@ // basic style label { font-size: 13px; - font-weight: normal; + font-weight: bold; display: inline-block; vertical-align: middle; width: 100px; diff --git a/app/assets/stylesheets/desktop/desktop-main.css b/app/assets/stylesheets/desktop/desktop-main.css index 4d61ffd16..19220ecf5 100644 --- a/app/assets/stylesheets/desktop/desktop-main.css +++ b/app/assets/stylesheets/desktop/desktop-main.css @@ -54,7 +54,6 @@ table { body { font-family: "Source Sans Pro", sans-serif; font-size: 12px; - font-weight: 300; background-color: #000; } a, a:hover { @@ -74,8 +73,7 @@ a:focus { clear: both; } .o-loading { - font-size: 13px; - font-weight: normal; } + font-size: 13px; } .fullsize .o-loading { padding: 12px; } .o-loading i { @@ -336,8 +334,7 @@ a:focus { .section_label li { font-size: 15px; } .section_label li:first-child { - font-size: 18px; - font-weight: normal; } + font-size: 18px; } /* panel */ #panel_l { @@ -372,8 +369,7 @@ a:focus { #orbitnote .note_holder .note_message { color: #333; margin: 10px 0 0 48px; - font-size: 15px; - font-weight: normal; } + font-size: 15px; } /* Desktop Dialogue */ #orbitdiag { @@ -404,7 +400,6 @@ a:focus { margin: 0 6px; text-align: center; font-size: 15px; - font-weight: normal; line-height: 36px; } #orbitdiag .diag_holder .diag_holder_inner .diag_btn:hover { outline: solid 2px white; } @@ -425,8 +420,7 @@ a:focus { [data-sizex="1"] .appname, .w1.h1 .appname { text-align: center; } [data-sizey="2"] .appname { - font-size: 21px; - font-weight: normal; } + font-size: 21px; } .hh2 .appname { position: relative; width: auto; @@ -535,7 +529,6 @@ a:focus { .s_title { font-size: 21px; - font-weight: normal; line-height: 60px; text-align: left; } .s_title.size_large { @@ -561,7 +554,6 @@ a:focus { display: block; float: right; font-size: 15px; - font-weight: normal; line-height: 36px; text-align: center; border: 0; } @@ -617,8 +609,7 @@ a:focus { .list_t_title { margin-bottom: 6px; color: #333; - font-size: 15px; - font-weight: normal; } + font-size: 15px; } .list_t_des { line-height: 1.5em; diff --git a/app/assets/stylesheets/desktop/desktop-main.scss b/app/assets/stylesheets/desktop/desktop-main.scss index 8d95a379b..b89c3d104 100644 --- a/app/assets/stylesheets/desktop/desktop-main.scss +++ b/app/assets/stylesheets/desktop/desktop-main.scss @@ -70,7 +70,7 @@ a:focus { outline: none; } } .o-loading { font-size: 13px; - font-weight: normal; + // font-weight: normal; .fullsize & { padding: 12px; @@ -277,7 +277,7 @@ a:focus { outline: none; } } li:first-child { font-size: 18px; - font-weight: normal; + // font-weight: normal; } } /* panel */ @@ -320,7 +320,7 @@ a:focus { outline: none; } color: #333; margin: 10px 0 0 48px; font-size: 15px; - font-weight: normal; + // font-weight: normal; } } } @@ -360,7 +360,7 @@ a:focus { outline: none; } margin: 0 6px; text-align: center; font-size: 15px; - font-weight: normal; + // font-weight: normal; line-height: 36px; &:hover { @@ -392,7 +392,7 @@ a:focus { outline: none; } } [data-sizey="2"] & { font-size: 21px; - font-weight: normal; + // font-weight: normal; } .hh2 & { position: relative; @@ -517,7 +517,7 @@ a:focus { outline: none; } .s_title { font-size: 21px; - font-weight: normal; + // font-weight: normal; line-height: 60px; text-align: left; @@ -546,7 +546,7 @@ a:focus { outline: none; } display: block; float: right; font-size: 15px; - font-weight: normal; + // font-weight: normal; line-height: 36px; text-align: center; border: 0; @@ -595,7 +595,7 @@ a:focus { outline: none; } margin-bottom: 6px; color: #333; font-size: 15px; - font-weight: normal; + // font-weight: normal; } .list_t_des { line-height: 1.5em;