diff options
author | Phil Hughes <me@iamphill.com> | 2019-03-25 14:34:28 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-25 14:34:28 +0000 |
commit | f0ce30bb83f07dad889bcee5dcb0571e571531d1 (patch) | |
tree | e789272ddd8590f03a9802672e593a90ef667759 | |
parent | 2125752eca40273d878dca0ce1fea5f28fea1297 (diff) | |
parent | 812aec957080f8d6ab2d84728e8eb69f6fbf3276 (diff) | |
download | gitlab-ce-57620-add-time-preferences-to-user-be.tar.gz |
Merge branch '10641-settings-css' into 'master'57620-add-time-preferences-to-user-be
Removes EE differences for settings.scss
Closes gitlab-ee#10641
See merge request gitlab-org/gitlab-ce!26543
-rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 54126577f93..e4ed685bd1b 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -216,6 +216,31 @@ } } +.nested-settings { + padding-left: 20px; +} + +.input-btn-group { + display: flex; + + .input-large { + flex: 1; + } + + .btn { + margin-left: 10px; + } +} + +.settings-flex-row { + display: flex; + align-items: center; + + .float-right { + margin-left: auto; + } +} + .prometheus-metrics-monitoring { .card { .card-toggle { @@ -246,6 +271,27 @@ } } + .custom-monitored-metrics { + .card-title { + display: flex; + align-items: center; + + > .btn-success { + margin-left: auto; + } + } + + .custom-metric { + display: flex; + align-items: center; + } + + .custom-metric-link-bold { + font-weight: $gl-font-weight-bold; + text-decoration: none; + } + } + .loading-metrics, .empty-metrics { padding: 30px 10px; @@ -280,6 +326,12 @@ } } +.saml-settings.info-well { + .form-control[readonly] { + background: $white-light; + } +} + .modal-doorkeepr-auth { .modal-body { padding: $gl-padding; |