Skip to content

Commit 71ddbf1

Browse files
mmistakesmmistakes
committed
Organize SCSS partials
1 parent 3a7dd49 commit 71ddbf1

File tree

7 files changed

+132
-111
lines changed

7 files changed

+132
-111
lines changed

‎docs/_sass/_archive.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,4 @@
235235
}
236236
}
237237
}
238-
}
238+
}

‎docs/_sass/_print.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
.page__footer {
1616
display: none;
1717
}
18-
}
18+
}

‎docs/_sass/_reset.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ input[type="search"]::-webkit-search-cancel-button {
184184
textarea {
185185
overflow: auto; /* remove vertical scrollbar in IE6-9*/
186186
vertical-align: top; /* readability and alignment cross-browser*/
187-
}
187+
}

‎docs/_sass/_utilities.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,4 +467,4 @@ a.reversefootnote {
467467
.required {
468468
color: $danger-color;
469469
font-weight: bold;
470-
}
470+
}

‎docs/_sass/_variables.scss‎

Lines changed: 80 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -6,142 +6,123 @@
66
Typography
77
========================================================================== */
88

9-
$doc-font-size : 16;
9+
$doc-font-size : 16 !default;
1010

1111
/* paragraph indention */
12-
$paragraph-indent : false; // true, false (default)
13-
$indent-var : 1.3em;
12+
$paragraph-indent : false !default; // true, false (default)
13+
$indent-var : 1.3em !default;
1414

1515
/* system typefaces */
16-
$serif : Georgia, Times, serif;
17-
$sans-serif : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif;
18-
$monospace : Monaco, Consolas, "Lucida Console", monospace;
16+
$serif : Georgia, Times, serif !default;
17+
$sans-serif : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif !default;
18+
$monospace : Monaco, Consolas, "Lucida Console", monospace !default;
1919

2020
/* sans serif typefaces */
21-
$sans-serif-narrow : $sans-serif;
22-
$helvetica : Helvetica, "Helvetica Neue", Arial, sans-serif;
21+
$sans-serif-narrow : $sans-serif !default;
22+
$helvetica : Helvetica, "Helvetica Neue", Arial, sans-serif !default;
2323

2424
/* serif typefaces */
25-
$georgia : Georgia, serif;
26-
$times : Times, serif;
27-
$bodoni : "Bodoni MT", serif;
28-
$calisto : "Calisto MT", serif;
29-
$garamond : Garamond, serif;
25+
$georgia : Georgia, serif !default;
26+
$times : Times, serif !default;
27+
$bodoni : "Bodoni MT", serif !default;
28+
$calisto : "Calisto MT", serif !default;
29+
$garamond : Garamond, serif !default;
3030

31-
$global-font-family : $sans-serif;
32-
$header-font-family : $sans-serif;
33-
$caption-font-family : $serif;
31+
$global-font-family : $sans-serif !default;
32+
$header-font-family : $sans-serif !default;
33+
$caption-font-family : $serif !default;
3434

3535
/* type scale */
36-
$type-size-1 : 2.441em; // ~39.056px
37-
$type-size-2 : 1.953em; // ~31.248px
38-
$type-size-3 : 1.563em; // ~25.008px
39-
$type-size-4 : 1.25em; // ~20px
40-
$type-size-5 : 1em; // ~16px
41-
$type-size-6 : 0.75em; // ~12px
42-
$type-size-7 : 0.6875em; // ~11px
43-
$type-size-8 : 0.625em; // ~10px
36+
$type-size-1 : 2.441em !default; // ~39.056px
37+
$type-size-2 : 1.953em !default; // ~31.248px
38+
$type-size-3 : 1.563em !default; // ~25.008px
39+
$type-size-4 : 1.25em !default; // ~20px
40+
$type-size-5 : 1em !default; // ~16px
41+
$type-size-6 : 0.75em !default; // ~12px
42+
$type-size-7 : 0.6875em !default; // ~11px
43+
$type-size-8 : 0.625em !default; // ~10px
4444

4545

4646
/*
4747
Colors
4848
========================================================================== */
4949

50-
$gray : #7a8288;
51-
$dark-gray : mix(#000, $gray, 40%);
52-
$darker-gray : mix(#000, $gray, 60%);
53-
$light-gray : mix(#fff, $gray, 50%);
54-
$lighter-gray : mix(#fff, $gray, 90%);
55-
56-
$body-color : #fff;
57-
$background-color : #fff;
58-
$code-background-color : #fafafa;
59-
$code-background-color-dark : $light-gray;
60-
$text-color : $dark-gray;
61-
$border-color : $lighter-gray;
62-
63-
$primary-color : #7a8288;
64-
$success-color : #62c462;
65-
$warning-color : #f89406;
66-
$danger-color : #ee5f5b;
67-
$info-color : #52adc8;
50+
$gray : #7a8288 !default;
51+
$dark-gray : mix(#000, $gray, 40%) !default;
52+
$darker-gray : mix(#000, $gray, 60%) !default;
53+
$light-gray : mix(#fff, $gray, 50%) !default;
54+
$lighter-gray : mix(#fff, $gray, 90%) !default;
55+
56+
$body-color : #fff !default;
57+
$background-color : #fff !default;
58+
$code-background-color : #fafafa !default;
59+
$code-background-color-dark : $light-gray !default;
60+
$text-color : $dark-gray !default;
61+
$border-color : $lighter-gray !default;
62+
63+
$primary-color : #7a8288 !default;
64+
$success-color : #62c462 !default;
65+
$warning-color : #f89406 !default;
66+
$danger-color : #ee5f5b !default;
67+
$info-color : #52adc8 !default;
6868

6969
/* brands */
70-
$behance-color : #1769FF;
71-
$dribbble-color : #ea4c89;
72-
$facebook-color : #3b5998;
73-
$flickr-color : #ff0084;
74-
$foursquare-color : #0072b1;
75-
$github-color : #171516;
76-
$google-plus-color : #dd4b39;
77-
$instagram-color : #517fa4;
78-
$lastfm-color : #d51007;
79-
$linkedin-color : #007bb6;
80-
$pinterest-color : #cb2027;
81-
$rss-color : #fa9b39;
82-
$soundcloud-color : #ff3300;
83-
$stackoverflow-color : #fe7a15;
84-
$tumblr-color : #32506d;
85-
$twitter-color : #55acee;
86-
$vimeo-color : #1ab7ea;
87-
$vine-color : #00bf8f;
88-
$youtube-color : #bb0000;
89-
$xing-color : #006567;
70+
$behance-color : #1769FF !default;
71+
$dribbble-color : #ea4c89 !default;
72+
$facebook-color : #3b5998 !default;
73+
$flickr-color : #ff0084 !default;
74+
$foursquare-color : #0072b1 !default;
75+
$github-color : #171516 !default;
76+
$google-plus-color : #dd4b39 !default;
77+
$instagram-color : #517fa4 !default;
78+
$lastfm-color : #d51007 !default;
79+
$linkedin-color : #007bb6 !default;
80+
$pinterest-color : #cb2027 !default;
81+
$rss-color : #fa9b39 !default;
82+
$soundcloud-color : #ff3300 !default;
83+
$stackoverflow-color : #fe7a15 !default;
84+
$tumblr-color : #32506d !default;
85+
$twitter-color : #55acee !default;
86+
$vimeo-color : #1ab7ea !default;
87+
$vine-color : #00bf8f !default;
88+
$youtube-color : #bb0000 !default;
89+
$xing-color : #006567 !default;
9090

9191

9292
/* links */
93-
$link-color : $info-color;
94-
$link-color-hover : mix(#000, $link-color, 25%);
95-
$link-color-visited : mix(#fff, $link-color, 25%);
96-
$masthead-link-color : $primary-color;
97-
$masthead-link-color-hover : mix(#000, $primary-color, 25%);
93+
$link-color : $info-color !default;
94+
$link-color-hover : mix(#000, $link-color, 25%) !default;
95+
$link-color-visited : mix(#fff, $link-color, 25%) !default;
96+
$masthead-link-color : $primary-color !default;
97+
$masthead-link-color-hover : mix(#000, $primary-color, 25%) !default;
9898

9999

100100
/*
101101
Breakpoints
102102
========================================================================== */
103103

104-
@include breakpoint-set("to ems", true);
105-
106-
$small : 600px;
107-
$medium : 768px;
108-
$medium-wide : 900px;
109-
$large : 1024px;
110-
$x-large : 1280px;
104+
$small : 600px !default;
105+
$medium : 768px !default;
106+
$medium-wide : 900px !default;
107+
$large : 1024px !default;
108+
$x-large : 1280px !default;
111109

112110

113111
/*
114112
Grid
115113
========================================================================== */
116114

117-
$right-sidebar-width-narrow : 200px;
118-
$right-sidebar-width : 300px;
119-
$right-sidebar-width-wide : 400px;
120-
121-
$susy: (
122-
columns: 12,
123-
// column-width: 90px,
124-
gutters: 1/4,
125-
math: fluid,
126-
output: float,
127-
gutter-position: after,
128-
container: $large,
129-
global-box-sizing: border-box,
130-
// debug: (
131-
// image: show,
132-
// color: blue,
133-
// output: overlay,
134-
// toggle: top right,
135-
// ),
136-
);
115+
$right-sidebar-width-narrow : 200px !default;
116+
$right-sidebar-width : 300px !default;
117+
$right-sidebar-width-wide : 400px !default;
137118

138119

139120
/*
140121
Other
141122
========================================================================== */
142123

143-
$border-radius : 4px;
144-
$box-shadow : 0 1px 1px rgba(0, 0, 0, 0.125);
145-
$navicon-width : 28px;
146-
$navicon-height : 4px;
147-
$global-transition : all 0.2s ease-in-out;
124+
$border-radius : 4px !default;
125+
$box-shadow : 0 1px 1px rgba(0, 0, 0, 0.125) !default;
126+
$navicon-width : 28px !default;
127+
$navicon-height : 4px !default;
128+
$global-transition : all 0.2s ease-in-out !default;

‎docs/_sass/vendor/magnific-popup/_settings.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ $mfp-caption-subtitle-color: #bdbdbd; // Caption sub
4343
.mfp-counter { font-family: $serif; } // Caption font family
4444

4545
// A11y
46-
$mfp-use-visuallyhidden: false;
46+
$mfp-use-visuallyhidden: false;

‎docs/assets/css/main.scss‎

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,53 @@
1010
*
1111
*/
1212

13-
@import "vendor/breakpoint/breakpoint"; // media query mixins
13+
/*
14+
Variables
15+
========================================================================== */
16+
1417
@import "variables";
15-
@import "mixins";
18+
19+
20+
/*
21+
Vendor
22+
========================================================================== */
23+
24+
/* Breakpoint - media query mixins */
25+
@import "vendor/breakpoint/breakpoint";
26+
@include breakpoint-set("to ems", true);
27+
28+
/* Font Awesome - icon font set */
29+
@import "vendor/font-awesome/font-awesome";
30+
31+
/* Magnific Popup - responsive lightbox */
32+
@import "vendor/magnific-popup/magnific-popup"; // Magnific Popup
33+
34+
/* Susy - grid mixins */
35+
$susy: (
36+
columns: 12,
37+
gutters: 1/4,
38+
math: fluid,
39+
output: float,
40+
gutter-position: after,
41+
container: $large,
42+
global-box-sizing: border-box,
43+
// debug: (
44+
// image: show,
45+
// color: blue,
46+
// output: overlay,
47+
// toggle: top right,
48+
// ),
49+
);
1650
@import "vendor/susy/susy";
1751

52+
53+
/*
54+
Base
55+
========================================================================== */
56+
57+
@import "mixins";
1858
@import "reset";
1959
@import "base";
20-
2160
@import "utilities";
2261
@import "animations";
2362
@import "tables";
@@ -27,13 +66,14 @@
2766
@import "navigation";
2867
@import "footer";
2968
@import "syntax";
30-
3169
@import "forms";
3270

71+
72+
/*
73+
Layout specific
74+
========================================================================== */
75+
3376
@import "page";
3477
@import "archive";
3578
@import "sidebar";
36-
37-
@import "vendor/font-awesome/font-awesome";
38-
@import "vendor/magnific-popup/magnific-popup";
3979
@import "print";

0 commit comments

Comments
 (0)