Skip to content

Commit 628629d

Browse files
authored
Upgrade to Susy 3 (#42)
Most of Susy's mixins have been deprecated, `@include container()`, `@include full()`, `@include span()`, `@include prefix()`, `@include suffix()`, `@include gallery()`, etc replace with new functions. Fixes #21
1 parent eeebb7e commit 628629d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+2557
-4139
lines changed

.codeclimate.yml

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

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
[![Gem](https://img.shields.io/gem/v/jekyll-theme-basically-basic.svg?style=flat-square)](https://rubygems.org/gems/jekyll-theme-basically-basic)
44
[![license](https://img.shields.io/github/license/mmistakes/jekyll-theme-basically-basic.svg?style=flat-square)](LICENSE.md)
5-
[![Code Climate](https://img.shields.io/codeclimate/github/mmistakes/jekyll-theme-basically-basic.svg?style=flat-square)](https://codeclimate.com/github/mmistakes/jekyll-theme-basically-basic)
65

76
Basically Basic is a [Jekyll theme](https://jekyllrb.com/docs/themes/) meant as
87
a substitute for the default --- [Minima](https://github.com/jekyll/minima).

_sass/basically-basic.scss

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
* https://github.com/mmistakes/jekyll-theme-basically-basic/blob/master/LICENSE.md
66
*/
77

8-
/* Mixins and functions */
9-
@import "basically-basic/vendor/susy";
10-
@import "basically-basic/vendor/breakpoint";
11-
@include breakpoint-set("to ems", true);
12-
@import "basically-basic/mixins";
13-
14-
/* Variables */
8+
@import "basically-basic/functions";
159
@import "basically-basic/variables";
10+
@import "basically-basic/mixins";
11+
@import "basically-basic/vendor/breakpoint/breakpoint";
12+
@include breakpoint-set("to ems", true);
13+
@import "basically-basic/vendor/susy/susy";
1614

1715
/* Core CSS */
1816
@import "basically-basic/reset";

_sass/basically-basic/_entries.scss

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
}
3737

3838
.byline-item {
39-
4039
&:not(:first-child) {
4140
margin-left: 1.5rem;
4241
}
@@ -53,7 +52,6 @@
5352
========================================================================== */
5453

5554
.entries {
56-
5755
.entry-title {
5856
word-wrap: break-word; /* break long words that could overflow */
5957

@@ -64,7 +62,7 @@
6462

6563
.entry-excerpt {
6664
@include breakpoint($medium) {
67-
@include span(11 of 16);
65+
width: span(11 of 16);
6866
}
6967

7068
/* normalize font sizes */
@@ -80,7 +78,7 @@
8078

8179
.entry-content {
8280
@include breakpoint($medium) {
83-
@include span(11 of 16);
81+
width: span(11 of 16);
8482
}
8583

8684
/* remove space after last child element */
@@ -91,8 +89,9 @@
9189

9290
.entry-meta {
9391
@include breakpoint($medium) {
94-
@include span(5 of 16 last);
95-
@include prefix(1 of 16);
92+
float: right;
93+
width: span(5 of 16 last);
94+
padding-left: gutter(1 of 16);
9695
}
9796

9897
ul {
@@ -114,7 +113,6 @@
114113
}
115114

116115
> .summary {
117-
118116
> p:first-child {
119117
font-size: 1.125em;
120118
line-height: 1.625;
@@ -123,7 +121,6 @@
123121
}
124122

125123
.entry-content {
126-
127124
> p:first-child {
128125
font-size: 1.125em;
129126
line-height: 1.625;

_sass/basically-basic/_functions.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@import "functions/color";
2+
@import "functions/fluid-type";

_sass/basically-basic/_layout.scss

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
.intro,
2525
main {
26-
2726
> .inner {
2827
padding: 0 0.5rem;
2928

@@ -50,9 +49,10 @@ main {
5049
}
5150

5251
main {
53-
5452
section {
55-
@include container;
53+
margin-left: auto;
54+
margin-right: auto;
55+
max-width: 100%;
5656
}
5757
}
5858

@@ -66,17 +66,14 @@ main {
6666

6767
.layout--post,
6868
.layout--page {
69-
7069
.entry-content {
71-
7270
@include breakpoint($large) {
7371
width: span(14 of 16);
7472
}
7573
}
7674
}
7775

7876
.layout--about {
79-
8077
.entry-wrap {
8178
display: -ms-flexbox;
8279
display: flex;
@@ -90,7 +87,6 @@ main {
9087
}
9188

9289
.entry-content {
93-
9490
@include breakpoint($medium) {
9591
-ms-flex: 1;
9692
flex: 1;
@@ -118,14 +114,11 @@ main {
118114
}
119115

120116
.layout--cv {
121-
122117
.entries {
123-
124118
.entry-header {
125-
126119
@include breakpoint($medium) {
127-
@include span(5 of 16);
128-
@include suffix(1 of 16);
120+
width: span(5 of 16);
121+
padding-right: gutter(1 of 16);
129122

130123
/* remove space after last child element */
131124
> *:last-child {
@@ -136,13 +129,13 @@ main {
136129

137130
.entry-content {
138131
@include breakpoint($medium) {
139-
@include span(11 of 16 last);
132+
float: right;
133+
width: span(11 of 16);
140134
}
141135
}
142136
}
143137

144138
.entry {
145-
146139
a {
147140
color: $accent-color;
148141
}
@@ -179,7 +172,6 @@ main {
179172
}
180173

181174
.taxonomy {
182-
183175
+ .taxonomy {
184176
margin-top: 0.5rem;
185177
}

_sass/basically-basic/_mixins.scss

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
@import 'mixins/color';
2-
@import 'mixins/clearfix';
3-
@import 'mixins/fluid-type';
4-
@import 'mixins/float';
5-
@import 'mixins/image';
6-
@import 'mixins/lists';
7-
@import 'mixins/text-truncate';
1+
@import "mixins/clearfix";
2+
@import "mixins/float";
3+
@import "mixins/image";
4+
@import "mixins/lists";
5+
@import "mixins/text-truncate";

_sass/basically-basic/_variables.scss

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@ $max-font-size: 18px !default;
1919
$modular-scale-1: 1.067 !default; /* small */
2020
$modular-scale-2: 1.296 !default; /* large */
2121
/* Heading 1 */
22-
$h1-min: $modular-scale-1 * $modular-scale-1 * $modular-scale-1 * $modular-scale-1 * $base-font-size !default;
23-
$h1-max: $modular-scale-2 * $modular-scale-2 * $modular-scale-2 * $modular-scale-2 * $base-font-size !default;
22+
$h1-min: $modular-scale-1 * $modular-scale-1 * $modular-scale-1 *
23+
$modular-scale-1 * $base-font-size !default;
24+
$h1-max: $modular-scale-2 * $modular-scale-2 * $modular-scale-2 *
25+
$modular-scale-2 * $base-font-size !default;
2426
/* Heading 2 */
25-
$h2-min: $modular-scale-1 * $modular-scale-1 * $modular-scale-1 * $base-font-size !default;
26-
$h2-max: $modular-scale-2 * $modular-scale-2 * $modular-scale-2 * $base-font-size !default;
27+
$h2-min: $modular-scale-1 * $modular-scale-1 * $modular-scale-1 *
28+
$base-font-size !default;
29+
$h2-max: $modular-scale-2 * $modular-scale-2 * $modular-scale-2 *
30+
$base-font-size !default;
2731
/* Heading 3 */
2832
$h3-min: $modular-scale-1 * $modular-scale-1 * $base-font-size !default;
2933
$h3-max: $modular-scale-2 * $modular-scale-2 * $base-font-size !default;
@@ -41,7 +45,8 @@ $h6-max: ($base-font-size / $modular-scale-2) !default;
4145
$base-font-family: "Fira Sans", sans-serif !default;
4246
/* Other font families */
4347
$headline-font-family: $base-font-family !default;
44-
$monospace-font-family: Menlo, Consolas, Monaco, "Courier New", Courier, monospace !default;
48+
$monospace-font-family: Menlo, Consolas, Monaco, "Courier New", Courier,
49+
monospace !default;
4550

4651
/* Colors */
4752
$base-color: #393e46 !default;
@@ -79,6 +84,3 @@ $navicon-content-bg: $text-color !default;
7984
/* Site image */
8085
$site-image-width: 50px !default;
8186
$site-image-height: 50px !default;
82-
83-
/* Susy grid settings */
84-
$susy: (columns: 16, gutters: 0, math: fluid, output: float) !default;

0 commit comments

Comments
 (0)