Skip to content

Commit b9b4519

Browse files
committed
added crucial version of jekyll to Gemfile
1 parent eef58c3 commit b9b4519

File tree

6 files changed

+38
-80
lines changed

6 files changed

+38
-80
lines changed

Gemfile

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

3-
gem 'jekyll', '~>2.0.3'
3+
gem 'jekyll','1.1.2'

Gemfile.lock

+17-43
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,38 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
blankslate (2.1.2.4)
5-
celluloid (0.15.2)
6-
timers (~> 1.1.0)
74
classifier (1.3.4)
85
fast-stemmer (>= 1.0.0)
9-
coffee-script (2.2.0)
10-
coffee-script-source
11-
execjs
12-
coffee-script-source (1.4.0)
136
colorator (0.1)
14-
execjs (1.4.0)
15-
multi_json (~> 1.0)
7+
commander (4.1.6)
8+
highline (~> 1.6.11)
9+
directory_watcher (1.4.1)
1610
fast-stemmer (1.0.2)
17-
ffi (1.9.3)
18-
jekyll (2.0.3)
11+
highline (1.6.21)
12+
jekyll (1.1.2)
1913
classifier (~> 1.3)
2014
colorator (~> 0.1)
21-
jekyll-coffeescript (~> 1.0)
22-
jekyll-sass-converter (~> 1.0)
23-
kramdown (~> 1.3)
24-
liquid (~> 2.5.5)
25-
listen (~> 2.5)
26-
mercenary (~> 0.3.3)
15+
commander (~> 4.1.3)
16+
directory_watcher (~> 1.4.1)
17+
kramdown (~> 1.0.2)
18+
liquid (~> 2.5.1)
19+
maruku (~> 0.5)
2720
pygments.rb (~> 0.5.0)
28-
redcarpet (~> 3.1)
29-
safe_yaml (~> 1.0)
30-
toml (~> 0.1.0)
31-
jekyll-coffeescript (1.0.0)
32-
coffee-script (~> 2.2)
33-
jekyll-sass-converter (1.0.0)
34-
sass (~> 3.2)
35-
kramdown (1.3.3)
21+
redcarpet (~> 2.2.2)
22+
safe_yaml (~> 0.7.0)
23+
kramdown (1.0.2)
3624
liquid (2.5.5)
37-
listen (2.7.5)
38-
celluloid (>= 0.15.2)
39-
rb-fsevent (>= 0.9.3)
40-
rb-inotify (>= 0.9)
41-
mercenary (0.3.3)
42-
multi_json (1.6.1)
43-
parslet (1.5.0)
44-
blankslate (~> 2.0)
25+
maruku (0.7.1)
4526
posix-spawn (0.3.8)
4627
pygments.rb (0.5.4)
4728
posix-spawn (~> 0.3.6)
4829
yajl-ruby (~> 1.1.0)
49-
rb-fsevent (0.9.4)
50-
rb-inotify (0.9.4)
51-
ffi (>= 0.5.0)
52-
redcarpet (3.1.2)
53-
safe_yaml (1.0.3)
54-
sass (3.2.5)
55-
timers (1.1.0)
56-
toml (0.1.1)
57-
parslet (~> 1.5.0)
30+
redcarpet (2.2.2)
31+
safe_yaml (0.7.1)
5832
yajl-ruby (1.1.0)
5933

6034
PLATFORMS
6135
ruby
6236

6337
DEPENDENCIES
64-
jekyll (~> 2.0.3)
38+
jekyll (= 1.1.2)

_config.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
name: Learn to Code
22
highlighter: pygments
3-
markdown: kramdown

_sessions/c1s3/3_bootstrap_layout.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ Bootstrap works on a grid layout, with 12 columns (by default). You can create a
4040

4141
The number after the `col-sm-` determines how many of the 12 grid columns that page column takes up. The `sm` bit determines the width at which the columns will collapse on top of each other (which is useful when viewing your site on a phone). For more information see the [Grid system docs](http://getbootstrap.com/css/#grid).
4242

43-
{% exercise %}
44-
1. Add a `div class='container'` around the page content.
45-
2. Create a row at the top of the page, with two columns, with the left twice as wide as the right. Put the `h1` in the left column and the `img src='images/sandwich.png' ` on the right.
46-
3. Create a row with three equal colums to hold each of 'The Buzz' `div`s.
47-
{% endexercise %}
43+
{% exercise %}
44+
1. Add a `div class='container'` around the page content.
45+
2. Create a row at the top of the page, with two columns, with the left twice as wide as the right. Put the `h1` in the left column and the `img src='images/sandwich.png'` on the right.
46+
3. Create a row with three equal colums to hold each of 'The Buzz' `div`s.
47+
{% endexercise %}

_sessions/c1s3/4_more_bootstrap.md

+10-15
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ title: More Bootstrap
66

77
Skim through the [typography section](http://getbootstrap.com/css/#type) of the bootstrap docs.
88

9-
{% exercise %}
10-
1. Change the quotes in 'The Buzz' to use [blockquotes](http://getbootstrap.com/css/#type-blockquotes). (Don't worry about the vertical grey lines - we'll remove those later.)
9+
{% exercise %}
10+
1. Change the quotes in 'The Buzz' to use [blockquotes](http://getbootstrap.com/css/#type-blockquotes). (Don't worry about the vertical grey lines - we'll remove those later.)
1111
2. Change the paragraphs in 'Our mission' to be [lead body copy](http://getbootstrap.com/css/#type-body-copy).
1212
{% endexercise %}
1313

@@ -16,29 +16,24 @@ Skim through the [typography section](http://getbootstrap.com/css/#type) of the
1616

1717
Check out the [buttons section](http://getbootstrap.com/css/#buttons) (CSS > Buttons).
1818

19-
{% exercise %}
20-
<ol markdown="1">
21-
<li markdown="1">Change the 'Send' button to a success button:
19+
{% exercise %}
20+
1. Change the 'Send' button to a success button:
2221
{% highlight html %}
23-
<button class='btn btn-success' >Send</button>
22+
<button class='btn btn-success'>Send</button>
2423
{% endhighlight %}
25-
You might also need `btn-small` in the Recent Activity section.
26-
</li>
27-
<li markdown="1">
24+
You might also need `btn-small` in the Recent Activity section.
2825
2. Make the social links at the bottom in to large buttons (we'll colour them later):
2926
{% highlight html %}
30-
<button class='btn btn-lg' >Send</button>
27+
<button class='btn btn-lg'>Send</button>
3128
{% endhighlight %}
32-
</li>
33-
</ol>
3429
{% endexercise %}
3530

3631
### Images
3732

3833
Have a look at the [image section](http://getbootstrap.com/css/#images) of the Bootstrap docs (CSS > Images).
3934

40-
{% exercise %}
41-
1. Make the images in 'The Buzz' round, by adding the `img-circle` class.
42-
2. You can center the image by adding the [helper class](http://getbootstrap.com/css/#helper-classes-center) `center-block`.
35+
{% exercise %}
36+
1. Make the images in 'The Buzz' round, by adding the `img-circle` class.
37+
2. You can center the image by adding the [helper class](http://getbootstrap.com/css/#helper-classes-center) `center-block`.
4338
2. Change the main sandwich image into a `img-responsive`, as described in the [responsive images section](http://getbootstrap.com/css/#overview-responsive-images). Try resizing your browser and see how it changes size.
4439
{% endexercise %}

_sessions/c1s3/5_modifying_bootstrap.md

+5-15
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ title: Modifying Bootstrap
99
If you're going to modify Bootstrap **don't touch the Bootstrap files**. Instead create a new css file of your own to overwrite anything you don't want. This means when a new version of Bootstrap comes out you can upgrade by dragging the new version over the top of the old, without losing any modifications.
1010

1111

12-
{% exercise %}
13-
<ol markdown="1">
14-
<li markdown="1">
15-
Create a file called `main.css` and write the following CSS:
12+
{% exercise %}
13+
1. Create a file called `main.css` and write the following CSS:
1614
{% highlight css %}
1715
#social-buttons button {
1816
color: white;
@@ -21,25 +19,17 @@ Create a file called `main.css` and write the following CSS:
2119
background-color: #00acee;
2220
border-color: #009ad5;
2321
}
24-
2522
.btn-facebook {
2623
background-color: #4868ac;
2724
border-color: #314776;
2825
}
29-
3026
.btn-pinterest {
3127
background-color: #b62f26;
3228
border-color: #b62f26;
3329
}
3430
{% endhighlight %}
35-
</li>
36-
<li markdown="1">
37-
Link this file into the `head` of `index.html` **underneath your link to bootstrap**.
38-
</li>
39-
<li markdown="1">
40-
What happens? Notice how in the first rule we've selected only those buttons that exist inside an element with `id=social-buttons`.
41-
</li>
42-
</ol>
31+
2. Link this file into the `head` of `index.html` **underneath your link to bootstrap**.
32+
3. What happens? Notice how in the first rule we've selected only those buttons that exist inside an element with `id=social-buttons`.
4333
{% endexercise %}
4434

4535
### Changing the background
@@ -98,4 +88,4 @@ There are various other changes you will need to make your site look like the ex
9888
{% exercise %}
9989
1. Make any other changes necessary to make your site look like [the example](http://code61.github.io/bootstrap_exercise/)
10090
2. If you get stuck check by looking at the [gh-pages branch](https://github.com/code61/bootstrap_exercise/tree/gh-pages) on the github repo.
101-
{% endexercise %}
91+
{% endexercise %}

0 commit comments

Comments
 (0)