Skip to content

Commit

Permalink
A bunch of css stuff to make styling look reasonable, and background …
Browse files Browse the repository at this point in the history
…images. Also sorted out compass and sass.
  • Loading branch information
billygriffin committed Jul 18, 2015
1 parent e908d59 commit 4880dad
Show file tree
Hide file tree
Showing 17 changed files with 1,153 additions and 24 deletions.
8 changes: 7 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ gem 'rails', '4.2.3'
# Use sqlite3 as the database for Active Record
gem 'pg'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
gem 'sass-rails', '~> 4.0.3'
gem "compass-rails"
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
Expand All @@ -30,6 +31,11 @@ gem 'sdoc', '~> 0.4.0', group: :doc
# Use Unicorn as the app server
gem 'unicorn'

gem 'font_assets'

gem 'simple_form'
gem 'draper'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

Expand Down
42 changes: 34 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ GEM
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
chunky_png (1.3.4)
coderay (1.1.0)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
Expand All @@ -52,13 +53,28 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
compass (0.12.7)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
compass-rails (2.0.0)
compass (>= 0.12.2)
debug_inspector (0.0.2)
draper (2.1.0)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
request_store (~> 1.0)
erubis (2.7.0)
execjs (2.5.2)
font_assets (0.1.11)
rack
foreman (0.78.0)
thor (~> 0.19.1)
fssm (0.2.10)
globalid (0.3.5)
activesupport (>= 4.1.0)
hike (1.2.3)
i18n (0.7.0)
jbuilder (2.3.1)
activesupport (>= 3.0.0, < 5)
Expand Down Expand Up @@ -110,19 +126,25 @@ GEM
raindrops (0.14.0)
rake (10.4.2)
rdoc (4.2.0)
sass (3.4.16)
sass-rails (5.0.3)
request_store (1.2.0)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
simple_form (3.1.0)
actionpack (~> 4.0)
activemodel (~> 4.0)
spring (1.3.6)
sprockets (3.2.0)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.3.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
Expand All @@ -149,13 +171,17 @@ DEPENDENCIES
better_errors
binding_of_caller
coffee-rails (~> 4.1.0)
compass-rails
draper
font_assets
foreman
jbuilder (~> 2.0)
jquery-rails
pg
rails (= 4.2.3)
sass-rails (~> 5.0)
sass-rails (~> 4.0.3)
sdoc (~> 0.4.0)
simple_form
spring
turbolinks
uglifier (>= 1.3.0)
Expand Down
Binary file added app/assets/images/_test_home_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/_test_home_pel_photo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 0 additions & 15 deletions app/assets/stylesheets/application.css

This file was deleted.

21 changes: 21 additions & 0 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

//Library code and config
@import 'lib/media-response';

//Libraries
@import 'compass';
@import 'foundation/config';
@import 'reset';
@import 'shadowbox';

//Foundational
@import 'foundation/containers';
@import 'foundation/forms';
@import 'foundation/buttons';
@import 'foundation/header';
@import 'foundation/layout';

//Views
@import 'views/home';


Loading

0 comments on commit 4880dad

Please sign in to comment.