Add cyan and pink nav themesadd-cyan-pink-themes

7 files changed, 59 insertions, 2 deletions

diff --git a/app/assets/stylesheets/framework/gitlab_theme.scss b/app/assets/stylesheets/framework/gitlab_theme.scss
index aaa8bed3df0..b5d08ff3550 100644
--- a/app/assets/stylesheets/framework/gitlab_theme.scss
+++ b/app/assets/stylesheets/framework/gitlab_theme.scss
@@ -289,6 +289,30 @@ body {
     );
   }
 
+  &.ui-cyan {
+    @include gitlab-theme(
+      $theme-cyan-100,
+      $theme-cyan-200,
+      $theme-cyan-500,
+      $theme-cyan-500,
+      $theme-cyan-700,
+      $theme-cyan-700,
+      $white-light
+    );
+  }
+
+  &.ui-pink {
+    @include gitlab-theme(
+      $theme-pink-100,
+      $theme-pink-200,
+      $theme-pink-500,
+      $theme-pink-500,
+      $theme-pink-700,
+      $theme-pink-700,
+      $white-light
+    );
+  }
+
   &.ui-dark {
     @include gitlab-theme(
       $theme-gray-100,
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 7808f6d3a25..fc48ef055af 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -161,6 +161,24 @@ $theme-light-red-500: #c24b38;
 $theme-light-red-600: #b03927;
 $theme-light-red-700: #a62e21;
 
+$theme-cyan-50: #e0f7fa;
+$theme-cyan-100: #c1eff4;
+$theme-cyan-200: #b2ebf2;
+$theme-cyan-300: #4dd0e1;
+$theme-cyan-400: #26c6da;
+$theme-cyan-500: #00bcd4;
+$theme-cyan-600: #00acc1;
+$theme-cyan-700: #0097a7;
+
+$theme-pink-50: #fce4ec;
+$theme-pink-100: #fbdae5;
+$theme-pink-200: #f8bbd0;
+$theme-pink-300: #f06292;
+$theme-pink-400: #ec407a;
+$theme-pink-500: #e91e63;
+$theme-pink-600: #d81b60;
+$theme-pink-700: #c2185b;
+
 $black: #000;
 $black-transparent: rgba(0, 0, 0, 0.3);
 $almost-black: #242424;
diff --git a/app/assets/stylesheets/pages/profiles/preferences.scss b/app/assets/stylesheets/pages/profiles/preferences.scss
index a353f301d07..270c11a07fb 100644
--- a/app/assets/stylesheets/pages/profiles/preferences.scss
+++ b/app/assets/stylesheets/pages/profiles/preferences.scss
@@ -59,6 +59,14 @@
       background-color: $theme-light-red-700;
     }
 
+    &.ui-cyan {
+      background-color: $theme-cyan-700;
+    }
+
+    &.ui-pink {
+      background-color: $theme-pink-700;
+    }
+
     &.ui-dark {
       background-color: $theme-gray-900;
     }
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index e0779112850..4deadf0c19c 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -85,8 +85,10 @@ production: &base
     ##   6 - Light Green
     ##   7 - Red
     ##   8 - Light Red
-    ##   9 - Dark
-    ##   10 - Light
+    ##   9 - Cyan
+    ##   10 - Pink
+    ##   11 - Dark
+    ##   12 - Light
     # default_theme: 1 # default: 1
 
     ## Automatic issue closing
diff --git a/db/schema.rb b/db/schema.rb
index 0112fc726d4..c731b259849 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1728,6 +1728,7 @@ ActiveRecord::Schema.define(version: 20180626125654) do
   end
 
   add_index "redirect_routes", ["path"], name: "index_redirect_routes_on_path", unique: true, using: :btree
+  add_index "redirect_routes", ["path"], name: "index_redirect_routes_on_path_text_pattern_ops", using: :btree, opclasses: {"path"=>"varchar_pattern_ops"}
   add_index "redirect_routes", ["source_type", "source_id"], name: "index_redirect_routes_on_source_type_and_source_id", using: :btree
 
   create_table "releases", force: :cascade do |t|
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index eb2d731343e..b8efd446e4d 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -25,6 +25,8 @@ The default palette is Indigo. You can choose between 10 different themes:
 - Light Green
 - Red
 - Light Red
+- Cyan
+- Pink
 - Dark
 - Light
 
diff --git a/lib/gitlab/themes.rb b/lib/gitlab/themes.rb
index 694b01b272c..d45788dde7e 100644
--- a/lib/gitlab/themes.rb
+++ b/lib/gitlab/themes.rb
@@ -20,6 +20,8 @@ module Gitlab
       Theme.new(8, 'Light Green', 'ui-light-green'),
       Theme.new(9, 'Red', 'ui-red'),
       Theme.new(10, 'Light Red', 'ui-light-red'),
+      Theme.new(11, 'Cyan', 'ui-cyan'),
+      Theme.new(12, 'Pink', 'ui-pink'),
       Theme.new(2, 'Dark', 'ui-dark'),
       Theme.new(3, 'Light', 'ui-light')
     ].freeze