From 71ddbf1e7060947312341c707afc4afb793652ea Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 17 Nov 2016 12:17:18 -0500 Subject: [PATCH] Organize SCSS partials --- docs/_sass/_archive.scss | 2 +- docs/_sass/_print.scss | 2 +- docs/_sass/_reset.scss | 2 +- docs/_sass/_utilities.scss | 2 +- docs/_sass/_variables.scss | 175 ++++++++---------- .../vendor/magnific-popup/_settings.scss | 2 +- docs/assets/css/main.scss | 54 +++++- 7 files changed, 130 insertions(+), 109 deletions(-) diff --git a/docs/_sass/_archive.scss b/docs/_sass/_archive.scss index 0509f814..c5d0709b 100644 --- a/docs/_sass/_archive.scss +++ b/docs/_sass/_archive.scss @@ -235,4 +235,4 @@ } } } -} +} \ No newline at end of file diff --git a/docs/_sass/_print.scss b/docs/_sass/_print.scss index 09bdb1d8..04201cdd 100644 --- a/docs/_sass/_print.scss +++ b/docs/_sass/_print.scss @@ -15,4 +15,4 @@ .page__footer { display: none; } -} +} \ No newline at end of file diff --git a/docs/_sass/_reset.scss b/docs/_sass/_reset.scss index d9ae7875..2b3b0cf8 100644 --- a/docs/_sass/_reset.scss +++ b/docs/_sass/_reset.scss @@ -184,4 +184,4 @@ input[type="search"]::-webkit-search-cancel-button { textarea { overflow: auto; /* remove vertical scrollbar in IE6-9*/ vertical-align: top; /* readability and alignment cross-browser*/ -} +} \ No newline at end of file diff --git a/docs/_sass/_utilities.scss b/docs/_sass/_utilities.scss index 87536a45..7ffae3b3 100644 --- a/docs/_sass/_utilities.scss +++ b/docs/_sass/_utilities.scss @@ -467,4 +467,4 @@ a.reversefootnote { .required { color: $danger-color; font-weight: bold; -} +} \ No newline at end of file diff --git a/docs/_sass/_variables.scss b/docs/_sass/_variables.scss index a9b09121..b662d7fa 100644 --- a/docs/_sass/_variables.scss +++ b/docs/_sass/_variables.scss @@ -6,142 +6,123 @@ Typography ========================================================================== */ -$doc-font-size : 16; +$doc-font-size : 16 !default; /* paragraph indention */ -$paragraph-indent : false; // true, false (default) -$indent-var : 1.3em; +$paragraph-indent : false !default; // true, false (default) +$indent-var : 1.3em !default; /* system typefaces */ -$serif : Georgia, Times, serif; -$sans-serif : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif; -$monospace : Monaco, Consolas, "Lucida Console", monospace; +$serif : Georgia, Times, serif !default; +$sans-serif : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif !default; +$monospace : Monaco, Consolas, "Lucida Console", monospace !default; /* sans serif typefaces */ -$sans-serif-narrow : $sans-serif; -$helvetica : Helvetica, "Helvetica Neue", Arial, sans-serif; +$sans-serif-narrow : $sans-serif !default; +$helvetica : Helvetica, "Helvetica Neue", Arial, sans-serif !default; /* serif typefaces */ -$georgia : Georgia, serif; -$times : Times, serif; -$bodoni : "Bodoni MT", serif; -$calisto : "Calisto MT", serif; -$garamond : Garamond, serif; +$georgia : Georgia, serif !default; +$times : Times, serif !default; +$bodoni : "Bodoni MT", serif !default; +$calisto : "Calisto MT", serif !default; +$garamond : Garamond, serif !default; -$global-font-family : $sans-serif; -$header-font-family : $sans-serif; -$caption-font-family : $serif; +$global-font-family : $sans-serif !default; +$header-font-family : $sans-serif !default; +$caption-font-family : $serif !default; /* type scale */ -$type-size-1 : 2.441em; // ~39.056px -$type-size-2 : 1.953em; // ~31.248px -$type-size-3 : 1.563em; // ~25.008px -$type-size-4 : 1.25em; // ~20px -$type-size-5 : 1em; // ~16px -$type-size-6 : 0.75em; // ~12px -$type-size-7 : 0.6875em; // ~11px -$type-size-8 : 0.625em; // ~10px +$type-size-1 : 2.441em !default; // ~39.056px +$type-size-2 : 1.953em !default; // ~31.248px +$type-size-3 : 1.563em !default; // ~25.008px +$type-size-4 : 1.25em !default; // ~20px +$type-size-5 : 1em !default; // ~16px +$type-size-6 : 0.75em !default; // ~12px +$type-size-7 : 0.6875em !default; // ~11px +$type-size-8 : 0.625em !default; // ~10px /* Colors ========================================================================== */ -$gray : #7a8288; -$dark-gray : mix(#000, $gray, 40%); -$darker-gray : mix(#000, $gray, 60%); -$light-gray : mix(#fff, $gray, 50%); -$lighter-gray : mix(#fff, $gray, 90%); +$gray : #7a8288 !default; +$dark-gray : mix(#000, $gray, 40%) !default; +$darker-gray : mix(#000, $gray, 60%) !default; +$light-gray : mix(#fff, $gray, 50%) !default; +$lighter-gray : mix(#fff, $gray, 90%) !default; -$body-color : #fff; -$background-color : #fff; -$code-background-color : #fafafa; -$code-background-color-dark : $light-gray; -$text-color : $dark-gray; -$border-color : $lighter-gray; +$body-color : #fff !default; +$background-color : #fff !default; +$code-background-color : #fafafa !default; +$code-background-color-dark : $light-gray !default; +$text-color : $dark-gray !default; +$border-color : $lighter-gray !default; -$primary-color : #7a8288; -$success-color : #62c462; -$warning-color : #f89406; -$danger-color : #ee5f5b; -$info-color : #52adc8; +$primary-color : #7a8288 !default; +$success-color : #62c462 !default; +$warning-color : #f89406 !default; +$danger-color : #ee5f5b !default; +$info-color : #52adc8 !default; /* brands */ -$behance-color : #1769FF; -$dribbble-color : #ea4c89; -$facebook-color : #3b5998; -$flickr-color : #ff0084; -$foursquare-color : #0072b1; -$github-color : #171516; -$google-plus-color : #dd4b39; -$instagram-color : #517fa4; -$lastfm-color : #d51007; -$linkedin-color : #007bb6; -$pinterest-color : #cb2027; -$rss-color : #fa9b39; -$soundcloud-color : #ff3300; -$stackoverflow-color : #fe7a15; -$tumblr-color : #32506d; -$twitter-color : #55acee; -$vimeo-color : #1ab7ea; -$vine-color : #00bf8f; -$youtube-color : #bb0000; -$xing-color : #006567; +$behance-color : #1769FF !default; +$dribbble-color : #ea4c89 !default; +$facebook-color : #3b5998 !default; +$flickr-color : #ff0084 !default; +$foursquare-color : #0072b1 !default; +$github-color : #171516 !default; +$google-plus-color : #dd4b39 !default; +$instagram-color : #517fa4 !default; +$lastfm-color : #d51007 !default; +$linkedin-color : #007bb6 !default; +$pinterest-color : #cb2027 !default; +$rss-color : #fa9b39 !default; +$soundcloud-color : #ff3300 !default; +$stackoverflow-color : #fe7a15 !default; +$tumblr-color : #32506d !default; +$twitter-color : #55acee !default; +$vimeo-color : #1ab7ea !default; +$vine-color : #00bf8f !default; +$youtube-color : #bb0000 !default; +$xing-color : #006567 !default; /* links */ -$link-color : $info-color; -$link-color-hover : mix(#000, $link-color, 25%); -$link-color-visited : mix(#fff, $link-color, 25%); -$masthead-link-color : $primary-color; -$masthead-link-color-hover : mix(#000, $primary-color, 25%); +$link-color : $info-color !default; +$link-color-hover : mix(#000, $link-color, 25%) !default; +$link-color-visited : mix(#fff, $link-color, 25%) !default; +$masthead-link-color : $primary-color !default; +$masthead-link-color-hover : mix(#000, $primary-color, 25%) !default; /* Breakpoints ========================================================================== */ -@include breakpoint-set("to ems", true); - -$small : 600px; -$medium : 768px; -$medium-wide : 900px; -$large : 1024px; -$x-large : 1280px; +$small : 600px !default; +$medium : 768px !default; +$medium-wide : 900px !default; +$large : 1024px !default; +$x-large : 1280px !default; /* Grid ========================================================================== */ -$right-sidebar-width-narrow : 200px; -$right-sidebar-width : 300px; -$right-sidebar-width-wide : 400px; - -$susy: ( - columns: 12, - // column-width: 90px, - gutters: 1/4, - math: fluid, - output: float, - gutter-position: after, - container: $large, - global-box-sizing: border-box, - // debug: ( - // image: show, - // color: blue, - // output: overlay, - // toggle: top right, - // ), -); +$right-sidebar-width-narrow : 200px !default; +$right-sidebar-width : 300px !default; +$right-sidebar-width-wide : 400px !default; /* Other ========================================================================== */ -$border-radius : 4px; -$box-shadow : 0 1px 1px rgba(0, 0, 0, 0.125); -$navicon-width : 28px; -$navicon-height : 4px; -$global-transition : all 0.2s ease-in-out; +$border-radius : 4px !default; +$box-shadow : 0 1px 1px rgba(0, 0, 0, 0.125) !default; +$navicon-width : 28px !default; +$navicon-height : 4px !default; +$global-transition : all 0.2s ease-in-out !default; \ No newline at end of file diff --git a/docs/_sass/vendor/magnific-popup/_settings.scss b/docs/_sass/vendor/magnific-popup/_settings.scss index caaca026..e7866b3f 100644 --- a/docs/_sass/vendor/magnific-popup/_settings.scss +++ b/docs/_sass/vendor/magnific-popup/_settings.scss @@ -43,4 +43,4 @@ $mfp-caption-subtitle-color: #bdbdbd; // Caption sub .mfp-counter { font-family: $serif; } // Caption font family // A11y -$mfp-use-visuallyhidden: false; +$mfp-use-visuallyhidden: false; \ No newline at end of file diff --git a/docs/assets/css/main.scss b/docs/assets/css/main.scss index fbc2a31c..2a763aff 100644 --- a/docs/assets/css/main.scss +++ b/docs/assets/css/main.scss @@ -10,14 +10,53 @@ * */ -@import "vendor/breakpoint/breakpoint"; // media query mixins +/* + Variables + ========================================================================== */ + @import "variables"; -@import "mixins"; + + +/* + Vendor + ========================================================================== */ + +/* Breakpoint - media query mixins */ +@import "vendor/breakpoint/breakpoint"; +@include breakpoint-set("to ems", true); + +/* Font Awesome - icon font set */ +@import "vendor/font-awesome/font-awesome"; + +/* Magnific Popup - responsive lightbox */ +@import "vendor/magnific-popup/magnific-popup"; // Magnific Popup + +/* Susy - grid mixins */ +$susy: ( + columns: 12, + gutters: 1/4, + math: fluid, + output: float, + gutter-position: after, + container: $large, + global-box-sizing: border-box, + // debug: ( + // image: show, + // color: blue, + // output: overlay, + // toggle: top right, + // ), +); @import "vendor/susy/susy"; + +/* + Base + ========================================================================== */ + +@import "mixins"; @import "reset"; @import "base"; - @import "utilities"; @import "animations"; @import "tables"; @@ -27,13 +66,14 @@ @import "navigation"; @import "footer"; @import "syntax"; - @import "forms"; + +/* + Layout specific + ========================================================================== */ + @import "page"; @import "archive"; @import "sidebar"; - -@import "vendor/font-awesome/font-awesome"; -@import "vendor/magnific-popup/magnific-popup"; @import "print"; \ No newline at end of file