Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove compass #218

Merged
merged 1 commit into from
Feb 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
source "https://rubygems.org"

gem "compass"
gem "html-proofer"
# https://github.com/github/pages-gem/blob/master/lib/github-pages.rb
gem "github-pages"
18 changes: 3 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ GEM
blankslate (2.1.2.4)
celluloid (0.16.0)
timers (~> 4.0.0)
chunky_png (1.3.4)
classifier-reborn (2.0.3)
fast-stemmer (~> 1.0)
coffee-script (2.4.1)
Expand All @@ -21,18 +20,6 @@ GEM
coffee-script-source (1.9.1)
colorator (0.1)
colored (1.2)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
ethon (0.7.3)
ffi (>= 1.3.0)
execjs (2.5.2)
Expand Down Expand Up @@ -117,7 +104,6 @@ GEM
mercenary (0.3.5)
mini_portile (0.6.2)
minitest (5.5.1)
multi_json (1.11.0)
net-dns (0.8.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
Expand Down Expand Up @@ -153,6 +139,8 @@ PLATFORMS
ruby

DEPENDENCIES
compass
github-pages
html-proofer

BUNDLED WITH
1.10.6
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,20 @@

The source code behind OTS' main web site.

This project is built with the help of
This project is built with the help of

* bootstrap
* compass
* jekyll

In order to be able to compile the site on your own computer, you can install
In order to be able to compile the site on your own computer, you can install
the two ruby dependencies with `bundle install` if you have bundler.

## Building the site

1. run `bundle install` to grab ruby dependencies
2. clean up jekyll's build directory: `rm -rf _site/*`
3. compile styles: `compass clean; compass compile` (you can leave compass running while editing styles with `compass watch`)
4. build and serve the site: `jekyll serve -w`
5. Navigate to http://localhost:4000
3. build and serve the site: `jekyll serve`
4. Navigate to http://localhost:4000


## Adding a city
Expand Down Expand Up @@ -81,7 +79,7 @@ If you want to add a new city to the site, follow these steps:
* ***Caveat for non-opentechschool.org accounts:*** If you are adding
members to your chapter which do not yet have an opentechschool.org
account, you can use an alternative syntax:

members:
- charlie: Charlie Jones

Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ css_version: 6
markdown: kramdown

encoding: UTF-8
exclude: ['sass', 'config.rb', 'Gemfile', 'Gemfile.lock', 'vendor']
exclude: ['Gemfile', 'Gemfile.lock', 'vendor']

gems:
- jekyll-redirect-from
Expand Down
5 changes: 1 addition & 4 deletions _includes/_head.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,10 @@
article, aside, dialog, figure, footer, header,
hgroup, menu, nav, section { display: block; }
</style>
<link href="{{site.baseurl}}stylesheets/screen.css?v={{site.css_version}}"
<link href="{{site.baseurl}}stylesheets/screen.css?v={{site.css_version}}"
media="screen, projection" rel="stylesheet" type="text/css" />
<link href="http://fonts.googleapis.com/css?family=Montserrat:400,700|Open+Sans:400,300,600,700"
rel="stylesheet" type="text/css" />
<!--[if lte IE 9]>
<link rel="stylesheet" href="{{site.baseurl}}stylesheets/ie.css" type="text/css" media="screen" />
<![endif]-->
<!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 7 additions & 9 deletions sass/imports/_main.scss → _sass/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
/* ! Shared styles, OTS branding */
/* ========================================== */

@import "compass/utilities/general/min";

body {
margin: 0;
font-size: 75%;
Expand Down Expand Up @@ -67,7 +65,7 @@ a:focus {
.ots_action {
text-shadow: 0 1px 2px rgba(0,0,0,.2);
background-color: $ots_blue_l;
@include background-image(linear-gradient(top, $ots_blue_l 0%,$ots_blue_l 50%,$ots_blue 51%,$ots_blue_l 100%));
background-image: linear-gradient(to bottom, $ots_blue_l 0%,$ots_blue_l 50%,$ots_blue 51%,$ots_blue_l 100%);
display: inline-block;
border-radius: 4px;
cursor: pointer;
Expand Down Expand Up @@ -111,21 +109,21 @@ a.ots_action:active,
a.ots_action:focus {
text-decoration: none;
background: $ots_blue_h;
@include background-image(linear-gradient(top, $ots_blue_h 0%,$ots_blue_h 50%,$ots_blue_l 51%,$ots_blue_h 100%));
background-image: linear-gradient(to bottom, $ots_blue_h 0%,$ots_blue_h 50%,$ots_blue_l 51%,$ots_blue_h 100%);
}

a.ots_action_highlight,
a.ots_action_highlight:link,
a.ots_action_highlight:visited {
background: $ots_red_l;
@include background-image(linear-gradient(top, $ots_red_l 0%,$ots_red_l 50%,#D40000 51%,$ots_red_l 100%));
background-image: linear-gradient(to bottom, $ots_red_l 0%,$ots_red_l 50%,#D40000 51%,$ots_red_l 100%);
}

a.ots_action_highlight:hover,
a.ots_action_highlight:active,
a.ots_action_highlight:focus {
background: $ots_red_h;
@include background-image(linear-gradient(top, $ots_red_h 0%,$ots_red_h 50%,$ots_red_l 51%,$ots_red_h 100%));
background-image: linear-gradient(to bottom, $ots_red_h 0%,$ots_red_h 50%,$ots_red_l 51%,$ots_red_h 100%);
}

a.ots_action_city {
Expand Down Expand Up @@ -561,7 +559,7 @@ ul.nav {
/* List of OTS members, extends float list. Includes image and links. */
.team_list {
> li {
@include min-height(8em);
min-height: 8em;
text-align: center;
&.member {
height: 240px;
Expand Down Expand Up @@ -615,7 +613,7 @@ ul.nav {
}
p {
font-size: .714em;
@include min-height(6em);
min-height: 6em;
}
}

Expand Down Expand Up @@ -870,7 +868,7 @@ footer a:focus {
// color: #FFF;
position: relative;
width: 100%;
@include min-height(400px);
min-height: 400px;
header {
overflow: hidden;
}
Expand Down
6 changes: 3 additions & 3 deletions sass/imports/_mediaq.scss → _sass/_mediaq.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import "imports/_vars";
@import "imports/_mediaqueries";
@import "vars";
@import "mediaqueries";

@media screen and (min-width: 440px) {
@include min440();
}
}

@media screen and (min-width: 768px) {
@include min768();
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 17 additions & 0 deletions _sass/_reset.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* this is a copy of the output of compass/reset */
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; padding: 0; border: 0; font: inherit; font-size: 100%; vertical-align: baseline; }

html { line-height: 1; }

ol, ul { list-style: none; }

table { border-collapse: collapse; border-spacing: 0; }

caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; }

q, blockquote { quotes: none; }
q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; }

a img { border: none; }

article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
File renamed without changes.
25 changes: 0 additions & 25 deletions config.rb

This file was deleted.

11 changes: 0 additions & 11 deletions sass/ie.scss

This file was deleted.

3 changes: 0 additions & 3 deletions sass/print.scss

This file was deleted.

16 changes: 0 additions & 16 deletions sass/screen.scss

This file was deleted.

60 changes: 0 additions & 60 deletions stylesheets/ie.css

This file was deleted.

1 change: 0 additions & 1 deletion stylesheets/print.css

This file was deleted.

Loading