styling changes!

shabalin · Oct 17, 2014 · 6d70fcb · 6d70fcb
1 parent 7363f9a
commit 6d70fcb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 33 deletions.
diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
@@ -136,13 +136,7 @@ html, body {
     display: none; // tocify will override this when needed
     background-color: $nav-subitem-bg;
     font-weight: 500;
-    @include background-image(
-      linear-gradient(top,
-                      darken($nav-subitem-bg,2%),
-                      $nav-subitem-bg 10%,
-                      $nav-subitem-bg 90%,
-                      darken($nav-subitem-bg,2%))
-    );
+
     .tocify-item>a {
       padding-left: $nav-padding + $nav-indent;
       font-size: 12px;
@@ -162,7 +156,7 @@ html, body {
   .toc-footer {
     padding: 1em 0;
     margin-top: 1em;
-    border-top: 1px dashed $nav-footer-border-color;
+    border-top: 1px solid $nav-footer-border-color;
 
     li,a {
       color: $nav-text;
@@ -290,7 +284,7 @@ html, body {
       font-size: 30px;
       padding-top: 0.5em;
       padding-bottom: 0.5em;
-      border-bottom: 1px solid #ccc;
+      border-bottom: 1px solid #cbd0d5;
       margin-bottom: $h1-margin-bottom;
       margin-top: 0;
       border-top: 1px solid #ddd;
@@ -304,7 +298,7 @@ html, body {
       font-size: 20px;
       margin-top: 4em;
       margin-bottom: 0;
-      border-top: 1px solid #ccc;
+      border-top: 1px solid #cbd0d5;
       padding-top: 1.2em;
       padding-bottom: 1.2em;
       @include background-image(
@@ -365,7 +359,7 @@ html, body {
       }
 
       tr:nth-child(even)>td {
-        background-color: lighten($main-bg,2.4%);
+        background-color: #f2f3f5;
       }
     }
 
@@ -397,7 +391,7 @@ html, body {
     aside {
       padding-top: 1em;
       padding-bottom: 1em;
-      text-shadow: 0 1px 0 lighten($aside-notice-bg, 15%);
+      text-shadow: 0 1px 0 #fff;
       margin-top: 1.5em;
       margin-bottom: 1.5em;
       background: $aside-notice-bg;
@@ -481,9 +475,7 @@ html, body {
       background-color: $code-annotation-bg;
       border-radius: 5px;
       padding: $code-annotation-padding;
-      color: #ccc;
-      border-top: 1px solid #000;
-      border-bottom: 1px solid #404040;
+      color: #ffff;
     }
   }
 }
diff --git a/source/stylesheets/variables.scss b/source/stylesheets/variables.scss
@@ -24,26 +24,26 @@ under the License.
 // BACKGROUND COLORS
 ////////////////////
 $nav-bg: #F7F7F7;
-$examples-bg: #272722;
-$code-bg: #272722; //2E4961 also looks nice
-$code-annotation-bg: #1c1c1c;
-$nav-subitem-bg: #FFB279;
-$nav-active-bg: #ff8d24;
+$examples-bg: #3e4956;
+$code-bg: #27313e; //2E4961 also looks nice
+$code-annotation-bg: #212a35;
+$nav-subitem-bg: #ffc79b;
+$nav-active-bg: #ff7404;
 $lang-select-border: #000;
-$lang-select-bg: #402309;
-$lang-select-active-bg: #E57F20; // feel free to change this to blue or something
-$lang-select-pressed-bg: #111; // color of language tab bg when mouse is pressed
-$main-bg: #FFF0E5;
-$aside-notice-bg: #8fbcd4;
+$lang-select-bg: #27313e;
+$lang-select-active-bg: #ff7404; // feel free to change this to blue or something
+$lang-select-pressed-bg: #ff7404; // color of language tab bg when mouse is pressed
+$main-bg: #eceef1;
+$aside-notice-bg: #f1dc8f;
 $aside-warning-bg: #c97a7e;
 $aside-success-bg: #6ac174;
 $search-notice-bg: #c97a7e;
 
 
 // TEXT COLORS
 ////////////////////
-$main-text: #333; // main content text color
-$nav-text: #222;
+$main-text: #3e4956; // main content text color
+$nav-text: #3e4956;
 $nav-active-text: #fff;
 $lang-select-text: #fff; // color of unselected language tab text
 $lang-select-active-text: #fff; // color of selected language tab text
@@ -65,7 +65,7 @@ $h1-margin-bottom: 21px; // padding under the largest header tags
 // FONTS
 ////////////////////
 %default-font {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
 }
 
@@ -82,12 +82,12 @@ $h1-margin-bottom: 21px; // padding under the largest header tags
 
 // OTHER
 //////////////////// 
-$nav-active-shadow: #CC711D;
-$nav-footer-border-color: #666;
-$nav-embossed-border-top: 1px solid #CC711D;
-$nav-embossed-border-bottom: 1px solid #CC711D;
+$nav-active-shadow: #ff7404;
+$nav-footer-border-color: #cbd0d5;
+$nav-embossed-border-top: 1px solid #ff7404;
+$nav-embossed-border-bottom: 1px solid #ff7404;
 $main-embossed-text-shadow: 0px 1px 0px #fff;
-$search-box-border-color: #666;
+$search-box-border-color: #cbd0d5;
 
 
 ////////////////////////////////////////////////////////////////////////////////