paoda
/
polyglot
mirror of https://github.com/beatriceo/polyglot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed fonts and minor css changes

This commit is contained in:
Beatrice Olivera 2018-09-01 18:45:52 +01:00
parent ff6d17ae90
commit 3935b3067c
6 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/stylesheets/components/_navbar.scss
View File

@ -12,6 +12,9 @@
font-size: 2em; font-size: 2em;
font-weight: bold; font-weight: bold;
a:hover {
color: $primary;
}
} }
.right-align { .right-align {
@ -52,7 +55,7 @@
} }
a { a {
color: #C4C4C4; color: $text-inactive;
text-decoration: none; text-decoration: none;
} }
} }
@ -76,11 +79,11 @@
li { li {
a { a {
color: $icon; color: $text-inactive;
&:hover { &:hover {
color: $primary; color: white;
background-color: $navbar-background; background-color: $background;
} }
} }
} }

1
app/assets/stylesheets/config/_colors.scss
View File

@ -15,4 +15,5 @@ $background: #33333D;
$card-background: #464650; $card-background: #464650;
$navbar-background: #1F1F29; $navbar-background: #1F1F29;
$text-darker: #CDCDCD; $text-darker: #CDCDCD;
$text-inactive: #C4C4C4;
$icon: #EDECEC; $icon: #EDECEC;

6
app/assets/stylesheets/config/_fonts.scss
View File

@ -1,9 +1,9 @@
// Import Google fonts // 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 // Define fonts for body and headers
$body-font: "Open Sans", "Helvetica", "sans-serif"; $body-font: "Hind", "Helvetica", "sans-serif";
$headers-font: "Raleway", "Helvetica", "sans-serif"; $headers-font: "Assistant", "Helvetica", "sans-serif";
// To use a font file (.woff) uncomment following lines // To use a font file (.woff) uncomment following lines
// @font-face { // @font-face {

8
app/assets/stylesheets/pages/_settings.scss
View File

@ -75,3 +75,11 @@ input:checked + .slider:before {
.settings { .settings {
color: white; color: white;
} }
.no-padding {
padding: 0;
}
.no-margin {
margin: 0;
}

2
app/views/shared/_navbar.html.erb
View File

@ -1,5 +1,5 @@
<div class="polyglot-navbar"> <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="right-align hidden-xs hidden-sm">
<div class="links"> <div class="links">

8
app/views/users/setting.html.erb
View File

@ -57,19 +57,19 @@
<%= simple_form_for(@user) do |t| %> <%= simple_form_for(@user) do |t| %>
<div> <div>
<div class="card card-form card-form-no-hover"> <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' %> <%= t.input_field :language, collection: languages.sort, class:'input-field-text-black input-dropdown' %>
</div> </div>
<div class="card card-form card-form-no-hover"> <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' %> <%= t.input_field :caption_font, collection: fonts.sort, class:'input-field-text-black input-dropdown' %>
</div> </div>
<div class="card card-form card-form-no-hover"> <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' %> <%= t.input_field :caption_font_size, class:'input-field-text-black' %>
</div> </div>
<div class="card card-form card-form-no-hover"> <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"> <label class="switch">
<%= t.input_field :enable_transcript, class:'input-field-text-black' %> <%= t.input_field :enable_transcript, class:'input-field-text-black' %>
<span class="slider round"></span> <span class="slider round"></span>