diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 15:08:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 15:08:50 +0000 |
commit | e06d0e779673d745972863302858105aad9032e5 (patch) | |
tree | 0ff35b27a949a164f586613004b4abfe33e7d20e /app/assets/stylesheets/framework | |
parent | f7dae0cdcb70ecb71c1d65f099e9d96b27a4548c (diff) | |
download | gitlab-ce-e06d0e779673d745972863302858105aad9032e5.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/spinner.scss | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index ac8437c23ca..f8c46a4495e 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -13,16 +13,14 @@ .page-title, .modal-title { + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + .modal-title-with-label span { vertical-align: middle; display: inline-block; } - - .color-label { - font-size: $gl-font-size; - padding: $gl-vert-padding $label-padding-modal; - vertical-align: middle; - } } .modal-title { diff --git a/app/assets/stylesheets/framework/spinner.scss b/app/assets/stylesheets/framework/spinner.scss index 5e05311041c..b7a99d421c9 100644 --- a/app/assets/stylesheets/framework/spinner.scss +++ b/app/assets/stylesheets/framework/spinner.scss @@ -51,7 +51,8 @@ } .btn { - .spinner { + .spinner, + .gl-spinner { vertical-align: text-bottom; } } |