From 3935b3067ccb2f18d2acdacdff9882c2d5f96d57 Mon Sep 17 00:00:00 2001
From: Beatrice Olivera <beatriceolivera1999@gmail.com>
Date: Sat, 1 Sep 2018 18:45:52 +0100
Subject: [PATCH] changed fonts and minor css changes

---
 app/assets/stylesheets/components/_navbar.scss | 11 +++++++----
 app/assets/stylesheets/config/_colors.scss     |  1 +
 app/assets/stylesheets/config/_fonts.scss      |  6 +++---
 app/assets/stylesheets/pages/_settings.scss    |  8 ++++++++
 app/views/shared/_navbar.html.erb              |  2 +-
 app/views/users/setting.html.erb               |  8 ++++----
 6 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/assets/stylesheets/components/_navbar.scss b/app/assets/stylesheets/components/_navbar.scss
index 196b8df..4261f89 100644
--- a/app/assets/stylesheets/components/_navbar.scss
+++ b/app/assets/stylesheets/components/_navbar.scss
@@ -12,6 +12,9 @@
 
     font-size: 2em;
     font-weight: bold;
+    a:hover {
+      color: $primary;
+    }
   }
 
   .right-align {
@@ -52,7 +55,7 @@
         }
 
         a {
-          color: #C4C4C4;
+          color: $text-inactive;
           text-decoration: none;
         }
       }
@@ -76,11 +79,11 @@
 
     li {
       a {
-        color: $icon;
+        color: $text-inactive;
 
         &:hover {
-          color: $primary;
-          background-color: $navbar-background;
+          color: white;
+          background-color: $background;
         }
       }
     }
diff --git a/app/assets/stylesheets/config/_colors.scss b/app/assets/stylesheets/config/_colors.scss
index 1ffb1c1..dfca064 100644
--- a/app/assets/stylesheets/config/_colors.scss
+++ b/app/assets/stylesheets/config/_colors.scss
@@ -15,4 +15,5 @@ $background: #33333D;
 $card-background: #464650;
 $navbar-background: #1F1F29;
 $text-darker: #CDCDCD;
+$text-inactive: #C4C4C4;
 $icon: #EDECEC;
diff --git a/app/assets/stylesheets/config/_fonts.scss b/app/assets/stylesheets/config/_fonts.scss
index dca1ed8..dc7ce76 100755
--- a/app/assets/stylesheets/config/_fonts.scss
+++ b/app/assets/stylesheets/config/_fonts.scss
@@ -1,9 +1,9 @@
 // Import Google fonts
-@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,300,700|Raleway:400,100,300,700,500");
+@import url("https://fonts.googleapis.com/css?family=Assistant:400,700|Hind:400,700");
 
 // Define fonts for body and headers
-$body-font: "Open Sans", "Helvetica", "sans-serif";
-$headers-font: "Raleway", "Helvetica", "sans-serif";
+$body-font: "Hind", "Helvetica", "sans-serif";
+$headers-font: "Assistant", "Helvetica", "sans-serif";
 
 // To use a font file (.woff) uncomment following lines
 // @font-face {
diff --git a/app/assets/stylesheets/pages/_settings.scss b/app/assets/stylesheets/pages/_settings.scss
index c9be6e9..e7c4381 100644
--- a/app/assets/stylesheets/pages/_settings.scss
+++ b/app/assets/stylesheets/pages/_settings.scss
@@ -75,3 +75,11 @@ input:checked + .slider:before {
 .settings {
   color: white;
 }
+
+.no-padding {
+  padding: 0;
+}
+
+.no-margin {
+  margin: 0;
+}
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index a85a264..0369080 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -1,5 +1,5 @@
 <div class="polyglot-navbar">
-  <div class="logo">Polyglot</div>
+  <div class="logo"><%= link_to "Polyglot", contacts_path %></div>
 
   <div class="right-align hidden-xs hidden-sm">
     <div class="links">
diff --git a/app/views/users/setting.html.erb b/app/views/users/setting.html.erb
index 02e491c..e04d7d5 100644
--- a/app/views/users/setting.html.erb
+++ b/app/views/users/setting.html.erb
@@ -57,19 +57,19 @@
         <%= simple_form_for(@user) do |t| %>
           <div>
             <div class="card card-form card-form-no-hover">
-              <%= t.label :language %>
+              <%= t.label :language, class:'no-padding no-margin' %>
               <%= t.input_field :language, collection: languages.sort, class:'input-field-text-black input-dropdown' %>
             </div>
             <div class="card card-form card-form-no-hover">
-              <%= t.label :caption_font %>
+              <%= t.label :caption_font, class:'no-padding no-margin' %>
               <%= t.input_field :caption_font, collection: fonts.sort, class:'input-field-text-black input-dropdown' %>
             </div>
             <div class="card card-form card-form-no-hover">
-              <%= t.label :caption_font_size %>
+              <%= t.label :caption_font_size, class:'no-padding no-margin' %>
               <%= t.input_field :caption_font_size, class:'input-field-text-black' %>
             </div>
             <div class="card card-form card-form-no-hover">
-              <%= t.label :enable_transcript %>
+              <%= t.label :enable_transcript, class:'no-padding no-margin' %>
               <label class="switch">
                 <%= t.input_field :enable_transcript, class:'input-field-text-black' %>
                 <span class="slider round"></span>