mirror of
https://github.com/WatchOutNewsAgency/wona.github.com.git
synced 2026-02-11 10:30:54 +00:00
1. Removed unnecessary guardfile
2. Separated Solarized color pack into a partial. 3. Changed up sass partial load order to support simple color and style overrides.
This commit is contained in:
@ -11,7 +11,6 @@ $sidebar-width-wide: 300px;
|
||||
|
||||
.group { @include pie-clearfix; }
|
||||
|
||||
//html { }
|
||||
body {
|
||||
-webkit-text-size-adjust: none;
|
||||
max-width: 1350px;
|
||||
@ -42,7 +41,14 @@ body {
|
||||
}
|
||||
|
||||
.toggle-sidebar { display: none; }
|
||||
#articles { width: 100%; + aside { display: none; } }
|
||||
#articles { width: 100%;
|
||||
+ aside {
|
||||
float: none;
|
||||
padding: 0 $pad-min 1px;
|
||||
background-color: $sidebar-bg;
|
||||
border-top: 1px solid $sidebar-border;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 550px) {
|
||||
body > header { font-size: 1em; }
|
||||
@ -68,7 +74,7 @@ body {
|
||||
+ aside {
|
||||
width: $sidebar-width-medium - $sidebar-pad-medium*2;
|
||||
padding: 0 $sidebar-pad-medium $sidebar-pad-medium;
|
||||
display: block;
|
||||
background: none;
|
||||
float: left;
|
||||
margin: 0 -100% 0 0;
|
||||
}
|
||||
@ -112,14 +118,14 @@ body {
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 992px) {
|
||||
body > header {
|
||||
font-size: 1.3em;
|
||||
}
|
||||
body > header { font-size: 1.3em; }
|
||||
body > nav + div > div { margin-right: $sidebar-width-wide; }
|
||||
#articles {
|
||||
padding-top: $pad-wide/2;
|
||||
padding-bottom: $pad-wide/2;
|
||||
+ aside {
|
||||
width: $sidebar-width-wide - $sidebar-pad-wide*2;
|
||||
padding: 0 $sidebar-pad-wide $sidebar-pad-wide;
|
||||
padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,50 +1,54 @@
|
||||
// Main Link Colors
|
||||
$link-color: lighten(#165b94, 3);
|
||||
$link-color-hover: adjust-hue($link-color, -200);
|
||||
$link-color-visited: darken(adjust_hue($link_color, 70), 10);
|
||||
$link-color-active: darken($link-color-hover, 15);
|
||||
$link-color: lighten(#165b94, 3) !default;
|
||||
$link-color-hover: adjust-hue($link-color, -200) !default;
|
||||
$link-color-visited: darken(adjust_hue($link_color, 70), 10) !default;
|
||||
$link-color-active: darken($link-color-hover, 15) !default;
|
||||
|
||||
// Main Section Colors
|
||||
$body-color: #333333;
|
||||
$light-text: #999999;
|
||||
$page-bg: #252525;
|
||||
$article-border: #eeeeee;
|
||||
$main-bg: #f5f5f5;
|
||||
$body-color: #333333 !default;
|
||||
$light-text: #999999 !default;
|
||||
$page-bg: #252525 !default;
|
||||
$article-border: #eeeeee !default;
|
||||
$main-bg: #f5f5f5 !default;
|
||||
|
||||
$header-bg: #333;
|
||||
$header-border: lighten($header-bg, 15);
|
||||
$title-color: #f2f2f2;
|
||||
$subtitle-color: #aaa;
|
||||
$header-bg: #333 !default;
|
||||
$header-border: lighten($header-bg, 15) !default;
|
||||
$title-color: #f2f2f2 !default;
|
||||
$subtitle-color: #aaa !default;
|
||||
|
||||
$type-border: #ddd;
|
||||
$type-color-light: #555;
|
||||
$type-color: #222;
|
||||
$type-color: #222 !default;
|
||||
$type-color-light: #555 !default;
|
||||
$type-border: #ddd !default;
|
||||
|
||||
$nav-bg: #ccc;
|
||||
$nav-color: darken($nav-bg, 38);
|
||||
|
||||
/* Navigation */
|
||||
$nav-bg: #ccc !default;
|
||||
$nav-color: darken($nav-bg, 38) !default;
|
||||
$nav-color-hover: darken($nav-color, 25);
|
||||
$nav-placeholder: desaturate(darken($nav-bg, 10), 15);
|
||||
$nav-border: darken($nav-bg, 10);
|
||||
$nav-border-top: lighten($nav-bg, 15);
|
||||
$nav-border-bottom: darken($nav-bg, 25);
|
||||
$nav-border-left: darken($nav-bg, 11);
|
||||
$nav-border-right: lighten($nav-bg, 7);
|
||||
|
||||
$sidebar-bg: #eee;
|
||||
$sidebar-color: change-color(mix($type-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2);
|
||||
/* Sidebar colors */
|
||||
$sidebar-bg: #eee !default;
|
||||
$sidebar-link-color: $link-color !default;
|
||||
$sidebar-link-color-hover: $link-color-hover !default;
|
||||
$sidebar-color: change-color(mix($type-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2) !default;
|
||||
$sidebar-border: desaturate(darken($sidebar-bg, 7), 10);
|
||||
$sidebar-border: darken($sidebar-bg, 7);
|
||||
$sidebar-link-color: $link-color;
|
||||
$sidebar-link-color-hover: $link-color-hover;
|
||||
$sidebar-link-color-subdued: lighten($sidebar-color, 20);
|
||||
$sidebar-link-color-subdued-hover: $link-color-hover;//darken($sidebar-link-color-subdued, 20);
|
||||
$sidebar-link-color-subdued-hover: $sidebar-link-color-hover;
|
||||
$twitter-status-link: lighten($sidebar-link-color-subdued, 15);
|
||||
|
||||
$footer-color: #999999;
|
||||
$footer-bg: #ccc;
|
||||
$footer-color: #999999 !default;
|
||||
$footer-bg: #ccc !default;
|
||||
$footer-color: darken($footer-bg, 38);
|
||||
$footer-color-hover: darken($footer-color, 10);
|
||||
$footer-placeholder: desaturate(darken($footer-bg, 10), 15);
|
||||
$footer-border-top: lighten($footer-bg, 15);
|
||||
$footer-border-bottom: darken($footer-bg, 15);
|
||||
$footer-link-color: darken($footer-bg, 38);
|
||||
$footer-link-color-hover: darken($footer-color, 25);
|
||||
$page-border-bottom: darken($footer-bg, 5);
|
||||
|
||||
Reference in New Issue
Block a user