kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Separate BS4 overrides into own file; remove all reassignments of -300

This commit is contained in:
Annabel Dunstone Gray 2018-08-09 13:11:56 -05:00
parent 266666d153
commit a96b2b15b5
No known key found for this signature in database
GPG Key ID: 7C8C78A372AD7A2D
10 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/bootstrap_migration.scss vendored
View File

@ -14,7 +14,6 @@ $border-radius-base: 3px !default;
$modal-body-bg: $white-light;
$input-border: $border-color;
$input-border-focus: $focus-border-color;
$padding-base-vertical: $gl-vert-padding;
$padding-base-horizontal: $gl-padding;

1
app/assets/stylesheets/framework.scss
View File

@ -1,4 +1,5 @@
@import 'framework/variables';
@import 'framework/variables_overrides';
@import 'framework/mixins';
@import 'bootstrap';

2
app/assets/stylesheets/framework/buttons.scss
View File

@ -350,7 +350,7 @@
&:focus {
cursor: text;
box-shadow: none;
border-color: lighten($dropdown-input-focus-border, 20%);
border-color: lighten($blue-300, 20%);
color: $gray-darkest;
background-color: $gray-light;
}

2
app/assets/stylesheets/framework/dropdowns.scss
View File

@ -615,7 +615,7 @@
&:focus {
color: $dropdown-link-color;
border-color: $dropdown-input-focus-border;
border-color: $blue-300;
box-shadow: 0 0 4px $dropdown-input-focus-shadow;
~ .fa {

4
app/assets/stylesheets/framework/filters.scss
View File

@ -205,7 +205,7 @@
&.focus,
&.focus:hover {
border-color: $dropdown-input-focus-border;
border-color: $blue-300;
box-shadow: 0 0 4px $search-input-focus-shadow-color;
}
@ -294,7 +294,7 @@
&:hover,
&:focus {
color: $gl-text-color;
border-color: $dropdown-input-focus-border;
border-color: $blue-300;
outline: none;
}

2
app/assets/stylesheets/framework/selects.scss
View File

@ -153,7 +153,7 @@
transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
&:focus {
border-color: $input-border-focus;
border-color: $blue-300;
}
&.select2-active {

20
app/assets/stylesheets/framework/variables.scss
View File

@ -177,7 +177,6 @@ $border-gray-dark: darken($white-normal, $darken-border-factor);
* UI elements
*/
$border-color: #e5e5e5;
$focus-border-color: $blue-300;
$well-expand-item: #e8f2f7;
$well-inner-border: #eef0f2;
$well-light-border: #f1f1f1;
@ -392,8 +391,7 @@ $dropdown-divider-color: rgba(#000, 0.1);
$dropdown-title-btn-color: #bfbfbf;
$dropdown-input-color: #555;
$dropdown-input-fa-color: #c7c7c7;
$dropdown-input-focus-border: $focus-border-color;
$dropdown-input-focus-shadow: rgba($dropdown-input-focus-border, 0.4);
$dropdown-input-focus-shadow: rgba($blue-300, 0.4);
$dropdown-loading-bg: rgba(#fff, 0.6);
$dropdown-chevron-size: 10px;
$dropdown-toggle-active-border-color: darken($border-color, 14%);
@ -834,19 +832,3 @@ Prometheus
$prometheus-table-row-highlight-color: $theme-gray-100;
$priority-label-empty-state-width: 114px;
/*
* Override Bootstrap 4 variables
*/
$secondary: $gray-light;
$input-disabled-bg: $gray-light;
$input-border-color: $theme-gray-200;
$input-color: $gl-text-color;
$font-family-sans-serif: $regular-font;
$font-family-monospace: $monospace-font;
$input-line-height: 20px;
$btn-line-height: 20px;
$table-accent-bg: $gray-light;
$card-border-color: $border-color;
$card-cap-bg: $gray-light;

16
app/assets/stylesheets/framework/variables_overrides.scss Normal file
View File

@ -0,0 +1,16 @@
/*
* This file is only for overriding Bootstrap 4 variables.
* Please add any new variables to variables.scss
*/
$secondary: $gray-light;
$input-disabled-bg: $gray-light;
$input-border-color: $theme-gray-200;
$input-color: $gl-text-color;
$font-family-sans-serif: $regular-font;
$font-family-monospace: $monospace-font;
$input-line-height: 20px;
$btn-line-height: 20px;
$table-accent-bg: $gray-light;
$card-border-color: $border-color;
$card-cap-bg: $gray-light;

2
app/assets/stylesheets/pages/note_form.scss
View File

@ -69,7 +69,7 @@
.comment-toolbar,
.nav-links {
border-color: $focus-border-color;
border-color: $blue-300;
}
}

4
app/assets/stylesheets/pages/search.scss
View File

@ -23,7 +23,7 @@ $search-avatar-size: 16px;
.search-text-input:hover,
.form-control:hover,
:not[readonly] {
border-color: lighten($dropdown-input-focus-border, 20%);
border-color: lighten($blue-300, 20%);
box-shadow: 0 0 4px lighten($search-input-focus-shadow-color, 20%);
}
@ -127,7 +127,7 @@ input[type='checkbox']:hover {
&.search-active {
form {
@extend .form-control:focus;
border-color: $dropdown-input-focus-border;
border-color: $blue-300;
box-shadow: none;
@include media-breakpoint-up(xl) {