Skip to content

Commit 4594e4b

Browse files
rjzupkoiirjzupkoii
committed
Merge branch '#137'
2 parents 47b944e + 0ccd873 commit 4594e4b

22 files changed

+317
-268
lines changed

‎_config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
# Basic Site Settings
1010
locale : "en-US"
11+
site_theme : "default"
1112
title : "Your Name / Site Title"
1213
title_separator : "-"
1314
name : &name "Your Name"

‎_sass/_animations.scss‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎_sass/_print.scss‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎_sass/_syntax.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ div.highlighter-rouge, figure.highlight {
66
position: relative;
77
margin-bottom: 1em;
88
padding: 1em;
9-
border: 1px solid $border-color;
9+
border: 1px solid var(--global-border-color);
1010
border-radius: $border-radius;
11-
background-color: $code-background-color;
11+
background-color: var(--global-code-background-color);
1212
box-shadow: $box-shadow;
1313
font-size: $type-size-4;
1414

@@ -17,7 +17,7 @@ div.highlighter-rouge, figure.highlight {
1717
top: 0;
1818
right: 0;
1919
padding: 0.5em;
20-
background-color: $lighter-gray;
20+
background-color: mix(#fff, #7a8288, 90%);
2121
content: "\f121";
2222
font-family: "Font Awesome 6 Free" !important;
2323
font-size: $type-size-6;

‎_sass/_variables.scss‎ renamed to ‎_sass/_themes.scss‎

Lines changed: 43 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,35 @@
11
/* ==========================================================================
2-
Variables
2+
SHARED THEME SETTINGS
33
========================================================================== */
44

5-
/*
6-
Typography
5+
/* ==========================================================================
6+
TYPOGRAPHY
77
========================================================================== */
88

9+
/* Used to set the size for <em> */
910
$doc-font-size : 16;
1011

11-
/* paragraph indention */
12+
/* Paragraph indention */
1213
$paragraph-indent : false; // true, false (default)
1314
$indent-var : 1.3em;
1415

15-
/* system typefaces */
16+
/* System typefaces */
1617
$serif : Georgia, Times, serif;
1718
$sans-serif : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif;
1819
$monospace : Monaco, Consolas, "Lucida Console", monospace;
1920

20-
/* sans serif typefaces */
21+
/* Sans serif typefaces */
2122
$sans-serif-narrow : $sans-serif;
2223
$helvetica : Helvetica, "Helvetica Neue", Arial, sans-serif;
2324

24-
/* serif typefaces */
25+
/* Serif typefaces */
2526
$georgia : Georgia, serif;
2627
$times : Times, serif;
2728
$bodoni : "Bodoni MT", serif;
2829
$calisto : "Calisto MT", serif;
2930
$garamond : Garamond, serif;
3031

31-
$global-font-family : $sans-serif;
32-
$header-font-family : $sans-serif;
33-
$caption-font-family : $serif;
34-
35-
/* type scale */
32+
/* Type scale */
3633
$type-size-1 : 2.441em; // ~39.056px
3734
$type-size-2 : 1.953em; // ~31.248px
3835
$type-size-3 : 1.563em; // ~25.008px
@@ -42,39 +39,45 @@ $type-size-6 : 0.75em; // ~12px
4239
$type-size-7 : 0.6875em; // ~11px
4340
$type-size-8 : 0.625em; // ~10px
4441

45-
/* masthead properties */
46-
$masthead-height : 70px;
42+
$global-font-family : $sans-serif;
43+
$header-font-family : $sans-serif;
44+
$caption-font-family : $serif;
4745

48-
/* Sidebar properties */
49-
$sidebar-screen-min-width : 1024px;
50-
$sidebar-link-max-width : 250px;
46+
/* ==========================================================================
47+
Breakpoints
48+
========================================================================== */
5149

50+
@include breakpoint-set("to ems", true);
5251

52+
$small : 600px !default;
53+
$medium : 768px !default;
54+
$medium-wide : 900px !default;
55+
$large : 925px !default;
56+
$x-large : 1280px !default;
57+
58+
/* ==========================================================================
59+
Grid
60+
========================================================================== */
61+
62+
$right-sidebar-width-narrow : 20px !default;
63+
$right-sidebar-width : 30px !default;
64+
$right-sidebar-width-wide : 40px !default;
5365

54-
/*
55-
Colors
66+
$susy: (
67+
columns: 12,
68+
column-width: 120px,
69+
gutters: 1/4,
70+
math: fluid,
71+
output: float,
72+
gutter-position: after,
73+
container: $large,
74+
global-box-sizing: border-box,
75+
);
76+
77+
/* ==========================================================================
78+
BRAND COLORS
5679
========================================================================== */
5780

58-
$gray : #7a8288;
59-
$dark-gray : mix(#000, $gray, 40%);
60-
$darker-gray : mix(#000, $gray, 60%);
61-
$light-gray : mix(#fff, $gray, 50%);
62-
$lighter-gray : mix(#fff, $gray, 90%);
63-
64-
$body-color : #fff;
65-
$background-color : #fff;
66-
$code-background-color : #fafafa;
67-
$code-background-color-dark : $light-gray;
68-
$text-color : $dark-gray;
69-
$border-color : $lighter-gray;
70-
71-
$primary-color : #7a8288;
72-
$success-color : #62c462;
73-
$warning-color : #f89406;
74-
$danger-color : #ee5f5b;
75-
$info-color : #2f7f93;
76-
77-
/* brands */
7881
$behance-color : #1769FF;
7982
$bluesky-color : #1184fe;
8083
$dribbble-color : #ea4c89;
@@ -99,67 +102,4 @@ $vimeo-color : #1ab7ea;
99102
$vine-color : #00bf8f;
100103
$youtube-color : #bb0000;
101104
$xing-color : #006567;
102-
103-
104-
/* links */
105-
$link-color : $info-color;
106-
$link-color-hover : mix(#000, $link-color, 25%);
107-
$link-color-visited : mix(#fff, $link-color, 25%);
108-
$masthead-link-color : $primary-color;
109-
$masthead-link-color-hover : mix(#000, $primary-color, 25%);
110-
111-
112-
/*
113-
Breakpoints
114-
========================================================================== */
115-
116-
@include breakpoint-set("to ems", true);
117-
/*
118-
$small : 400px;
119-
$medium : 500px;
120-
$medium-wide : 550px;
121-
$large : 1200px;
122-
$x-large : 1800px;
123-
*/
124-
125-
$small : 600px !default;
126-
$medium : 768px !default;
127-
$medium-wide : 900px !default;
128-
$large : 925px !default;
129-
$x-large : 1280px !default;
130-
131-
/*
132-
Grid
133-
========================================================================== */
134-
135-
$right-sidebar-width-narrow : 20px !default;
136-
$right-sidebar-width : 30px !default;
137-
$right-sidebar-width-wide : 40px !default;
138-
139-
$susy: (
140-
columns: 12,
141-
column-width: 120px,
142-
gutters: 1/4,
143-
math: fluid,
144-
output: float,
145-
gutter-position: after,
146-
container: $large,
147-
global-box-sizing: border-box,
148-
// debug: (
149-
// image: show,
150-
// color: blue,
151-
// output: overlay,
152-
// toggle: top right,
153-
// ),
154-
);
155-
156-
157-
/*
158-
Other
159-
========================================================================== */
160-
161-
$border-radius : 4px;
162-
$box-shadow : 0 1px 1px rgba(0, 0, 0, 0.125);
163-
$navicon-width : 28px;
164-
$navicon-height : 4px;
165-
$global-transition : all 0.2s ease-in-out;
105+

‎_sass/_mixins.scss‎ renamed to ‎_sass/include/_mixins.scss‎

File renamed without changes.

‎_sass/_utilities.scss‎ renamed to ‎_sass/include/_utilities.scss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ body:hover .visually-hidden button {
446446
min-height: 0;
447447
z-index: 9999;
448448
background: #fff;
449-
border: 1px solid $border-color;
449+
border: 1px solid var(--global-border-color);
450450
border-radius: $border-radius;
451451
box-shadow: $box-shadow;
452452

@@ -461,7 +461,7 @@ body:hover .visually-hidden button {
461461

462462
&__actions {
463463
padding: 0.5em 1em;
464-
border-top: 1px solid $border-color;
464+
border-top: 1px solid var(--global-border-color);
465465
}
466466
}
467467

@@ -471,12 +471,12 @@ body:hover .visually-hidden button {
471471
========================================================================== */
472472

473473
.footnote {
474-
color: mix(#fff, $gray, 25%);
474+
color: var(--global-text-color-light);
475475
text-decoration: none;
476476
}
477477

478478
.footnotes {
479-
color: mix(#fff, $gray, 25%);
479+
color: var(--global-text-color-light);
480480

481481
ol, li, p {
482482
margin-bottom: 0;
@@ -485,7 +485,7 @@ body:hover .visually-hidden button {
485485
}
486486

487487
a.reversefootnote {
488-
color: $gray;
488+
color: var(--global-text-color-light);
489489
text-decoration: none;
490490

491491
&:hover {

‎_sass/_archive.scss‎ renamed to ‎_sass/layout/_archive.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
margin: 1.414em 0 0;
3232
padding-bottom: 0.5em;
3333
font-size: $type-size-5;
34-
color: mix(#fff, $gray, 25%);
35-
border-bottom: 1px solid $border-color;
34+
color: var(--global-text-color-light);
35+
border-bottom: 1px solid var(--global-border-color);
3636

3737
+ .list__item .archive__item-title {
3838
margin-top: 0.5em;
@@ -159,7 +159,7 @@
159159
.feature__wrapper {
160160
@include clearfix();
161161
margin-bottom: 2em;
162-
border-bottom: 1px solid $border-color;
162+
border-bottom: 1px solid var(--global-border-color);
163163
}
164164

165165
.feature__item {

0 commit comments

Comments
 (0)