diff options
author | Phil Hughes <me@iamphill.com> | 2019-03-20 11:35:17 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-20 11:35:17 +0000 |
commit | fd037945ec9c0e7f30893f59dd795acfc65f2459 (patch) | |
tree | 3ba7a494cf1d7cf792dbdb99ff9e25563d31ed71 | |
parent | e61cbe7fe3abaee70216f33c7b9adaca598ff97f (diff) | |
parent | 108792e49f9cc40f74d4d1f6fc549a5d53eb55c0 (diff) | |
download | gitlab-ce-fd037945ec9c0e7f30893f59dd795acfc65f2459.tar.gz |
Merge branch '10532-common-css' into 'master'
Removes EE differences from common.scss
Closes gitlab-ee#10532
See merge request gitlab-org/gitlab-ce!26352
-rw-r--r-- | app/assets/stylesheets/framework/common.scss | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 5efd484b51b..97a9a55c968 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -120,7 +120,7 @@ hr { text-overflow: ellipsis; white-space: nowrap; - > div, + > div:not(.block), .str-truncated { display: inline; } @@ -381,6 +381,7 @@ img.emoji { .prepend-left-5 { margin-left: 5px; } .prepend-left-8 { margin-left: 8px; } .prepend-left-10 { margin-left: 10px; } +.prepend-left-15 { margin-left: 15px; } .prepend-left-default { margin-left: $gl-padding; } .prepend-left-20 { margin-left: 20px; } .prepend-left-32 { margin-left: 32px; } @@ -388,6 +389,7 @@ img.emoji { .append-right-5 { margin-right: 5px; } .append-right-8 { margin-right: 8px; } .append-right-10 { margin-right: 10px; } +.append-right-15 { margin-right: 15px; } .append-right-default { margin-right: $gl-padding; } .append-right-20 { margin-right: 20px; } .prepend-right-32 { margin-right: 32px; } @@ -402,6 +404,8 @@ img.emoji { .prepend-bottom-32 { margin-bottom: 32px; } .inline { display: inline-block; } .center { text-align: center; } +.block { display: block; } +.flex { display: flex; } .vertical-align-middle { vertical-align: middle; } .vertical-align-sub { vertical-align: sub; } .flex-align-self-center { align-self: center; } |