Merge remote-tracking branch 'origin/development' into development

ontoportal-lirmm · Feb 24, 2023 · 1cc609b · 1cc609b
2 parents 580fbcd + b0709ea
commit 1cc609b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 16 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -235,9 +235,9 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (8.16.0)
     nio4r (2.5.8)
-    nokogiri (1.14.1-x86_64-linux)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
-    oj (3.14.1)
+    oj (3.14.2)
     open_uri_redirections (0.2.1)
     parallel (1.22.1)
     parser (3.2.1.0)
@@ -296,7 +296,7 @@ GEM
     rdoc (6.3.3)
     recaptcha (5.9.0)
       json
-    regexp_parser (2.6.2)
+    regexp_parser (2.7.0)
     reline (0.3.2)
       io-console (~> 0.5)
     rest-client (2.1.0)
@@ -322,7 +322,7 @@ GEM
       rspec-mocks (~> 3.11)
       rspec-support (~> 3.11)
     rspec-support (3.12.0)
-    rubocop (1.44.1)
+    rubocop (1.45.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
@@ -378,7 +378,7 @@ GEM
     tilt (2.0.11)
     time (0.2.1)
       date
-    timeout (0.3.1)
+    timeout (0.3.2)
     turbo-rails (1.3.3)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)

diff --git a/app/assets/images/check.svg b/app/assets/images/check.svg
diff --git a/app/assets/stylesheets/components/chips.scss b/app/assets/stylesheets/components/chips.scss
@@ -1,6 +1,9 @@
 .chips-container div{
     margin-right: 10px;
 }
+.chips-container svg path{
+    fill: var(--primary-color);
+}
 .chips-check-icon{
     margin-left: 6px;
     margin-right: 6px;
@@ -33,3 +36,4 @@
 .chips-container div label input[type="checkbox"]:checked ~ span .chips-check-icon{
     display:unset;
 }
+
diff --git a/app/assets/stylesheets/feedback.scss b/app/assets/stylesheets/feedback.scss
@@ -5,7 +5,7 @@
     margin-bottom: 21px;
 }
 .feedback-email a{
-    color: #76A7CC;
+    color: var(--primary-color);
     font-weight: 600;
     text-decoration: none;
 }

diff --git a/app/assets/stylesheets/register.scss b/app/assets/stylesheets/register.scss
@@ -17,7 +17,7 @@
     margin: auto;
     margin-bottom: 20px;
     margin-top: 3px;
-    border: 0.5px solid #76A7CC;
+    border: 0.5px solid var(--primary-color);
     border-radius: 5px;
 }
 
@@ -49,7 +49,7 @@
     margin-bottom: 14px;
 }
 .register-input-long:focus{
-    border: 1px solid #76A7CC;
+    border: 1px solid var(--primary-color);
 }
 
 .register-input-short{
@@ -62,7 +62,7 @@
     border-radius: 9px;
 }
 .register-input-short:focus{
-    border: 1px solid #76A7CC;
+    border: 1px solid var(--primary-color);
 }
 
 
@@ -80,6 +80,7 @@
     font-size: 12px;
     font-weight: 400;
     margin-bottom: 0;
+    margin-top: 14px;
 }
 
 .register-button{
@@ -88,13 +89,17 @@
    font-size: 16px;
    color: white;
    padding: 17px;
-   background-color: #76A7CC;
+   background-color: var(--primary-color);
    border: none;
    border-radius: 9px;
 
 }
 
 .register-button:hover{
-    background-color: #6B96B7;
+    background-color: var(--hover-color);
     cursor: pointer;
 }
+#user_register_mail_list{
+    margin-top: 14px;
+    accent-color: #8E8E8E;
+}
diff --git a/app/assets/stylesheets/theme-variables.scss.erb b/app/assets/stylesheets/theme-variables.scss.erb
@@ -16,7 +16,7 @@
     <% when "bioportal" %>
         :root{
             --primary-color: #76A7CC;
-            --hover-color: #31B404;
+            --hover-color: #6B96B7;
             --secondary-color: #ffc107;
         }
     <% when "ontoportal" %>

diff --git a/app/components/chips_component/chips_component.html.haml b/app/components/chips_component/chips_component.html.haml
@@ -3,5 +3,6 @@
     %label{:for => "chips-#{@name}-check"}
       %input{:id => "chips-#{@name}-check", :name => @name, :type => "checkbox", :value => @value}/
       %span
-        %img.chips-check-icon{:src => "#{asset_path('check.svg')}"}/
+        %svg.chips-check-icon{:fill => "none", :height => "8", :viewbox => "0 0 10 8", :width => "10", :xmlns => "http://www.w3.org/2000/svg"}
+          %path{:d => "M9.76764 0.232287C9.45824 -0.0775267 8.95582 -0.0773313 8.646 0.232287L3.59787 5.28062L1.35419 3.03696C1.04438 2.72714 0.542174 2.72714 0.23236 3.03696C-0.0774534 3.34677 -0.0774534 3.84897 0.23236 4.15879L3.03684 6.96326C3.19165 7.11807 3.39464 7.19567 3.59765 7.19567C3.80067 7.19567 4.00386 7.11827 4.15867 6.96326L9.76764 1.3541C10.0775 1.0445 10.0775 0.542081 9.76764 0.232287Z"}
         = @value