Revert "Merge branch 'revert-f2421b2b' into 'master'"

This reverts merge request !14148

app/assets/stylesheets/framework.scss

@@ -19,6 +19,7 @@
 @import "framework/flash";
 @import "framework/forms";
 @import "framework/gfm";
+@import "framework/gitlab-theme";
 @import "framework/header";
 @import "framework/highlight";
 @import "framework/issue_box";

app/assets/stylesheets/framework/gitlab-theme.scss

+/**
+ * Styles the GitLab application with a specific color theme
+ */
+
+@mixin gitlab-theme($color-100, $color-200, $color-500, $color-700, $color-800, $color-900, $color-alternate) {
+  // Header
+
+  header.navbar-gitlab-new {
+    background: linear-gradient(to right, $color-900, $color-800);
+
+    .navbar-collapse {
+      color: $color-200;
+    }
+
+    .container-fluid {
+      .navbar-toggle {
+        border-left: 1px solid lighten($color-700, 10%);
+      }
+    }
+
+    .navbar-sub-nav,
+    .navbar-nav {
+      > li {
+        > a:hover,
+        > a:focus {
+          background-color: rgba($color-200, .2);
+        }
+
+        &.active > a,
+        &.dropdown.open > a {
+          color: $color-900;
+          background-color: $color-alternate;
+
+          svg {
+            fill: currentColor;
+          }
+        }
+
+        &.line-separator {
+          border-left: 1px solid rgba($color-200, .2);
+        }
+      }
+    }
+
+    .navbar-sub-nav {
+      color: $color-200;
+    }
+
+    .nav {
+      > li {
+        color: $color-200;
+
+        > a {
+          svg {
+            fill: $color-200;
+          }
+
+          &.header-user-dropdown-toggle {
+            .header-user-avatar {
+              border-color: $color-200;
+            }
+          }
+
+          &:hover,
+          &:focus {
+            @media (min-width: $screen-sm-min) {
+              background-color: rgba($color-200, .2);
+            }
+
+            svg {
+              fill: currentColor;
+            }
+          }
+        }
+
+        &.active > a,
+        &.dropdown.open > a {
+          color: $color-900;
+          background-color: $color-alternate;
+
+          &:hover {
+            svg {
+              fill: $color-900;
+            }
+          }
+        }
+
+        .impersonated-user,
+        .impersonated-user:hover {
+          svg {
+            fill: $color-900;
+          }
+        }
+      }
+    }
+  }
+
+  .title {
+    > a {
+      &:hover,
+      &:focus {
+        background-color: rgba($color-200, .2);
+      }
+    }
+  }
+
+  .search {
+    form {
+      background-color: rgba($color-200, .2);
+
+      &:hover {
+        background-color: rgba($color-200, .3);
+      }
+    }
+
+    .location-badge {
+      color: $color-100;
+      background-color: rgba($color-200, .1);
+      border-right: 1px solid $color-800;
+    }
+
+    .search-input::placeholder {
+      color: rgba($color-200, .8);
+    }
+
+    .search-input-wrap {
+      .search-icon,
+      .clear-icon {
+        color: rgba($color-200, .8);
+      }
+    }
+
+    &.search-active {
+      form {
+        background-color: $white-light;
+      }
+
+      .location-badge {
+        color: $gl-text-color;
+      }
+
+      .search-input-wrap {
+        .search-icon {
+          color: rgba($color-200, .8);
+        }
+      }
+    }
+  }
+
+  .btn-sign-in {
+    background-color: $color-100;
+    color: $color-900;
+  }
+
+
+  // Sidebar
+  .nav-sidebar li.active {
+    box-shadow: inset 4px 0 0 $color-700;
+
+    > a {
+      color: $color-900;
+    }
+
+    svg {
+      fill: $color-900;
+    }
+  }
+}
+
+
+body {
+  &.ui_indigo {
+    @include gitlab-theme($indigo-100, $indigo-200, $indigo-500, $indigo-700, $indigo-800, $indigo-900, $white-light);
+  }
+
+  &.ui_dark {
+    @include gitlab-theme($theme-gray-100, $theme-gray-200, $theme-gray-500, $theme-gray-700, $theme-gray-800, $theme-gray-900, $white-light);
+  }
+
+  &.ui_blue {
+    @include gitlab-theme($theme-blue-100, $theme-blue-200, $theme-blue-500, $theme-blue-700, $theme-blue-800, $theme-blue-900, $white-light);
+  }
+
+  &.ui_green {
+    @include gitlab-theme($theme-green-100, $theme-green-200, $theme-green-500, $theme-green-700, $theme-green-800, $theme-green-900, $white-light);
+  }
+
+  &.ui_light {
+    @include gitlab-theme($theme-gray-900, $theme-gray-700, $theme-gray-800, $theme-gray-700, $theme-gray-700, $theme-gray-100, $theme-gray-700);
+
+    header.navbar-gitlab-new {
+      background: $theme-gray-100;
+      box-shadow: 0 2px 0 0 $border-color;
+
+      .logo-text svg {
+        fill: $theme-gray-900;
+      }
+
+      .navbar-sub-nav,
+      .navbar-nav {
+        > li {
+          > a:hover,
+          > a:focus {
+            color: $theme-gray-900;
+          }
+
+          &.active > a {
+            color: $white-light;
+
+            &:hover {
+              color: $white-light;
+            }
+          }
+        }
+      }
+
+      .container-fluid {
+        .navbar-toggle,
+        .navbar-toggle:hover {
+          color: $theme-gray-700;
+          border-left: 1px solid $theme-gray-200;
+        }
+      }
+    }
+
+    .search {
+      form {
+        background-color: $white-light;
+        box-shadow: inset 0 0 0 1px $border-color;
+
+        &:hover {
+          background-color: $white-light;
+          box-shadow: inset 0 0 0 1px $blue-100;
+
+          .location-badge {
+            box-shadow: inset 0 0 0 1px $blue-100;
+          }
+        }
+      }
+
+      .search-input-wrap {
+        .search-icon {
+          color: $theme-gray-200;
+        }
+      }
+
+      .location-badge {
+        color: $theme-gray-700;
+        box-shadow: inset 0 0 0 1px $border-color;
+        background-color: $nav-badge-bg;
+        border-right: 0;
+      }
+    }
+
+    .nav-sidebar li.active {
+      > a {
+        color: $theme-gray-900;
+      }
+
+      svg {
+        fill: $theme-gray-900;
+      }
+    }
+  }
+}

app/assets/stylesheets/framework/header.scss

@@ -111,7 +111,6 @@ header {
         svg {
           height: 16px;
           width: 23px;
-          fill: currentColor;
         }
       }

app/assets/stylesheets/framework/variables.scss

@@ -74,6 +74,8 @@ $red-700: #a62d19;
 $red-800: #8b2615;
 $red-900: #711e11;
+// GitLab themes
+
 $indigo-50: #f7f7ff;
 $indigo-100: #ebebfa;
 $indigo-200: #d1d1f0;
@@ -86,6 +88,43 @@ $indigo-800: #393982;
 $indigo-900: #292961;
 $indigo-950: #1a1a40;
+$theme-gray-50: #fafafa;
+$theme-gray-100: #f2f2f2;
+$theme-gray-200: #dfdfdf;
+$theme-gray-300: #cccccc;
+$theme-gray-400: #bababa;
+$theme-gray-500: #a7a7a7;
+$theme-gray-600: #949494;
+$theme-gray-700: #707070;
+$theme-gray-800: #4f4f4f;
+$theme-gray-900: #2e2e2e;
+$theme-gray-950: #1f1f1f;
+
+$theme-blue-50: #f4f8fc;
+$theme-blue-100: #e6edf5;
+$theme-blue-200: #c8d7e6;
+$theme-blue-300: #97b3cf;
+$theme-blue-400: #648cb4;
+$theme-blue-500: #4a79a8;
+$theme-blue-600: #3e6fa0;
+$theme-blue-700: #305c88;
+$theme-blue-800: #25496e;
+$theme-blue-900: #1a3652;
+$theme-blue-950: #0f2235;
+
+$theme-green-50: #f2faf6;
+$theme-green-100: #e4f3ea;
+$theme-green-200: #c0dfcd;
+$theme-green-300: #8ac2a1;
+$theme-green-400: #52a274;
+$theme-green-500: #35935c;
+$theme-green-600: #288a50;
+$theme-green-700: #1c7441;
+$theme-green-800: #145d33;
+$theme-green-900: #0d4524;
+$theme-green-950: #072d16;
+
+
 $black: #000;
 $black-transparent: rgba(0, 0, 0, 0.3);
 $almost-black: #242424;

app/assets/stylesheets/new_nav.scss

@@ -9,10 +9,20 @@
 header.navbar-gitlab-new {
   color: $white-light;
-  background: linear-gradient(to right, $indigo-900, $indigo-800);
   border-bottom: 0;
   min-height: $new-navbar-height;
+  .logo-text {
+    line-height: initial;
+
+    svg {
+      width: 55px;
+      height: 14px;
+      margin: 0;
+      fill: $white-light;
+    }
+  }
+
   .header-content {
     display: -webkit-flex;
     display: flex;
@@ -38,10 +48,10 @@ header.navbar-gitlab-new {
       img {
         height: 28px;
-        margin-right: 10px;
+        margin-right: 8px;
       }
-      > a {
+      a {
         display: -webkit-flex;
         display: flex;
         align-items: center;
@@ -54,22 +64,6 @@ header.navbar-gitlab-new {
             margin-right: 8px;
           }
         }
-
-        .logo-text {
-          line-height: initial;
-
-          svg {
-            width: 55px;
-            height: 14px;
-            margin: 0;
-            fill: $white-light;
-          }
-        }
-
-        &:hover,
-        &:focus {
-          background-color: rgba($indigo-200, .2);
-        }
       }
     }
@@ -106,7 +100,6 @@ header.navbar-gitlab-new {
   .navbar-collapse {
     padding-left: 0;
-    color: $indigo-200;
     box-shadow: 0;
     @media (max-width: $screen-xs-max) {
@@ -132,7 +125,6 @@ header.navbar-gitlab-new {
       font-size: 14px;
       text-align: center;
       color: currentColor;
-      border-left: 1px solid lighten($indigo-700, 10%);
       &:hover,
       &:focus,
@@ -167,63 +159,49 @@ header.navbar-gitlab-new {
         will-change: color;
         margin: 4px 2px;
         padding: 6px 8px;
-        color: $indigo-200;
         height: 32px;
         @media (max-width: $screen-xs-max) {
           padding: 0;
         }
-        svg {
-          fill: $indigo-200;
-        }
-
         &.header-user-dropdown-toggle {
           margin-left: 2px;
           .header-user-avatar {
-            border-color: $indigo-200;
             margin-right: 0;
           }
         }
-      }
-
-      .header-new-dropdown-toggle {
-        margin-right: 0;
-      }
-      > a:hover,
-      > a:focus {
-        text-decoration: none;
-        outline: 0;
-        opacity: 1;
-        color: $white-light;
-
-        @media (min-width: $screen-sm-min) {
-          background-color: rgba($indigo-200, .2);
-        }
-        svg {
-          fill: currentColor;
-        }
-        &.header-user-dropdown-toggle {
-          .header-user-avatar {
-            border-color: $white-light;
+        &:hover,
+        &:focus {
+          text-decoration: none;
+          outline: 0;
+          opacity: 1;
+          color: $white-light;
+          svg {
+            fill: currentColor;
+          }
+          &.header-user-dropdown-toggle {
+            .header-user-avatar {
+              border-color: $white-light;
+            }
           }
         }
       }
+      .header-new-dropdown-toggle {
+        margin-right: 0;
+      }
+
       .impersonated-user,
       .impersonated-user:hover {
         margin-right: 1px;
         background-color: $white-light;
         border-top-right-radius: 0;
         border-bottom-right-radius: 0;
-
-        svg {
-          fill: $indigo-900;
-        }
       }
       .impersonation-btn,
@@ -241,8 +219,6 @@ header.navbar-gitlab-new {
       &.active > a,
       &.dropdown.open > a {
-        color: $indigo-900;
-        background-color: $white-light;
         svg {
           fill: currentColor;
@@ -256,7 +232,6 @@ header.navbar-gitlab-new {
   display: -webkit-flex;
   display: flex;
   margin: 0 0 0 6px;
-  color: $indigo-200;
   .dropdown-chevron {
     position: relative;
@@ -274,17 +249,6 @@ header.navbar-gitlab-new {
         text-decoration: none;
         outline: 0;
         color: $white-light;
-        background-color: rgba($indigo-200, .2);
-
-        svg {
-          fill: currentColor;
-        }
-      }
-
-      &.active > a,
-      &.dropdown.open > a {
-        color: $indigo-900;
-        background-color: $white-light;
         svg {
           fill: currentColor;
@@ -309,7 +273,6 @@ header.navbar-gitlab-new {
       }
       &.line-separator {
-        border-left: 1px solid rgba($indigo-200, .2);
         margin: 8px;
       }
     }
@@ -339,17 +302,14 @@ header.navbar-gitlab-new {
     height: 32px;
     border: 0;
     border-radius: $border-radius-default;
-    background-color: rgba($indigo-200, .2);
     transition: border-color ease-in-out 0.15s, background-color ease-in-out 0.15s;
     &:hover {
-      background-color: rgba($indigo-200, .3);
       box-shadow: none;
     }
   }
   &.search-active form {
-    background-color: $white-light;
     box-shadow: none;
     .search-input {
@@ -377,43 +337,26 @@ header.navbar-gitlab-new {
   }
   .search-input::placeholder {
-    color: rgba($indigo-200, .8);
     transition: color ease-in-out 0.15s;
   }
   .location-badge {
     font-size: 12px;
-    color: $indigo-100;
-    background-color: rgba($indigo-200, .1);
-    will-change: color;
     margin: -4px 4px -4px -4px;
     line-height: 25px;
     padding: 4px 8px;
     border-radius: 2px 0 0 2px;
-    border-right: 1px solid $indigo-800;
     height: 32px;
     transition: border-color ease-in-out 0.15s;
   }
-  .search-input-wrap {
-    .search-icon,
-    .clear-icon {
-      color: rgba($indigo-200, .8);
-    }
-  }
-
   &.search-active {
     .location-badge {
-      color: $gl-text-color;
       background-color: $nav-badge-bg;
       border-color: $border-color;
     }
     .search-input-wrap {
-      .search-icon {
-        color: rgba($indigo-200, .8);
-      }
-
       .clear-icon {
         color: $white-light;
       }
@@ -517,8 +460,6 @@ header.navbar-gitlab-new {
 .btn-sign-in {
   margin-top: 3px;
-  background-color: $indigo-100;
-  color: $indigo-900;
   font-weight: $gl-font-weight-bold;
   &:hover {

app/assets/stylesheets/new_sidebar.scss

@@ -162,16 +162,9 @@ $new-sidebar-collapsed-width: 50px;
   }
   li.active {
-    box-shadow: inset 4px 0 0 $active-border;
-
     > a {
-      color: $active-color;
       font-weight: $gl-font-weight-bold;
     }
-
-    svg {
-      fill: $active-color;
-    }
   }
   @media (max-width: $screen-xs-max) {

app/assets/stylesheets/pages/profiles/preferences.scss

+@mixin application-theme-preview($color-1, $color-2, $color-3, $color-4) {
+  .one {
+    background-color: $color-1;
+    border-top-left-radius: $border-radius-default;
+  }
+
+  .two {
+    background-color: $color-2;
+    border-top-right-radius: $border-radius-default;
+  }
+
+  .three {
+    background-color: $color-3;
+    border-bottom-left-radius: $border-radius-default;
+  }
+
+  .four {
+    background-color: $color-4;
+    border-bottom-right-radius: $border-radius-default;
+  }
+}
+
+.application-theme {
+  label {
+    margin-right: 20px;
+    text-align: center;
+  }
+
+  .preview {
+    font-size: 0;
+    margin-bottom: 10px;
+
+    &.indigo {
+      @include application-theme-preview($indigo-900, $indigo-700, $indigo-800, $indigo-500);
+    }
+
+    &.dark {
+      @include application-theme-preview($theme-gray-900, $theme-gray-700, $theme-gray-800, $theme-gray-600);
+    }
+
+    &.light {
+      @include application-theme-preview($theme-gray-600, $theme-gray-200, $theme-gray-400, $theme-gray-100);
+    }
+
+    &.blue {
+      @include application-theme-preview($theme-blue-900, $theme-blue-700, $theme-blue-800, $theme-blue-500);
+    }
+
+    &.green {
+      @include application-theme-preview($theme-green-900, $theme-green-700, $theme-green-800, $theme-green-500);
+    }
+  }
+
+  .preview-row {
+    display: block;
+  }
+
+  .quadrant {
+    display: inline-block;
+    height: 50px;
+    width: 80px;
+  }
+}
+
 .syntax-theme {
   label {
     margin-right: 20px;

app/controllers/admin/users_controller.rb

@@ -211,6 +211,7 @@ class Admin::UsersController < Admin::ApplicationController
       :provider,
       :remember_me,
       :skype,
+      :theme_id,
       :twitter,
       :username,
       :website_url

app/controllers/profiles/preferences_controller.rb

@@ -35,7 +35,8 @@ class Profiles::PreferencesController < Profiles::ApplicationController
       :color_scheme_id,
       :layout,
       :dashboard,
-      :project_view
+      :project_view,
+      :theme_id
     )
   end
 end

app/helpers/preferences_helper.rb

@@ -40,6 +40,10 @@ module PreferencesHelper
     ]
   end
+  def user_application_theme
+    @user_application_theme ||= Gitlab::Themes.for_user(current_user).css_class
+  end
+
   def user_color_scheme
     Gitlab::ColorSchemes.for_user(current_user).css_class
   end

app/models/user.rb

@@ -35,6 +35,7 @@ class User < ActiveRecord::Base
   default_value_for :project_view, :files
   default_value_for :notified_of_own_activity, false
   default_value_for :preferred_language, I18n.default_locale
+  default_value_for :theme_id, gitlab_config.default_theme
   attr_encrypted :otp_secret,
     key:       Gitlab::Application.secrets.otp_key_base,

app/views/layouts/application.html.haml

 !!! 5
 %html{ lang: I18n.locale, class: page_class }
   = render "layouts/head"
-  %body{ class: @body_class, data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}", find_file: find_file_path } }
+  %body{ class: "#{user_application_theme} #{@body_class}", data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}", find_file: find_file_path } }
     = render "layouts/init_auto_complete" if @gfm_form
     = render 'peek/bar'
     = render "layouts/header/default"

app/views/profiles/preferences/show.html.haml

@@ -3,6 +3,26 @@
 = render 'profiles/head'
 = form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f|
+  .col-lg-4.application-theme
+    %h4.prepend-top-0
+      GitLab navigation theme
+    %p Customize the appearance of the application header and navigation sidebar.
+  .col-lg-8.application-theme
+    - Gitlab::Themes.each do |theme|
+      = label_tag do
+        .preview{ class: theme.name.downcase }
+          .preview-row
+            .quadrant.one
+            .quadrant.two
+          .preview-row
+            .quadrant.three
+            .quadrant.four
+        = f.radio_button :theme_id, theme.id
+        = theme.name
+
+  .col-sm-12
+    %hr
+
   .col-lg-4.profile-settings-sidebar
     %h4.prepend-top-0
       Syntax highlighting theme

app/views/profiles/preferences/update.js.erb

+// Remove body class for any previous theme, re-add current one
+$('body').removeClass('<%= Gitlab::Themes.body_classes %>')
+$('body').addClass('<%= user_application_theme %>')
+
 // Toggle container-fluid class
 if ('<%= current_user.layout %>' === 'fluid') {
   $('.content-wrapper .container-fluid').removeClass('container-limited')

changelogs/unreleased/35012-navigation-add-option-to-change-navigation-color-palette.yml

+---
+title: Add option in preferences to change navigation theme color
+merge_request:
+author:
+type: added

config/gitlab.yml.example

@@ -76,6 +76,13 @@ production: &base
     # default_can_create_group: false  # default: true
     # username_changing_enabled: false # default: true - User can change her username/namespace
+    ## Default theme ID
+    ##   1 - Indigo
+    ##   2 - Dark
+    ##   3 - Light
+    ##   4 - Blue
+    ##   5 - Green
+    # default_theme: 1 # default: 1
     ## Automatic issue closing
     # If a commit message matches this regular expression, all issues referenced from the matched text will be closed.

config/initializers/1_settings.rb

@@ -232,6 +232,7 @@ Settings['gitlab'] ||= Settingslogic.new({})
 Settings.gitlab['default_projects_limit'] ||= 100000
 Settings.gitlab['default_branch_protection'] ||= 2
 Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil?
+Settings.gitlab['default_theme'] = Gitlab::Themes::APPLICATION_DEFAULT if Settings.gitlab['default_theme'].nil?
 Settings.gitlab['host']       ||= ENV['GITLAB_HOST'] || 'localhost'
 Settings.gitlab['ssh_host']   ||= Settings.gitlab.host
 Settings.gitlab['https']        = false if Settings.gitlab['https'].nil?

db/migrate/20170816234252_add_theme_id_to_users.rb

+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddThemeIdToUsers < ActiveRecord::Migration
+  DOWNTIME = false
+
+  def change
+    add_column :users, :theme_id, :integer, limit: 2
+  end
+end

db/schema.rb

@@ -1608,6 +1608,7 @@ ActiveRecord::Schema.define(version: 20170905112933) do
     t.boolean "notified_of_own_activity"
     t.string "preferred_language"
     t.string "rss_token"
+    t.integer "theme_id", limit: 2
   end
   add_index "users", ["admin"], name: "index_users_on_admin", using: :btree

doc/api/keys.md

@@ -32,6 +32,7 @@ Parameters:
     "twitter": "",
     "website_url": "",
     "email": "john@example.com",
+    "theme_id": 2,
     "color_scheme_id": 1,
     "projects_limit": 10,
     "current_sign_in_at": null,