Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Commit

Permalink
Update dependencies. Fix font-awesome fonts not loading.
Browse files Browse the repository at this point in the history
  • Loading branch information
@GUI
GUI committed Jun 16, 2017
1 parent e542832 commit fb79ea2
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 64 deletions.
18 changes: 9 additions & 9 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ gem "wdm", "~> 0.1.0", platforms: [:mswin, :mingw]
gem "tzinfo-data", platforms: [:mswin, :mingw, :jruby]

# Middleman Gems
gem "middleman", "~> 4.1.14"
gem "middleman", "~> 4.2.1"
gem "middleman-livereload", "~> 3.4.6"

# Environment specific config with environment variables
gem "dotenv", "~> 2.1.1"
gem "dotenv", "~> 2.2.1"

# Syntax highlighting
gem "middleman-syntax", "~> 3.0.0"
Expand All @@ -25,22 +25,22 @@ gem "middleman-sprockets", "~> 4.1.0"
# Bootstrap
gem "bootstrap-sass", "~> 3.3.7"

# Icons
gem "font-awesome-sass", "~> 4.7.0"

source "https://rails-assets.org" do
# jQuery
gem "rails-assets-jquery", "~> 1.12.4"
gem "rails-assets-jquery", "~> 3.2.1"

# Programmatic bootstrap modals
gem "rails-assets-bootbox", "~> 4.4.0"

# Form validation
gem "rails-assets-parsleyjs", "~> 2.6.0"

# Icons
gem "rails-assets-font-awesome", "~> 4.7.0"
gem "rails-assets-parsleyjs", "~> 2.7.2"
end

group :development do
# Deployment
gem "capistrano", "~> 3.6.1"
gem "capistrano-rsync-bladrak", "~> 1.3.8"
gem "capistrano", "~> 3.8.1"
gem "capistrano-rsync-bladrak", "~> 1.4.2"
end
108 changes: 54 additions & 54 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,72 +2,72 @@ GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
activesupport (5.0.0.1)
activesupport (5.0.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.0)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
airbrussh (1.1.1)
airbrussh (1.2.0)
sshkit (>= 1.6.1, != 1.7.0)
autoprefixer-rails (6.5.3.1)
autoprefixer-rails (7.1.1.2)
execjs
backports (3.6.8)
backports (3.8.0)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
capistrano (3.6.1)
capistrano (3.8.1)
airbrussh (>= 1.0.0)
capistrano-harrow
i18n
rake (>= 10.0.0)
sshkit (>= 1.9.0)
capistrano-harrow (0.5.3)
capistrano-rsync-bladrak (1.3.8)
capistrano-rsync-bladrak (1.4.2)
capistrano (>= 3.0.0.pre14, < 4)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
coffee-script-source (1.12.2)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
concurrent-ruby (1.0.2)
concurrent-ruby (1.0.5)
contracts (0.13.0)
dotenv (2.1.1)
dotenv (2.2.1)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.2.1)
eventmachine (1.2.3)
execjs (2.7.0)
fast_blank (1.0.0)
fastimage (2.0.1)
addressable (~> 2)
ffi (1.9.14)
haml (4.0.7)
fastimage (2.1.0)
ffi (1.9.18)
font-awesome-sass (4.7.0)
sass (>= 3.2)
haml (5.0.1)
temple (>= 0.8.0)
tilt
hamster (3.0.0)
concurrent-ruby (~> 1.0)
hashie (3.4.6)
hashie (3.5.5)
http_parser.rb (0.6.0)
i18n (0.7.0)
kramdown (1.13.1)
kramdown (1.13.2)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
memoist (0.15.0)
middleman (4.1.14)
middleman (4.2.1)
coffee-script (~> 2.2)
compass-import-once (= 1.0.5)
haml (>= 4.0.5)
kramdown (~> 1.2)
middleman-cli (= 4.1.14)
middleman-core (= 4.1.14)
middleman-cli (= 4.2.1)
middleman-core (= 4.2.1)
sass (>= 3.4.0, < 4.0)
middleman-cli (4.1.14)
middleman-cli (4.2.1)
thor (>= 0.17.0, < 2.0)
middleman-core (4.1.14)
middleman-core (4.2.1)
activesupport (>= 4.2, < 5.1)
addressable (~> 2.3)
backports (~> 3.6)
Expand Down Expand Up @@ -102,69 +102,69 @@ GEM
middleman-syntax (3.0.0)
middleman-core (>= 3.2)
rouge (~> 2.0)
minitest (5.10.1)
minitest (5.10.2)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.2.0)
padrino-helpers (0.13.3.3)
net-ssh (4.1.0)
padrino-helpers (0.13.3.4)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.13.3.3)
padrino-support (= 0.13.3.4)
tilt (>= 1.4.1, < 3)
padrino-support (0.13.3.3)
padrino-support (0.13.3.4)
activesupport (>= 3.1)
parallel (1.10.0)
public_suffix (2.0.4)
rack (2.0.1)
parallel (1.11.2)
public_suffix (2.0.5)
rack (2.0.3)
rack-livereload (0.3.16)
rack
rails-assets-bootbox (4.4.0)
rails-assets-bootstrap (>= 3.0.0)
rails-assets-bootstrap (3.3.7)
rails-assets-jquery (>= 1.9.1, < 4)
rails-assets-font-awesome (4.7.0)
rails-assets-jquery (1.12.4)
rails-assets-parsleyjs (2.6.0)
rails-assets-jquery (3.2.1)
rails-assets-parsleyjs (2.7.2)
rails-assets-jquery (> 1.8)
rake (12.0.0)
rb-fsevent (0.9.8)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rouge (2.0.7)
sass (3.4.22)
servolux (0.12.0)
sprockets (3.7.0)
rb-inotify (0.9.9)
ffi (~> 1.0)
rouge (2.1.0)
sass (3.4.24)
servolux (0.13.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sshkit (1.11.4)
sshkit (1.13.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
temple (0.8.0)
thor (0.19.4)
thread_safe (0.3.5)
tilt (2.0.5)
tzinfo (1.2.2)
thread_safe (0.3.6)
tilt (2.0.7)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.0.4)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)

PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass (~> 3.3.7)
capistrano (~> 3.6.1)
capistrano-rsync-bladrak (~> 1.3.8)
dotenv (~> 2.1.1)
middleman (~> 4.1.14)
capistrano (~> 3.8.1)
capistrano-rsync-bladrak (~> 1.4.2)
dotenv (~> 2.2.1)
font-awesome-sass (~> 4.7.0)
middleman (~> 4.2.1)
middleman-gh-pages (~> 0.3.1)
middleman-livereload (~> 3.4.6)
middleman-sprockets (~> 4.1.0)
middleman-syntax (~> 3.0.0)
rails-assets-bootbox (~> 4.4.0)!
rails-assets-font-awesome (~> 4.7.0)!
rails-assets-jquery (~> 1.12.4)!
rails-assets-parsleyjs (~> 2.6.0)!
rails-assets-jquery (~> 3.2.1)!
rails-assets-parsleyjs (~> 2.7.2)!
tzinfo-data
wdm (~> 0.1.0)

BUNDLED WITH
1.11.2
1.15.1
2 changes: 1 addition & 1 deletion config/deploy.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# config valid only for current version of Capistrano
lock "3.6.1"
lock "3.8.1"

set :application, "static-site"
set :repo_url, "https://github.com/NREL/api-umbrella-static-site.git"
Expand Down
2 changes: 2 additions & 0 deletions source/assets/stylesheets/all.css.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@import "bootstrap-sprockets";
@import "bootstrap";
@import "font-awesome-sprockets";
@import "font-awesome";

@import "_shared/scaffolding";
Expand Down

0 comments on commit fb79ea2

Please sign in to comment.