Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 15:26:25 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 15:26:25 +0300
commita09983ae35713f5a2bbb100981116d31ce99826e (patch)
tree2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/assets/stylesheets/pages/notes.scss
parent18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff)
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/assets/stylesheets/pages/notes.scss')
-rw-r--r--app/assets/stylesheets/pages/notes.scss9
1 files changed, 3 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index e8cdfd717c0..40f0104a2bf 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -10,6 +10,7 @@ $note-form-margin-left: 72px;
top: 0;
bottom: 0;
left: $left;
+ height: calc(100% - 20px);
}
}
@@ -185,8 +186,8 @@ $note-form-margin-left: 72px;
padding: $gl-padding;
.dummy-avatar {
- background-color: $gl-gray-200;
- border: 1px solid darken($gl-gray-200, 25%);
+ background-color: $gl-gray-100;
+ border: 1px solid darken($gl-gray-100, 25%);
}
.note-headline-light,
@@ -254,10 +255,6 @@ $note-form-margin-left: 72px;
}
&.is-loading {
- .fa-smile-o {
- display: none;
- }
-
.fa-spinner {
display: inline-block;
}