diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 00:07:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 00:07:56 +0000 |
| commit | 775816e676aae53509d7b6f364945f2720636f72 (patch) | |
| tree | 0baa821597f08edce720b236b0c07a6d13893f85 /app/assets/stylesheets/framework | |
| parent | e98d69bc8b8b926a727d36e37d2ee30c9fa28907 (diff) | |
| download | gitlab-ce-775816e676aae53509d7b6f364945f2720636f72.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/broadcast_messages.scss | 28 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/job_log.scss | 1 |
2 files changed, 24 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/broadcast_messages.scss b/app/assets/stylesheets/framework/broadcast_messages.scss index d3e7d751e63..95ea3d90a0e 100644 --- a/app/assets/stylesheets/framework/broadcast_messages.scss +++ b/app/assets/stylesheets/framework/broadcast_messages.scss @@ -1,7 +1,5 @@ .broadcast-message { - @extend .alert-warning; - padding: 10px; - text-align: center; + padding: $gl-padding-8; div, p { @@ -15,9 +13,29 @@ } } -.broadcast-message-preview { +.broadcast-banner-message { + @extend .broadcast-message; + @extend .alert-warning; + text-align: center; +} + +.broadcast-notification-message { @extend .broadcast-message; - margin-bottom: 20px; + + position: fixed; + bottom: $gl-padding; + right: $gl-padding; + max-width: 300px; + width: auto; + background: $white-light; + border: 1px solid $gray-200; + box-shadow: 0 1px 2px 0 rgba($black, 0.1); + border-radius: $border-radius-default; + z-index: 999; + + &.preview { + position: static; + } } .toggle-colors { diff --git a/app/assets/stylesheets/framework/job_log.scss b/app/assets/stylesheets/framework/job_log.scss index 4a57a458c50..fefc51bf1f7 100644 --- a/app/assets/stylesheets/framework/job_log.scss +++ b/app/assets/stylesheets/framework/job_log.scss @@ -22,6 +22,7 @@ min-width: $job-line-number-width; margin-left: -$job-line-number-margin; padding-right: 1em; + user-select: none; &:hover, &:active, |