fixed scss-lint job
only display the toggle setting in development env for now
This commit is contained in:
parent
1c2547d2a9
commit
79a842c53d
5 changed files with 34 additions and 26 deletions
|
@ -74,6 +74,10 @@ $red-700: #a62d19;
|
|||
$red-800: #8b2615;
|
||||
$red-900: #711e11;
|
||||
|
||||
$purple-700: #2d0573;
|
||||
$purple-800: #451c7f;
|
||||
$purple-900: #380d75;
|
||||
|
||||
$black: #000;
|
||||
$black-transparent: rgba(0, 0, 0, 0.3);
|
||||
|
||||
|
|
|
@ -2,11 +2,9 @@
|
|||
@import 'framework/tw_bootstrap_variables';
|
||||
@import "bootstrap/variables";
|
||||
|
||||
$new-navbar-bg: #380D75;
|
||||
|
||||
header.navbar-gitlab-new {
|
||||
color: $gray-normal;
|
||||
background-color: $new-navbar-bg;
|
||||
background-color: $purple-900;
|
||||
|
||||
.header-content {
|
||||
padding-left: 0;
|
||||
|
@ -134,7 +132,7 @@ header.navbar-gitlab-new {
|
|||
|
||||
.search {
|
||||
form {
|
||||
border-color: #2D0573;
|
||||
border-color: $purple-700;
|
||||
|
||||
&:hover {
|
||||
border-color: rgba($white-light, .5);
|
||||
|
@ -147,7 +145,7 @@ header.navbar-gitlab-new {
|
|||
|
||||
form,
|
||||
.search-input {
|
||||
background-color: #451C7F;
|
||||
background-color: $purple-800;
|
||||
}
|
||||
|
||||
.search-input {
|
||||
|
@ -160,7 +158,7 @@ header.navbar-gitlab-new {
|
|||
|
||||
.location-badge {
|
||||
color: $white-light;
|
||||
background-color: $new-navbar-bg;
|
||||
background-color: $purple-900;
|
||||
}
|
||||
|
||||
&.search-active {
|
||||
|
|
|
@ -301,6 +301,10 @@ module ApplicationHelper
|
|||
end
|
||||
end
|
||||
|
||||
def can_toggle_new_nav?
|
||||
Rails.env.development?
|
||||
end
|
||||
|
||||
def show_new_nav?
|
||||
cookies["new_nav"] == "true"
|
||||
end
|
||||
|
|
|
@ -74,6 +74,7 @@
|
|||
= link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
|
||||
%li
|
||||
= link_to "Settings", profile_path
|
||||
- if can_toggle_new_nav?
|
||||
%li
|
||||
= link_to "Turn on new nav", profile_preferences_path(anchor: "new-navigation")
|
||||
%li.divider
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
.preview= image_tag "#{scheme.css_class}-scheme-preview.png"
|
||||
= f.radio_button :color_scheme_id, scheme.id
|
||||
= scheme.name
|
||||
- if can_toggle_new_nav?
|
||||
.col-sm-12
|
||||
%hr
|
||||
.col-lg-3.profile-settings-sidebar#new-navigation
|
||||
|
|
Loading…
Reference in a new issue