Skip to content

Commit

Permalink
Update theme and CSS management
Browse files Browse the repository at this point in the history
  • Loading branch information
carlesfernandez committed Sep 10, 2016
1 parent 152ebc8 commit 628be74
Show file tree
Hide file tree
Showing 117 changed files with 404 additions and 146 deletions.
26 changes: 23 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
source "https://rubygems.org"

gem "github-pages"
# gem "jekyll-archives"
gem "wdm", "~> 0.1.0" if Gem.win_platform?
# Hello! This is where you manage which Jekyll version is used to run.
# When you want to use a different version, change it below, save the
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
#
# bundle exec jekyll serve
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!

gem "github-pages", group: :jekyll_plugins

# If you want to use Jekyll native, uncomment the line below.
# To upgrade, run `bundle update`.

# gem "jekyll"

gem "wdm", "~> 0.1.0" if Gem.win_platform?

# If you have any plugins, put them here!
group :jekyll_plugins do
# gem "jekyll-archives"
gem "jekyll-feed"
end
30 changes: 19 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,39 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.10.0)
colorator (0.1)
colorator (1.1.0)
ethon (0.9.0)
ffi (>= 1.3.0)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.14)
ffi (1.9.14-x64-mingw32)
forwardable-extended (2.6.0)
gemoji (2.1.0)
github-pages (88)
github-pages (93)
activesupport (= 4.2.7)
github-pages-health-check (= 1.1.0)
jekyll (= 3.1.6)
github-pages-health-check (= 1.2.0)
jekyll (= 3.2.1)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.5.1)
jekyll-gist (= 1.4.0)
jekyll-github-metadata (= 2.0.2)
jekyll-mentions (= 1.1.2)
jekyll-mentions (= 1.1.3)
jekyll-paginate (= 1.1.0)
jekyll-redirect-from (= 0.11.0)
jekyll-sass-converter (= 1.3.0)
jekyll-seo-tag (= 2.0.0)
jekyll-sitemap (= 0.10.0)
jemoji (= 0.6.2)
jemoji (= 0.7.0)
kramdown (= 1.11.1)
liquid (= 3.0.6)
listen (= 3.0.6)
mercenary (~> 0.3)
minima (= 1.0.1)
rouge (= 1.11.1)
terminal-table (~> 1.4)
github-pages-health-check (1.1.0)
github-pages-health-check (1.2.0)
addressable (~> 2.3)
net-dns (~> 0.8)
octokit (~> 4.0)
Expand All @@ -52,13 +54,14 @@ GEM
activesupport (>= 2)
nokogiri (>= 1.4)
i18n (0.7.0)
jekyll (3.1.6)
colorator (~> 0.1)
jekyll (3.2.1)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 3.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-coffeescript (1.0.1)
Expand All @@ -69,7 +72,7 @@ GEM
jekyll-github-metadata (2.0.2)
jekyll (~> 3.1)
octokit (~> 4.0)
jekyll-mentions (1.1.2)
jekyll-mentions (1.1.3)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-paginate (1.1.0)
Expand All @@ -82,7 +85,8 @@ GEM
jekyll-sitemap (0.10.0)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
jemoji (0.6.2)
jemoji (0.7.0)
activesupport (~> 4.0)
gemoji (~> 2.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0)
Expand All @@ -94,6 +98,7 @@ GEM
rb-inotify (>= 0.9.7)
mercenary (0.3.6)
mini_portile2 (2.1.0)
minima (1.0.1)
minitest (5.9.0)
multipart-post (2.0.0)
net-dns (0.8.0)
Expand All @@ -105,6 +110,8 @@ GEM
pkg-config (~> 1.1.7)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
pathutil (0.14.0)
forwardable-extended (~> 2.6)
pkg-config (1.1.7)
public_suffix (1.5.3)
rb-fsevent (0.9.7)
Expand All @@ -129,6 +136,7 @@ PLATFORMS

DEPENDENCIES
github-pages
jekyll-feed

BUNDLED WITH
1.12.5
8 changes: 6 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ include:
exclude:
- "*.sublime-project"
- "*.sublime-workspace"
- vendor
- .asset-cache
- .bundle
- .jekyll-assets-cache
Expand Down Expand Up @@ -248,6 +249,11 @@ defaults:
sidebar:
nav: "design-forces"

# Sass/SCSS
sass:
sass_dir: _sass
style: compressed # http://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style


# Outputting
permalink: /:categories/:title/
Expand All @@ -263,7 +269,6 @@ gems:
- jekyll-gist
- jekyll-feed
- jemoji
- jekyll-redirect-from

# mimic GitHub Pages with --safe
whitelist:
Expand All @@ -272,7 +277,6 @@ whitelist:
- jekyll-gist
- jekyll-feed
- jemoji
- jekyll-redirect-from


# Archives
Expand Down
8 changes: 2 additions & 6 deletions _geniuss-place/02-contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,11 @@ Configuration file: /path_to_cloned_repo/geniuss-place/_config.yml

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.

**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:
```
$ npm run build:css
```
or
**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:
```
$ npm run build:js
```
in order to update ```main.css``` and ```main.js``` scripts and implement the changes on the website.
in order to update the ```main.js``` script and implement the changes on the website.
{: .notice--warning}

**Note**: If you upgraded from a previous version of the theme be sure you copied over ```package.json``` prior to running ```npm install```.
Expand Down
2 changes: 1 addition & 1 deletion _layouts/archive.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: default
---

{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %}
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
{% include page__hero.html %}
{% endif %}

Expand Down
12 changes: 6 additions & 6 deletions _layouts/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{% include base_path %}

{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %}
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
{% include page__hero.html %}
{% endif %}

Expand Down Expand Up @@ -35,7 +35,7 @@

<section class="page__content" itemprop="text">
{{ content }}
{% if page.link %}<div><a href="{{ page.link }}" class="btn">{{ site.data.ui-text[site.locale].ext_link_label }}</a></div>{% endif %}
{% 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 %}
</section>

<footer class="page__meta">
Expand All @@ -44,9 +44,9 @@ <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4
{% endif %}
{% include page__taxonomy.html %}
{% if page.modified %}
<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>
<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>
{% elsif page.date %}
<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>
<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>
{% endif %}
</footer>

Expand All @@ -64,7 +64,7 @@ <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4
{% if page.id and page.related and site.related_posts.size > 0 %}
<div class="page__related">
{% if site.data.ui-text[site.locale].related_label %}
<h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label }}</h4>
<h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
{% endif %}
<div class="grid__wrapper">
{% for post in site.related_posts limit:4 %}
Expand All @@ -73,4 +73,4 @@ <h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label
</div>
</div>
{% endif %}
</div>
</div>
4 changes: 2 additions & 2 deletions _layouts/splash.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{% include base_path %}

{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %}
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
{% include page__hero.html %}
{% endif %}

Expand All @@ -19,4 +19,4 @@
{{ content }}
</section>
</article>
</div>
</div>
9 changes: 9 additions & 0 deletions assets/_scss/_animations.scss → _sass/_animations.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
ANIMATIONS
========================================================================== */

@-webkit-keyframes intro {
0% {
opacity: 0;
}
100% {
opacity: 1;
}
}

@keyframes intro {
0% {
opacity: 0;
Expand Down
12 changes: 8 additions & 4 deletions assets/_scss/_archive.scss → _sass/_archive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,13 @@
.archive__item-title {
margin-bottom: 0.25em;
font-family: $sans-serif-narrow;

a + a {
opacity: 0.5;
}
}

// remove border
/* remove border*/
.page__content {

.archive__item-title {
Expand All @@ -63,7 +67,7 @@
}
}

a:hover {
.archive__item:hover {
.archive__item-teaser {
box-shadow: 0 0 10px rgba(#000, 0.25);
}
Expand Down Expand Up @@ -125,8 +129,8 @@ a:hover {
}

@include breakpoint($medium) {
margin-left: 0; // reset before mixin does its thing
margin-right: 0; // reset before mixin does its thing
margin-left: 0; /* reset before mixin does its thing*/
margin-right: 0; /* reset before mixin does its thing*/
@include gallery(2.5 of 10);

.archive__item-teaser {
Expand Down
14 changes: 10 additions & 4 deletions assets/_scss/_base.scss → _sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ tt, code, kbd, samp, pre {
}

pre {
overflow-x: auto; // add scrollbars to wide code blocks
overflow-x: auto; /* add scrollbars to wide code blocks*/
}

p > code,
Expand All @@ -141,7 +141,7 @@ td > code {

&:before, &:after {
letter-spacing: -0.2em;
content: "\00a0"; // non-breaking space
content: "\00a0"; /* non-breaking space*/
}
}

Expand Down Expand Up @@ -173,9 +173,12 @@ li ol {
/* Figures and images */

figure {
display: -webkit-box;
display: flex;
justify-content: space-between;
align-items: flex-start;
-webkit-box-pack: justify;
justify-content: space-between;
-webkit-box-align: start;
align-items: flex-start;
flex-wrap: wrap;
margin: 2em 0;

Expand All @@ -188,6 +191,7 @@ figure {
img {
width: 100%;
border-radius: $border-radius;
-webkit-transition: $global-transition;
transition: $global-transition;
}

Expand Down Expand Up @@ -234,6 +238,7 @@ figcaption {
color: inherit;
text-decoration: none;
border-bottom: 1px solid $light-gray;
-webkit-transition: $global-transition;
transition: $global-transition;

&:hover {
Expand Down Expand Up @@ -299,5 +304,6 @@ nav {
========================================================================== */

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 {
-webkit-transition: $global-transition;
transition: $global-transition;
}
Loading

0 comments on commit 628be74

Please sign in to comment.