Merge branch 'font-size-14' into 'master'

Font size 14px

Increase base font size from 13 to 14px. We already have it in most of ui elements so no need to duplicate `font-size: 14px` everywhere - just change base variable

See merge request !1663

13 files changed, 14 insertions, 29 deletions

diff --git a/app/assets/stylesheets/base/gl_variables.scss b/app/assets/stylesheets/base/gl_variables.scss
index ce21ffae235..ea230646a89 100644
--- a/app/assets/stylesheets/base/gl_variables.scss
+++ b/app/assets/stylesheets/base/gl_variables.scss
@@ -99,7 +99,7 @@ $font-size-base:          $gl-font-size;
 //
 //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
 
-$padding-base-vertical:     8px;
+$padding-base-vertical:     6px;
 $padding-base-horizontal:   14px;
 
 // $padding-large-vertical:    10px
diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss
index 30e084ecd62..54af78ee082 100644
--- a/app/assets/stylesheets/base/variables.scss
+++ b/app/assets/stylesheets/base/variables.scss
@@ -3,7 +3,7 @@ $hover: #FFF3EB;
 $box_bg: #F9F9F9;
 $gl-link-color: #446e9b;
 $nprogress-color: #c0392b;
-$gl-font-size: 13px;
+$gl-font-size: 14px;
 $list-font-size: 15px;
 $sidebar_width: 230px;
 $avatar_radius: 50%;
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index a854bd86636..af8e90eb1a9 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -24,7 +24,7 @@
 
 .slead {
   color: #666;
-  font-size: 14px;
+  font-size: 15px;
   margin-bottom: 12px;
   font-weight: normal;
   line-height: 24px;
diff --git a/app/assets/stylesheets/generic/markdown_area.scss b/app/assets/stylesheets/generic/markdown_area.scss
index 22b7ce6d831..eb39b6bb7e9 100644
--- a/app/assets/stylesheets/generic/markdown_area.scss
+++ b/app/assets/stylesheets/generic/markdown_area.scss
@@ -57,7 +57,6 @@
   border: 1px solid #ddd;
   min-height: 100px;
   padding: 5px;
-  font-size: 14px;
   box-shadow: none;
 }
 
@@ -83,7 +82,6 @@
   border: 1px solid #ddd;
   min-height: 100px;
   padding: 5px;
-  font-size: 14px;
   box-shadow: none;
   width: 100%;
 }
diff --git a/app/assets/stylesheets/generic/nav_sidebar.scss b/app/assets/stylesheets/generic/nav_sidebar.scss
index 335f1379662..b96063827c0 100644
--- a/app/assets/stylesheets/generic/nav_sidebar.scss
+++ b/app/assets/stylesheets/generic/nav_sidebar.scss
@@ -154,7 +154,7 @@
 
 .collapse-nav a {
   position: fixed;
-  top: 47px;
+  top: 46px;
   padding: 5px 13px 3px 13px;
   left: 197px;
   background: #EEE;
diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss
index 2773ee11fd4..af0ecb192d6 100644
--- a/app/assets/stylesheets/generic/selects.scss
+++ b/app/assets/stylesheets/generic/selects.scss
@@ -4,10 +4,8 @@
     background: #FFF;
     border-color: #BBB;
     padding: 6px 14px;
-    font-size: 13px;
-    line-height: 18px;
+    line-height: 1.42857143;
     height: auto;
-    margin: 2px 0;
 
     .select2-arrow {
       background: #FFF;
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index 0e2d9571a45..f46d6542c03 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -45,15 +45,6 @@
   }
 }
 
-.commit-committer-link,
-.commit-author-link {
-  font-size: 13px;
-  color: #555;
-  &:hover {
-    color: #999;
-  }
-}
-
 .commit-box {
   margin: 10px 0;
   border-top: 1px solid #ddd;
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index 683aca73593..e167d044e47 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -100,6 +100,7 @@ li.commit {
   .commit-row-info {
     color: #777;
     line-height: 24px;
+    font-size: 13px;
 
     a {
       color: #777;
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss
index 1c03f1240fc..3e9e36e477e 100644
--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -53,6 +53,7 @@
     }
   }
   .event-body {
+    font-size: 13px;
     margin-left: 35px;
     margin-right: 80px;
     color: #777;
@@ -184,11 +185,10 @@
 }
 
 .event_filter {
-
   li a {
+    font-size: 13px;
     padding: 5px 10px;
     background: rgba(0,0,0,0.045);
     margin-left: 4px;
   }
-
 }
diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss
index 07c62f98c36..6da7a2511a2 100644
--- a/app/assets/stylesheets/pages/help.scss
+++ b/app/assets/stylesheets/pages/help.scss
@@ -12,7 +12,6 @@
     color: #888;
 
     a {
-      font-size: 14px;
       margin-right: 3px;
     }
   }
@@ -29,7 +28,6 @@
 
   th {
     padding-top: 15px;
-    font-size: 14px;
     line-height: 1.5;
     color: #333;
     text-align: left
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index 46522e9ece9..4ea34cc1dac 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -11,6 +11,7 @@
 
     .issue-info {
       color: #999;
+      font-size: 13px;
     }
 
     .issue-check {
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 01f6a705224..9bd34b7376f 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -96,6 +96,7 @@
 
     .merge-request-info {
       color: #999;
+      font-size: 13px;
 
       .merge-request-labels {
         display: inline-block;
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 73f23626d57..384ff6d740c 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -38,13 +38,11 @@ ul.notes {
     .author {
       color: #333;
       font-weight: bold;
-      font-size: 14px;
       &:hover {
         color: $gl-link-color;
       }
     }
     .author-username {
-      font-size: 14px;
     }
   }
 
@@ -57,9 +55,6 @@ ul.notes {
   .note {
     display: block;
     position:relative;
-    .attachment {
-      font-size: 14px;
-    }
     .note-body {
       overflow: auto;
       .note-text {
@@ -184,6 +179,7 @@ ul.notes {
     margin-left: -60px;
     position: absolute;
     z-index: 10;
+    width: 32px;
 
     transition: all 0.2s ease;
 
@@ -192,8 +188,9 @@ ul.notes {
     filter: alpha(opacity=0);
 
     &:hover {
-      font-size: 24px;
-      background: $gl-primary;
+      width: 38px;
+      font-size: 20px;
+      background: $gl-info;
       color: #FFF;
       @include show-add-diff-note;
     }