Skip to content

Commit

Permalink
Merge branch 'master' into label-wrap
Browse files Browse the repository at this point in the history
  • Loading branch information
hopearmstrong authored Apr 19, 2018
2 parents 4c08669 + 0642543 commit 1ceaff7
Show file tree
Hide file tree
Showing 8 changed files with 189 additions and 73 deletions.
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.4.2
12 changes: 5 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -86,23 +86,21 @@ GEM
gemoji (~> 2.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0)
json (1.8.3)
json (1.8.6)
kramdown (1.11.1)
liquid (3.0.6)
listen (3.0.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
mercenary (0.3.6)
mini_portile2 (2.1.0)
mini_portile2 (2.3.0)
minitest (5.9.0)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
pkg-config (1.1.7)
public_suffix (1.5.3)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
Expand All @@ -127,4 +125,4 @@ DEPENDENCIES
github-pages

BUNDLED WITH
1.12.5
1.16.0
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Leap is an internal CSS library made for Treehouse. It contains immutable utilit
## Quick Start
Several options are available for installing Leap into your project.

* [Download the latest release](https://github.com/treehouse/project-leap/archive/v0.8.8.zip)
* [Download the latest release](https://github.com/treehouse/project-leap/archive/v0.9.0.zip)

* Clone the repo: `git clone https://github.com/treehouse/project-leap.git`
* Install with [Bower](http://bower.io)

Expand All @@ -23,4 +24,4 @@ To get Jekyll running follow these steps:
Way to go, nerd. You should be up and running now!

## Copyright and license
Code and documentation copyright 2016 Treehouse Island, Inc. Code released under the [MIT license](https://github.com/treehouse/project-leap/LICENSE).
Code and documentation copyright 2018 Treehouse Island, Inc. Code released under the [MIT license](https://github.com/treehouse/project-leap/LICENSE).
7 changes: 6 additions & 1 deletion _sass/leap/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$leap-version: "0.8.8";
$leap-version: "0.9.0";

// Brand Colors
$brand-colors: (
Expand Down Expand Up @@ -150,6 +150,11 @@ $topic-colors: (
base: #80438E,
dark: #60226F,
),
"machine-learning": (
light: #459F7F,
base: #2D6853,
dark: #214d3d,
),
"undefined": (
light: #8c959d,
base: #717b85,
Expand Down
150 changes: 118 additions & 32 deletions css/leap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/leap.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit 1ceaff7

Please sign in to comment.