Commit 71ae1bb2 authored by Clement Ho's avatar Clement Ho

Merge branch '47435-readonly-input-color' into 'master'

Resolve "Fix styling of read-only fields"

Closes #47435

See merge request gitlab-org/gitlab-ce!19502
parents ba4dc01e 56983faf
...@@ -497,6 +497,10 @@ fieldset[disabled] .btn, ...@@ -497,6 +497,10 @@ fieldset[disabled] .btn,
} }
} }
[readonly] {
cursor: default;
}
.btn-no-padding { .btn-no-padding {
padding: 0; padding: 0;
} }
...@@ -173,11 +173,6 @@ $border-gray-normal: darken($gray-normal, $darken-border-factor); ...@@ -173,11 +173,6 @@ $border-gray-normal: darken($gray-normal, $darken-border-factor);
$border-gray-normal-dashed: darken($gray-normal, $darken-border-dashed-factor); $border-gray-normal-dashed: darken($gray-normal, $darken-border-dashed-factor);
$border-gray-dark: darken($white-normal, $darken-border-factor); $border-gray-dark: darken($white-normal, $darken-border-factor);
/*
* Override Bootstrap 4 variables
*/
$secondary: $gray-light;
/* /*
* UI elements * UI elements
*/ */
...@@ -810,3 +805,12 @@ Prometheus ...@@ -810,3 +805,12 @@ Prometheus
$prometheus-table-row-highlight-color: $theme-gray-100; $prometheus-table-row-highlight-color: $theme-gray-100;
$priority-label-empty-state-width: 114px; $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;
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
.file-finder-input:hover, .file-finder-input:hover,
.issuable-search-form:hover, .issuable-search-form:hover,
.search-text-input:hover, .search-text-input:hover,
.form-control:hover { .form-control:hover,
:not[readonly] {
border-color: lighten($dropdown-input-focus-border, 20%); border-color: lighten($dropdown-input-focus-border, 20%);
box-shadow: 0 0 4px lighten($search-input-focus-shadow-color, 20%); box-shadow: 0 0 4px lighten($search-input-focus-shadow-color, 20%);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment