Skip to content

Commit e017a97

Browse files
mwileymwiley
committed
adds some bootstrap styling
1 parent cbcb547 commit e017a97

16 files changed

+375
-56
lines changed

‎Gemfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@ gem 'jekyll-assets'
66
gem 'uglifier'
77

88
gem 'bootstrap-sass'
9+
gem 'font-awesome-sass'
910

1011
gem 'rake'
1112
gem 'rake-jekyll'
1213
gem 'html-proofer'
1314

14-
source 'https://rails-assets.org' do
15+
source 'http://rails-assets.org' do
1516
group :rails_assets do
1617
gem 'rails-assets-jquery'
1718
gem 'rails-assets-moment'
1819
gem 'rails-assets-fullcalendar'
1920
end
2021
end
2122

22-
gem 'wdm', '~> 0.1.0' if Gem.win_platform?
23+
gem 'wdm' if Gem.win_platform?

‎_assets/stylesheets/_base.scss

+5-14
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ a {
102102
}
103103
}
104104

105+
.button {
106+
@extend .btn;
107+
@extend .btn-primary;
108+
}
105109

106110

107111
/**
@@ -154,20 +158,7 @@ pre {
154158
* Wrapper
155159
*/
156160
.wrapper {
157-
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2));
158-
max-width: calc(#{$content-width} - (#{$spacing-unit} * 2));
159-
margin-right: auto;
160-
margin-left: auto;
161-
padding-right: $spacing-unit;
162-
padding-left: $spacing-unit;
163-
@extend %clearfix;
164-
165-
@include media-query($on-laptop) {
166-
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
167-
max-width: calc(#{$content-width} - (#{$spacing-unit}));
168-
padding-right: $spacing-unit / 2;
169-
padding-left: $spacing-unit / 2;
170-
}
161+
@extend .container;
171162
}
172163

173164

‎_assets/stylesheets/_layout.scss

+32-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
* Site header
33
*/
44
.site-header {
5+
@extend .col-md-12;
56
padding: 20px 0;
7+
margin-bottom: 50px;
68
background-color: $primary-color-dark;
79
border-top: 5px solid $secondary-color-2;
810
border-bottom: 5px solid $secondary-color-2-light;
@@ -193,15 +195,10 @@
193195
*/
194196
.fc-day-grid-event {
195197
background-color: $secondary-color-2;
198+
box-shadow: 2px 2px 2px $grey-color-light;
196199
height: 35px;
197200
border: none;
198201
padding: 2px;
199-
&:hover {
200-
z-index: 999999;
201-
box-shadow: 2px 2px 2px $grey-color-light;
202-
height: 40px;
203-
width: 200px;
204-
}
205202
&, &:hover, &:visited {
206203
color: #fff;
207204
}
@@ -245,3 +242,32 @@
245242
}
246243
}
247244
}
245+
.post > .post-content {
246+
word-wrap: break-word;
247+
width: 35em;
248+
}
249+
/**
250+
* Events
251+
*/
252+
.event > .post-content {
253+
word-wrap: break-word;
254+
width: 35em;
255+
}
256+
.event-date {
257+
padding: 6px 12px;
258+
font-size: 14px;
259+
display: inline-block;
260+
@include border-radius(4px);
261+
border-color: $secondary-color-2;
262+
background: $secondary-color-2;
263+
color: $secondary-color-dark;
264+
font-weight: bold;
265+
}
266+
.calendar-icon {
267+
@extend .glyphicon, .glyphicon-calendar;
268+
margin-right: 4px;
269+
}
270+
.slideshow-icon {
271+
@extend .glyphicon, .glyphicon-play;
272+
margin-right: 4px;
273+
}

‎_assets/stylesheets/main.scss

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
@charset "utf-8";
22
@import url(//fonts.googleapis.com/css?family=Share+Tech+Mono|Merriweather);
3-
3+
@icon-font-path "/assets/fonts";
44
// Our variables
55
$base-font-family: 'Merriweather', serif;
66
$base-font-size: 16px;
77
$small-font-size: $base-font-size * 0.875;
8-
$base-line-height: 1.5;
8+
$base-line-height: 1.6;
99
$spacing-unit: 30px;
1010

1111
//color definitions
@@ -20,13 +20,11 @@ $grey-color-dark: darken($grey-color, 25%);
2020
$primary-color: #B52626;
2121
$primary-color-dark: darken($primary-color, 20%);
2222
$secondary-color: #2B7E7E;
23+
$secondary-color-dark: darken($secondary-color, 20%);
2324
$secondary-color-2: #99C542;
2425
$secondary-color-2-light: lighten($secondary-color-2, 30%);
2526

26-
// Width of the content area
27-
$content-width: 800px;
28-
29-
$on-palm: 600px;
27+
$on-palm: 685px;
3028
$on-laptop: 800px;
3129

3230
// Using media queries with like this:
@@ -44,6 +42,7 @@ $on-laptop: 800px;
4442

4543
@import
4644
"bootstrap",
45+
"font-awesome",
4746
"fullcalendar",
4847
"base",
4948
"layout",

‎_includes/header.html

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
{% endfor %}
2424
</div>
2525
</nav>
26-
2726
</div>
2827

2928
</header>

‎_layouts/event.html

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
layout: default
3+
---
4+
<div class="event">
5+
6+
<header class="post-header">
7+
<p class="event-date">{{ page.date | date: "%b %-d, %Y" }}</p>
8+
9+
{% if page.calendar-link %}
10+
<a target="_blank" href="{{ page.calendar-link }}">
11+
<div class="button">
12+
<i class="calendar-icon" aria-hidden="true"></i>
13+
Add to Google Calendar
14+
</div>
15+
</a>
16+
{% endif %}
17+
18+
{% if page.slideshow-link %}
19+
<a target="_blank" href="{{ page.slideshow-link }}">
20+
<div class="button">
21+
<i class="slideshow-icon" aria-hidden="true"></i>
22+
Slideshow
23+
</div>
24+
</a>
25+
{% endif %}
26+
</header>
27+
28+
<h1 class="post-title">{{ page.title }}</h1>
29+
30+
<article class="post-content">
31+
{{ content }}
32+
</article>
33+
34+
</div>

‎_layouts/events.html

-14
This file was deleted.

‎_layouts/page.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: default
33
---
4-
<div class="post">
4+
<div class="page">
55

66
<header class="post-header">
77
<h1 class="post-title">{{ page.title }}</h1>

‎_plugins/ext.rb

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
require "jekyll-assets"
22
require "jekyll-assets/bootstrap"
3+
require "jekyll-assets/font-awesome"
34
require "jekyll-assets/rails-assets"

‎_posts/2015-03-06-meeting-friday-3-6-15.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
---
2-
layout: post
2+
layout: event
33
title: Meeting Friday 3/6/15
4+
calendar-link: https://www.google.com/calendar/event?action=TEMPLATE&tmeid=ZnE1c3ZsaG1jc2dtcGxyYzRnYmVzaTFjYzQgcmE1Njk1b2w1anRyMWhkYWlvMTg1NWpsbThAZw&tmsrc=ra5695ol5jtr1hdaio1855jlm8%40group.calendar.google.com
5+
slideshow-link: https://docs.google.com/presentation/d/1HipnIQfX5hvaAqfFPUfVH75abjux1tg5GtZ4hZXAqp8/edit?usp=sharing
46
published: true
57
categories: meetings
68
---
79

8-
{::options parse_block_html="true" /}
9-
<a target="_blank" href="https://www.google.com/calendar/event?action=TEMPLATE&tmeid=ZnE1c3ZsaG1jc2dtcGxyYzRnYmVzaTFjYzQgcmE1Njk1b2w1anRyMWhkYWlvMTg1NWpsbThAZw&tmsrc=ra5695ol5jtr1hdaio1855jlm8%40group.calendar.google.com"><img border="0" src="https://www.google.com/calendar/images/ext/gc_button1_en.gif"></a>
10-
1110
We will talk about git, open source, and how to fork, push, and pull request a git repository. This will go over some "must know" information if you ever do open source, and it is likely as an interview question! Very useful and please show up if you are a member!
12-
13-
[Slideshow](https://docs.google.com/presentation/d/1HipnIQfX5hvaAqfFPUfVH75abjux1tg5GtZ4hZXAqp8/edit?usp=sharing)

‎_posts/2015-03-07-event-on-saturday-3-7-15.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
---
2-
layout: post
2+
layout: event
33
title: Setting up an Efficient Workflow
4+
calendar-link: https://www.google.com/calendar/event?action=TEMPLATE&tmeid=dWpkZTMzbTltNDAxNGFkNzhxZmo0MWRvMjggcmE1Njk1b2w1anRyMWhkYWlvMTg1NWpsbThAZw&tmsrc=ra5695ol5jtr1hdaio1855jlm8%40group.calendar.google.com
5+
slideshow-link: https://docs.google.com/presentation/d/1xjF3w5ZjR2MplLlJekxbv5kVBHtKyBXHbEw1eoz3QVY/edit?usp=sharing_eid
46
published: true
57
categories: events
68
---
79

8-
{::options parse_block_html="true" /}
9-
<a target="_blank" href="https://www.google.com/calendar/event?action=TEMPLATE&tmeid=dWpkZTMzbTltNDAxNGFkNzhxZmo0MWRvMjggcmE1Njk1b2w1anRyMWhkYWlvMTg1NWpsbThAZw&tmsrc=ra5695ol5jtr1hdaio1855jlm8%40group.calendar.google.com"><img border="0" src="https://www.google.com/calendar/images/ext/gc_button1_en.gif"></a>
10-
1110
Mark it on your calendars. This is a good one meant for those who want to build personal or professional websites. We will go over very useful information and tools such as gulp, bower, bootstrap, and sublime text which will increase the quality and speed of your web development regardless of language or tools. Perfect for beginners and advanced alike!
12-
13-
[Slideshow](https://docs.google.com/presentation/d/1xjF3w5ZjR2MplLlJekxbv5kVBHtKyBXHbEw1eoz3QVY/edit?usp=sharing_eid)

‎fonts/bootstrap/glyphicons-halflings-regular.eot

19.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)