Merge branch 'master' into development

.gitignore

@@ -33,7 +33,6 @@ mongo.log
 
 config/database.yml
 config/environments/development.rb
-db/schema.rb
 
 # Ignore RVM-related files
 # .rvmrc
@@ -47,5 +46,3 @@ env_vars
 tags
 
 /**/svg-source
-
-.env

Gemfile

@@ -33,7 +33,7 @@ gem 'render_anywhere'
 
 gem 'ahoy_matey'
 gem 'pry'
-gem 'oink'
+
 
 gem 'riiif'
 gem 'iiif-presentation', git: 'https://github.com/benwbrum/osullivan', branch: 'service_is_array'
@@ -43,7 +43,6 @@ gem 'omniauth-google-oauth2'
 
 gem 'rack-reverse-proxy', :require => 'rack/reverse_proxy'
 
-
 group :assets do
   gem 'therubyracer'
   gem 'uglifier'
@@ -76,7 +75,7 @@ end
 gem 'sassc-rails'
 
 # Use Autoprefixer for vendor prefixes
-gem 'autoprefixer-rails', '<= 8.6.5'
+gem 'autoprefixer-rails', '~>8'
 
 # Use Slim for templates
 gem 'slim', '~> 3.0.0'

Gemfile.lock

@@ -166,7 +166,6 @@ GEM
       builder (>= 2.1.2)
     hashdiff (1.0.0)
     hashie (3.6.0)
-    hodel_3000_compliant_logger (0.1.1)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -215,9 +214,6 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oink (0.10.1)
-      activerecord
-      hodel_3000_compliant_logger
     omniauth (1.4.2)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
@@ -412,7 +408,7 @@ DEPENDENCIES
   acts_as_list
   acts_as_tree
   ahoy_matey
-  autoprefixer-rails (<= 8.6.5)
+  autoprefixer-rails (~> 8)
   better_errors
   binding_of_caller
   bullet
@@ -441,7 +437,6 @@ DEPENDENCIES
   mysql2 (= 0.3.21)
   nokogiri
   oai!
-  oink
   omeka_client!
   omniauth-google-oauth2
   omniauth-saml

app/assets/stylesheets/application.scss

@@ -96,8 +96,6 @@ $gapSize:                   20px;
 @import "components/layout";
 
 @import "sections/home";
-@import "sections/software";
-@import "sections/contact";
 @import "sections/project";
 @import "sections/signon";
 @import "sections/deed";

app/assets/stylesheets/base/customer_color_scheme.scss

@@ -66,10 +66,11 @@ $headerFg:                  $themeDark;
 //header background color
 $headerBg:                  $themeLight;
 
+//FOOTER INFO
+$footerHeight:              220px;
 
 //the color of lettering on the footer
 $footerFg:                  mix(#FFF, $themeDark, 75);
 
 //footer background color
 $footerBg:                  $themeDark;
-

app/assets/stylesheets/base/ftp_color_scheme.scss

@@ -56,7 +56,4 @@ $footerHeight:              220px;
 $footerFg:                  mix(#FFF, $themeDark, 75);
 $footerBg:                  $themeDark;
 
-// Highlight box background color
-$highlightBoxBg: mix(#FFF, $bodyBg, 50);
-
 @import "base/customer_color_scheme";