summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 09:08:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 09:08:52 +0000
commit53ae6b7e3f83591ad251a3f771f5bf3b8cf087ba (patch)
tree5180b96d6a84f36a515cedfa8e81d72de5ccf4fb /app/assets/stylesheets
parentcfe63cce6a90a1c70397c1b9f6d90480f25cae0a (diff)
downloadgitlab-ce-53ae6b7e3f83591ad251a3f771f5bf3b8cf087ba.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/pages/notes.scss13
1 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 1da9f691639..1a06ae1ed41 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -311,13 +311,18 @@ $note-form-margin-left: 72px;
overflow: hidden;
.description-version {
+ position: relative;
+
+ .btn.delete-description-history {
+ position: absolute;
+ top: 18px;
+ right: 0;
+ }
+
pre {
max-height: $dropdown-max-height-lg;
white-space: pre-wrap;
-
- &.loading-state {
- height: 94px;
- }
+ padding-right: 30px;
}
}