Merge branch 'development'

SpeciesFileGroup · Jan 10, 2020 · 70b5858 · 70b5858
2 parents d540932 + 600548c
commit 70b5858
Show file tree

Hide file tree

Showing 106 changed files with 1,395 additions and 679 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -101,19 +101,19 @@ GEM
     brakeman (4.7.2)
     builder (3.2.4)
     byebug (11.0.1)
-    capybara (3.29.0)
+    capybara (3.30.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (~> 1.5)
       xpath (~> 3.2)
-    chartkick (3.3.0)
+    chartkick (3.3.1)
     childprocess (3.0.0)
     chronic (0.10.2)
     chunky_png (1.3.11)
-    citeproc (1.0.9)
+    citeproc (1.0.10)
       namae (~> 1.0)
     citeproc-ruby (1.1.10)
       citeproc (~> 1.0, >= 1.0.9)
@@ -133,9 +133,9 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.5)
-    csl (1.5.0)
+    csl (1.5.1)
       namae (~> 1.0)
-    csl-styles (1.0.1.9)
+    csl-styles (1.0.1.10)
       csl (~> 1.0)
     daemons (1.3.1)
     database_cleaner (1.7.0)
@@ -162,9 +162,9 @@ GEM
     factory_bot_rails (5.1.1)
       factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
-    faker (2.9.0)
+    faker (2.10.0)
       i18n (>= 1.6, < 1.8)
-    faraday (0.17.1)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
@@ -180,7 +180,7 @@ GEM
     gpx (1.0.0)
       nokogiri (~> 1.7)
       rake
-    groupdate (4.2.0)
+    groupdate (4.3.0)
       activesupport (>= 5)
     guard (2.16.1)
       formatador (>= 0.2.4)
@@ -201,7 +201,7 @@ GEM
     hashdiff (1.0.0)
     hashery (2.1.2)
     hiredis (0.6.3)
-    i18n (1.7.0)
+    i18n (1.7.1)
       concurrent-ruby (~> 1.0)
     indefinite_article (0.2.4)
       activesupport
@@ -243,13 +243,13 @@ GEM
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.13)
+    lumberjack (1.1.1)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mime-types (3.3)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
     mimemagic (0.3.3)
@@ -283,7 +283,7 @@ GEM
     parallel (1.19.1)
     parallel_tests (2.30.0)
       parallel
-    parser (2.6.5.0)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
     parslet (1.8.2)
     parsley-store (0.3.4)
@@ -297,7 +297,7 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.1.4)
+    pg (1.2.2)
     polyglot (0.3.5)
     postgresql_cursor (0.6.4)
       activerecord (>= 3.1.0)
@@ -308,9 +308,9 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     psych (3.1.0)
-    public_suffix (4.0.1)
+    public_suffix (4.0.3)
     rack (2.0.8)
-    rack-cors (1.1.0)
+    rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-proxy (0.6.5)
       rack
@@ -351,16 +351,16 @@ GEM
     rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdf (3.1.0)
+    rdf (3.1.1)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
-    rdoc (6.2.0)
+    rdoc (6.2.1)
     redcarpet (3.5.0)
     redis (4.1.3)
     regexp_parser (1.6.0)
-    request_store (1.4.1)
+    request_store (1.5.0)
       rack (>= 1.4)
     require_all (1.3.3)
     responders (3.0.0)
@@ -384,12 +384,12 @@ GEM
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-rails (4.0.0.beta3)
@@ -400,19 +400,19 @@ GEM
       rspec-expectations (~> 3.8)
       rspec-mocks (~> 3.8)
       rspec-support (~> 3.8)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     rtesseract (3.0.4)
       nokogiri
-    rubocop (0.78.0)
+    rubocop (0.79.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     rubocop-faker (0.2.0)
       rubocop (>= 0.74)
-    rubocop-rails (2.4.0)
+    rubocop-rails (2.4.1)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     rubocop-rspec (1.37.1)
@@ -433,7 +433,7 @@ GEM
       tilt
     sdoc (1.0.0)
       rdoc (>= 5.0)
-    selenium-webdriver (3.142.6)
+    selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     serrano (0.5.4)
@@ -467,6 +467,7 @@ GEM
       rake (~> 13.0)
       rmagick (~> 4.0)
       rtesseract (~> 3.0.4)
+    sync (0.5.0)
     taxonifi (0.4.0)
       require_all (~> 1.3.3)
     term-ansicolor (1.7.1)
@@ -478,14 +479,15 @@ GEM
     tilt (2.0.10)
     timecop (0.9.1)
     timeliness (0.4.3)
-    tins (1.22.2)
+    tins (1.24.0)
+      sync
     treetop (1.6.10)
       polyglot (~> 0.3)
-    ttfunk (1.5.1)
+    ttfunk (1.6.1)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)

diff --git a/app/assets/stylesheets/base/_fonts.scss b/app/assets/stylesheets/base/_fonts.scss
@@ -20,6 +20,8 @@ $font_normal: 13px;
 $font_subtitle: 14px;
 $font_title: 16px;
 
+$font_light: 300;
+
 .micro_type {
 }
 
@@ -28,21 +30,23 @@ $font_title: 16px;
 }
 
 .font-light {
-  font-weight: 300;
+  font-weight: $font_light;
 }
 
+/* no longer used unless Rails generated
 .regular_type {
   font-size: 14pt;
 }
-
-.large_type {
-  font-size: 18pt;
-}
+*/
 
 .normal_type {
   font-size: $font_normal;
 }
 
+.large_type {
+  font-size: 18pt;
+}
+
 .subtitle_type {
   font-size: $font_subtitle;
 }

diff --git a/app/assets/stylesheets/base/feedback.scss b/app/assets/stylesheets/base/feedback.scss
@@ -7,6 +7,7 @@
   margin-bottom: 1rem;
   border-radius: .25rem;
   border: 1px solid;
+  line-height: 1.9
 }
 
 .feedback-thin {
@@ -42,7 +43,6 @@
   color: $color-primary-4;
   background-color: $color-primary-0;
   border-color: $color-primary-3;
-
 }
 
 // yellow
@@ -122,4 +122,3 @@
   @extend .small_space;
   background-color: $color-secondary-1-2;
 }
-
diff --git a/app/assets/stylesheets/base/scaffolds.scss b/app/assets/stylesheets/base/scaffolds.scss
@@ -1,5 +1,4 @@
 p, ol, ul, td {
-  font-family: helvetica, arial, verdana, sans-serif;
   font-size: 13px;
   line-height: 18px;
 }

diff --git a/app/assets/stylesheets/base/structure.scss b/app/assets/stylesheets/base/structure.scss
@@ -3,7 +3,7 @@
 body {
   background-color: $body_background;
   color: $default_text;
-  font-family: IBM Plex Sans, Helvetica,Arial,Verdana,Tahoma; 
+  font-family: IBM Plex Sans,Helvetica,Arial,Verdana,Tahoma; 
   font-size: 13px !important;
   margin-top:0;
   margin:0;

diff --git a/app/assets/stylesheets/helpers/hub/data.scss b/app/assets/stylesheets/helpers/hub/data.scss
@@ -147,7 +147,7 @@
     flex-direction:row-reverse;
     align-items:center;
     justify-content:space-between;
-    font-weight: 300;
+    // font-weight: 300;
     border-radius: 2px;
     background-color: #FFF;
     //border-left: 3px solid $color-secondary-2-4;

diff --git a/app/assets/stylesheets/helpers/hub/filter.scss b/app/assets/stylesheets/helpers/hub/filter.scss
@@ -10,7 +10,7 @@
   #filter {
     margin-top: 0px;
     margin-right: $standard_margin; 
-    font-weight: 300;
+    font-weight: $font_light;
     position:relative;
 
     #search-filter {
@@ -25,7 +25,7 @@
 
     .filter-title {
       font-size: $font_small; 
-      font-weight: 300;
+      font-weight: $font_light;
       color:gray;
     }
 

diff --git a/app/assets/stylesheets/helpers/list/tables.scss b/app/assets/stylesheets/helpers/list/tables.scss
@@ -8,7 +8,7 @@ table {
   border-spacing: 0;
   background-color: $panel_background;
   border-collapse: collapse;  
-  font-weight: 300;
+  // font-weight: 300;
   margin-top: $standard_padding;
   margin-bottom: $standard_padding;
   .underlined_elements {

diff --git a/app/assets/stylesheets/vendor/vue/vue-modal.scss b/app/assets/stylesheets/vendor/vue/vue-modal.scss
@@ -24,7 +24,7 @@
   border-radius: 2px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, .33);
   transition: all .3s ease;
-  font-family: Helvetica, Arial, sans-serif;
+  font-family: IBM Plex Sans, Helvetica, Arial, sans-serif;
 }
 
 .modal-close {
@@ -137,4 +137,4 @@
       background-size: 10px 10px;
       opacity: 0.7;
     }
-  }
+  }
diff --git a/app/assets/stylesheets/views/shared_data/index.scss b/app/assets/stylesheets/views/shared_data/index.scss
@@ -62,7 +62,7 @@
   }
 
   a {
-    font-weight: 300;
+//    font-weight: 300;
     text-decoration: none;
     flex-wrap: nowrap;
   }

diff --git a/app/controllers/asserted_distributions_controller.rb b/app/controllers/asserted_distributions_controller.rb
@@ -106,7 +106,7 @@ def batch_load
 
   def preview_simple_batch_load
     if params[:file]
-      @result =  BatchLoad::Import::AssertedDistributions.new(batch_params)
+      @result =  BatchLoad::Import::AssertedDistributions.new(**batch_params)
       digest_cookie(params[:file].tempfile, :batch_asserted_distributions_md5)
       render 'asserted_distributions/batch_load/simple/preview'
     else
@@ -117,7 +117,7 @@ def preview_simple_batch_load
 
   def create_simple_batch_load
     if params[:file] && digested_cookie_exists?(params[:file].tempfile, :batch_asserted_distributions_md5)
-      @result =  BatchLoad::Import::AssertedDistributions.new(batch_params)
+      @result =  BatchLoad::Import::AssertedDistributions.new(**batch_params)
       if @result.create
         flash[:notice] = "Successfully proccessed file, #{@result.total_records_created} asserted distributions were created."
         render 'asserted_distributions/batch_load/simple/create' and return