Skip to content

Commit 628be74

Browse files
Update theme and CSS management
Now using Sass http://sass-lang.com See mmistakes/minimal-mistakes#333
1 parent 152ebc8 commit 628be74

File tree

117 files changed

+404
-146
lines changed

Some content is hidden

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

117 files changed

+404
-146
lines changed

Gemfile

+23-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
source "https://rubygems.org"
22

3-
gem "github-pages"
4-
# gem "jekyll-archives"
5-
gem "wdm", "~> 0.1.0" if Gem.win_platform?
3+
# Hello! This is where you manage which Jekyll version is used to run.
4+
# When you want to use a different version, change it below, save the
5+
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
6+
#
7+
# bundle exec jekyll serve
8+
#
9+
# This will help ensure the proper Jekyll version is running.
10+
# Happy Jekylling!
11+
12+
gem "github-pages", group: :jekyll_plugins
13+
14+
# If you want to use Jekyll native, uncomment the line below.
15+
# To upgrade, run `bundle update`.
16+
17+
# gem "jekyll"
18+
19+
gem "wdm", "~> 0.1.0" if Gem.win_platform?
20+
21+
# If you have any plugins, put them here!
22+
group :jekyll_plugins do
23+
# gem "jekyll-archives"
24+
gem "jekyll-feed"
25+
end

Gemfile.lock

+19-11
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,39 @@ GEM
1212
coffee-script-source
1313
execjs
1414
coffee-script-source (1.10.0)
15-
colorator (0.1)
15+
colorator (1.1.0)
1616
ethon (0.9.0)
1717
ffi (>= 1.3.0)
1818
execjs (2.7.0)
1919
faraday (0.9.2)
2020
multipart-post (>= 1.2, < 3)
2121
ffi (1.9.14)
2222
ffi (1.9.14-x64-mingw32)
23+
forwardable-extended (2.6.0)
2324
gemoji (2.1.0)
24-
github-pages (88)
25+
github-pages (93)
2526
activesupport (= 4.2.7)
26-
github-pages-health-check (= 1.1.0)
27-
jekyll (= 3.1.6)
27+
github-pages-health-check (= 1.2.0)
28+
jekyll (= 3.2.1)
2829
jekyll-coffeescript (= 1.0.1)
2930
jekyll-feed (= 0.5.1)
3031
jekyll-gist (= 1.4.0)
3132
jekyll-github-metadata (= 2.0.2)
32-
jekyll-mentions (= 1.1.2)
33+
jekyll-mentions (= 1.1.3)
3334
jekyll-paginate (= 1.1.0)
3435
jekyll-redirect-from (= 0.11.0)
3536
jekyll-sass-converter (= 1.3.0)
3637
jekyll-seo-tag (= 2.0.0)
3738
jekyll-sitemap (= 0.10.0)
38-
jemoji (= 0.6.2)
39+
jemoji (= 0.7.0)
3940
kramdown (= 1.11.1)
4041
liquid (= 3.0.6)
4142
listen (= 3.0.6)
4243
mercenary (~> 0.3)
44+
minima (= 1.0.1)
4345
rouge (= 1.11.1)
4446
terminal-table (~> 1.4)
45-
github-pages-health-check (1.1.0)
47+
github-pages-health-check (1.2.0)
4648
addressable (~> 2.3)
4749
net-dns (~> 0.8)
4850
octokit (~> 4.0)
@@ -52,13 +54,14 @@ GEM
5254
activesupport (>= 2)
5355
nokogiri (>= 1.4)
5456
i18n (0.7.0)
55-
jekyll (3.1.6)
56-
colorator (~> 0.1)
57+
jekyll (3.2.1)
58+
colorator (~> 1.0)
5759
jekyll-sass-converter (~> 1.0)
5860
jekyll-watch (~> 1.1)
5961
kramdown (~> 1.3)
6062
liquid (~> 3.0)
6163
mercenary (~> 0.3.3)
64+
pathutil (~> 0.9)
6265
rouge (~> 1.7)
6366
safe_yaml (~> 1.0)
6467
jekyll-coffeescript (1.0.1)
@@ -69,7 +72,7 @@ GEM
6972
jekyll-github-metadata (2.0.2)
7073
jekyll (~> 3.1)
7174
octokit (~> 4.0)
72-
jekyll-mentions (1.1.2)
75+
jekyll-mentions (1.1.3)
7376
html-pipeline (~> 2.3)
7477
jekyll (~> 3.0)
7578
jekyll-paginate (1.1.0)
@@ -82,7 +85,8 @@ GEM
8285
jekyll-sitemap (0.10.0)
8386
jekyll-watch (1.5.0)
8487
listen (~> 3.0, < 3.1)
85-
jemoji (0.6.2)
88+
jemoji (0.7.0)
89+
activesupport (~> 4.0)
8690
gemoji (~> 2.0)
8791
html-pipeline (~> 2.2)
8892
jekyll (>= 3.0)
@@ -94,6 +98,7 @@ GEM
9498
rb-inotify (>= 0.9.7)
9599
mercenary (0.3.6)
96100
mini_portile2 (2.1.0)
101+
minima (1.0.1)
97102
minitest (5.9.0)
98103
multipart-post (2.0.0)
99104
net-dns (0.8.0)
@@ -105,6 +110,8 @@ GEM
105110
pkg-config (~> 1.1.7)
106111
octokit (4.3.0)
107112
sawyer (~> 0.7.0, >= 0.5.3)
113+
pathutil (0.14.0)
114+
forwardable-extended (~> 2.6)
108115
pkg-config (1.1.7)
109116
public_suffix (1.5.3)
110117
rb-fsevent (0.9.7)
@@ -129,6 +136,7 @@ PLATFORMS
129136

130137
DEPENDENCIES
131138
github-pages
139+
jekyll-feed
132140

133141
BUNDLED WITH
134142
1.12.5

_config.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ include:
101101
exclude:
102102
- "*.sublime-project"
103103
- "*.sublime-workspace"
104+
- vendor
104105
- .asset-cache
105106
- .bundle
106107
- .jekyll-assets-cache
@@ -248,6 +249,11 @@ defaults:
248249
sidebar:
249250
nav: "design-forces"
250251

252+
# Sass/SCSS
253+
sass:
254+
sass_dir: _sass
255+
style: compressed # http://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style
256+
251257

252258
# Outputting
253259
permalink: /:categories/:title/
@@ -263,7 +269,6 @@ gems:
263269
- jekyll-gist
264270
- jekyll-feed
265271
- jemoji
266-
- jekyll-redirect-from
267272

268273
# mimic GitHub Pages with --safe
269274
whitelist:
@@ -272,7 +277,6 @@ whitelist:
272277
- jekyll-gist
273278
- jekyll-feed
274279
- jemoji
275-
- jekyll-redirect-from
276280

277281

278282
# Archives

_geniuss-place/02-contribute.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,11 @@ Configuration file: /path_to_cloned_repo/geniuss-place/_config.yml
8888

8989
Just point your browser to that [local direction](http://127.0.0.1:4000/geniuss-place/){:target="_blank"} in order to enjoy this website without the need of Internet connection. Some features such as comments might not work.
9090

91-
**Pro Tip**: if you want to modify Stylesheets or JavaScript (under ```/assets/_scss``` and ```assets/js```, respectively), you will need to install [Node.js](https://nodejs.org/en/){:target="_blank"}, ```cd```to the root of your project, and run ```$ npm install``` to get all the dependencies. If all gone well, then running ```$ npm run build:css``` will process all SCSS files into ```main.css```, and ```npm build:js``` will compress/concatenate ```_main.js``` and all plugin scripts into ```main.min.js```. Thus, upon a change on css or JavaScript content, run:
92-
```
93-
$ npm run build:css
94-
```
95-
or
91+
**Pro Tip**: if you want to modify JavaScript (under ```assets/js```), you will need to install [Node.js](https://nodejs.org/en/){:target="_blank"}, ```cd```to the root of your project, and run ```$ npm install``` to get all the dependencies. If all gone well, then running ```npm run build:js``` will compress/concatenate ```_main.js``` and all plugin scripts into ```main.min.js```. Thus, upon a change on JavaScript content, run:
9692
```
9793
$ npm run build:js
9894
```
99-
in order to update ```main.css``` and ```main.js``` scripts and implement the changes on the website.
95+
in order to update the ```main.js``` script and implement the changes on the website.
10096
{: .notice--warning}
10197

10298
**Note**: If you upgraded from a previous version of the theme be sure you copied over ```package.json``` prior to running ```npm install```.

_layouts/archive.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: default
33
---
44

5-
{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %}
5+
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
66
{% include page__hero.html %}
77
{% endif %}
88

_layouts/single.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{% include base_path %}
66

7-
{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %}
7+
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
88
{% include page__hero.html %}
99
{% endif %}
1010

@@ -35,7 +35,7 @@
3535

3636
<section class="page__content" itemprop="text">
3737
{{ content }}
38-
{% if page.link %}<div><a href="{{ page.link }}" class="btn">{{ site.data.ui-text[site.locale].ext_link_label }}</a></div>{% endif %}
38+
{% if page.link %}<div><a href="{{ page.link }}" class="btn">{{ site.data.ui-text[site.locale].ext_link_label | default: "Direct Link" }}</a></div>{% endif %}
3939
</section>
4040

4141
<footer class="page__meta">
@@ -44,9 +44,9 @@ <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4
4444
{% endif %}
4545
{% include page__taxonomy.html %}
4646
{% if page.modified %}
47-
<p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label }}</strong> <time datetime="{{ page.modified | date: "%Y-%m-%d" }}">{{ page.modified | date: "%B %d, %Y" }}</time></p>
47+
<p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.modified | date: "%Y-%m-%d" }}">{{ page.modified | date: "%B %d, %Y" }}</time></p>
4848
{% elsif page.date %}
49-
<p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label }}</strong> <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time></p>
49+
<p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time></p>
5050
{% endif %}
5151
</footer>
5252

@@ -64,7 +64,7 @@ <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4
6464
{% if page.id and page.related and site.related_posts.size > 0 %}
6565
<div class="page__related">
6666
{% if site.data.ui-text[site.locale].related_label %}
67-
<h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label }}</h4>
67+
<h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
6868
{% endif %}
6969
<div class="grid__wrapper">
7070
{% for post in site.related_posts limit:4 %}
@@ -73,4 +73,4 @@ <h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label
7373
</div>
7474
</div>
7575
{% endif %}
76-
</div>
76+
</div>

_layouts/splash.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{% include base_path %}
66

7-
{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %}
7+
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
88
{% include page__hero.html %}
99
{% endif %}
1010

@@ -19,4 +19,4 @@
1919
{{ content }}
2020
</section>
2121
</article>
22-
</div>
22+
</div>

assets/_scss/_animations.scss _sass/_animations.scss

+9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
ANIMATIONS
33
========================================================================== */
44

5+
@-webkit-keyframes intro {
6+
0% {
7+
opacity: 0;
8+
}
9+
100% {
10+
opacity: 1;
11+
}
12+
}
13+
514
@keyframes intro {
615
0% {
716
opacity: 0;

assets/_scss/_archive.scss _sass/_archive.scss

+8-4
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,13 @@
3535
.archive__item-title {
3636
margin-bottom: 0.25em;
3737
font-family: $sans-serif-narrow;
38+
39+
a + a {
40+
opacity: 0.5;
41+
}
3842
}
3943

40-
// remove border
44+
/* remove border*/
4145
.page__content {
4246

4347
.archive__item-title {
@@ -63,7 +67,7 @@
6367
}
6468
}
6569

66-
a:hover {
70+
.archive__item:hover {
6771
.archive__item-teaser {
6872
box-shadow: 0 0 10px rgba(#000, 0.25);
6973
}
@@ -125,8 +129,8 @@ a:hover {
125129
}
126130

127131
@include breakpoint($medium) {
128-
margin-left: 0; // reset before mixin does its thing
129-
margin-right: 0; // reset before mixin does its thing
132+
margin-left: 0; /* reset before mixin does its thing*/
133+
margin-right: 0; /* reset before mixin does its thing*/
130134
@include gallery(2.5 of 10);
131135

132136
.archive__item-teaser {

assets/_scss/_base.scss _sass/_base.scss

+10-4
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ tt, code, kbd, samp, pre {
123123
}
124124

125125
pre {
126-
overflow-x: auto; // add scrollbars to wide code blocks
126+
overflow-x: auto; /* add scrollbars to wide code blocks*/
127127
}
128128

129129
p > code,
@@ -141,7 +141,7 @@ td > code {
141141

142142
&:before, &:after {
143143
letter-spacing: -0.2em;
144-
content: "\00a0"; // non-breaking space
144+
content: "\00a0"; /* non-breaking space*/
145145
}
146146
}
147147

@@ -173,9 +173,12 @@ li ol {
173173
/* Figures and images */
174174

175175
figure {
176+
display: -webkit-box;
176177
display: flex;
177-
justify-content: space-between;
178-
align-items: flex-start;
178+
-webkit-box-pack: justify;
179+
justify-content: space-between;
180+
-webkit-box-align: start;
181+
align-items: flex-start;
179182
flex-wrap: wrap;
180183
margin: 2em 0;
181184

@@ -188,6 +191,7 @@ figure {
188191
img {
189192
width: 100%;
190193
border-radius: $border-radius;
194+
-webkit-transition: $global-transition;
191195
transition: $global-transition;
192196
}
193197

@@ -234,6 +238,7 @@ figcaption {
234238
color: inherit;
235239
text-decoration: none;
236240
border-bottom: 1px solid $light-gray;
241+
-webkit-transition: $global-transition;
237242
transition: $global-transition;
238243

239244
&:hover {
@@ -299,5 +304,6 @@ nav {
299304
========================================================================== */
300305

301306
b, i, strong, em, blockquote, p, q, span, figure, img, h1, h2, header, input, a, tr, td, form button, input[type="submit"], .btn, .highlight, .archive__item-teaser {
307+
-webkit-transition: $global-transition;
302308
transition: $global-transition;
303309
}

0 commit comments

Comments
 (0)