Merge branch 'more-flat-ui' into 'master'

Apply more styles from Flatly theme Also add bottom margin for footer links on login page See merge request !1661

Merge branch 'more-flat-ui' into 'master'
Apply more styles from Flatly theme Also add bottom margin for footer links on login page See merge request !1661
b70b1055 · Dmitriy Zaporozhets · 2a76c7fd · 6b76ffc2 · b70b1055 · b70b1055
Commit b70b1055 authored Mar 10, 2015 by Dmitriy Zaporozhets
6 changed files
--- a/app/assets/stylesheets/base/gl_variables.scss
+++ b/app/assets/stylesheets/base/gl_variables.scss
@@ -15,6 +15,12 @@
 // $gray:                   lighten($gray-base, 33.5%) // #555
 // $gray-light:             lighten($gray-base, 46.7%) // #777
 // $gray-lighter:           lighten($gray-base, 93.5%) // #eee
+$gray-base:              #000;
+$gray-darker:            lighten($gray-base, 13.5%); // #222
+$gray-dark:              #7b8a8b;   // #333
+$gray:                   #95a5a6; // #555
+$gray-light:             #b4bcc2;   // #999
+$gray-lighter:           #ecf0f1; // #eee
 $brand-primary:  $gl-primary;
 $brand-success:  $gl-success;
@@ -30,7 +36,7 @@ $brand-danger:   $gl-danger;
 //** Background color for `<body>`.
 // $body-bg:               #fff
 //** Global text color on `<body>`.
-// $text-color:            $gray-dark
+$text-color:            $brand-primary;
 //** Global textual link color.
 $link-color:            $gl-link-color;
@@ -187,9 +193,9 @@ $padding-base-horizontal:   14px;
 // $input-bg-disabled:              $gray-lighter
 //** Text color for `<input>`s
-// $input-color:                    $gray
+$input-color:                    $text-color;
 //** `<input>` border color
-// $input-border:                   #ccc
+$input-border:                   #dce4ec;
 // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
 //** Default `.form-control` border radius
@@ -201,7 +207,7 @@ $padding-base-horizontal:   14px;
 // $input-border-radius-small:      $border-radius-small
 //** Border color for inputs on focus
-// $input-border-focus:             #66afe9
+$input-border-focus:             $brand-info;
 //** Placeholder text color
 // $input-color-placeholder:        #999
@@ -213,7 +219,7 @@ $padding-base-horizontal:   14px;
 //** Small `.form-control` height
 // $input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2)
-// $legend-color:                   $gray-dark
+$legend-color:                   $text-color;
 // $legend-border-color:            #e5e5e5
 //** Background color for textual input addons
@@ -709,7 +715,7 @@ $panel-border-radius:            0;
 // $panel-inner-border:          #ddd
 // $panel-footer-bg:             #f5f5f5
-// $panel-default-text:          $gray-dark
+$panel-default-text:          $text-color;
 // $panel-default-border:        #ddd
 // $panel-default-heading-bg:    #f5f5f5
@@ -757,8 +763,8 @@ $panel-border-radius:            0;
 //
 //##
-// $well-bg:                     #f5f5f5
+$well-bg:                     $gray-lighter;
-// $well-border:                 darken($well-bg, 7%)
+$well-border:                 transparent;
 //== Badges
@@ -826,15 +832,15 @@ $panel-border-radius:            0;
 //
 //##
-// $code-color:                  #c7254e
+$code-color:                  #c7254e;
-// $code-bg:                     #f9f2f4
+$code-bg:                     #f9f2f4;
-// $kbd-color:                   #fff
+$kbd-color:                   #fff;
-// $kbd-bg:                      #333
+$kbd-bg:                      #333;
-// $pre-bg:                      #f5f5f5
+$pre-bg:                      $gray-lighter;
-// $pre-color:                   $gray-dark
+$pre-color:                   $gray-dark;
-// $pre-border-color:            #ccc
+$pre-border-color:            #ccc;
 // $pre-scrollable-max-height:   340px

--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -319,7 +319,7 @@ table {
 }
 .btn-sign-in {
-  margin-top: 7px;
+  margin-top: 5px;
  text-shadow: none;
 }
@@ -337,8 +337,11 @@ table {
  overflow-x: auto;
 }
-.footer-links a {
+.footer-links {
-  margin-right: 15px;
+  margin-bottom: 20px;
+  a {
+    margin-right: 15px;
+  }
 }
 .search_box {

--- a/app/assets/stylesheets/generic/forms.scss
+++ b/app/assets/stylesheets/generic/forms.scss
@@ -29,7 +29,7 @@ fieldset legend {
  padding: 17px 20px 18px;
  margin-top: 18px;
  margin-bottom: 18px;
-  background-color: whitesmoke;
+  background-color: #ecf0f1;
  border-top: 1px solid #e5e5e5;
 }

--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -46,7 +46,6 @@
  border-bottom: 1px solid #eee;
  .event-title {
    @include str-truncated(72%);
-    color: #333;
    font-weight: 500;
    font-size: 14px;
    .author_name {
@@ -185,7 +184,7 @@
 }
 .event_filter {
  li a {
    padding: 5px 10px;
    background: rgba(0,0,0,0.045);

--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -41,7 +41,7 @@
      vertical-align: middle;
      i {
-        color: $gl-primary;
+        color: $gl-info;
      }
      img {

--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
@@ -12,7 +12,7 @@
      - unless current_controller?('sessions')
        .pull-right.hidden-xs
-          = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new'
+          = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-new append-right-10'
        .navbar-collapse.collapse
          %ul.nav.navbar-nav