summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-07-26 12:12:32 +0000
committerFatih Acet <acetfatih@gmail.com>2019-07-26 12:12:32 +0000
commit37850198bc00fdf62bdab1a5f552ae72c0a8ab08 (patch)
tree1e88049a12c1c6c4ceffa1421ae044aae593f5cc
parent55f99e930e1c147ec191a234ff4881ea7e70ea61 (diff)
parent99b5965ac0ab3ca1a6f5df1b9ecd6bae6f7c4543 (diff)
downloadgitlab-ce-37850198bc00fdf62bdab1a5f552ae72c0a8ab08.tar.gz
Merge branch 'ce-mw-productivity-analytics-mr-table' into 'master'
(CE Port) Add MR table component for Productivity Analytics See merge request gitlab-org/gitlab-ce!30975
-rw-r--r--app/assets/stylesheets/framework/common.scss1
-rw-r--r--app/assets/stylesheets/framework/lists.scss16
2 files changed, 17 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 61ab0476c42..6b44834cc52 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -441,6 +441,7 @@ img.emoji {
.mw-460 { max-width: 460px; }
.mw-6em { max-width: 6em; }
.mw-70p { max-width: 70%; }
+.mw-90p { max-width: 90%; }
.min-height-0 { min-height: 0; }
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index 460d9ea9526..ecd32dcd0ce 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -285,3 +285,19 @@ ul.indent-list {
max-width: 350px;
}
}
+
+.horizontal-list {
+ padding-left: 0;
+ list-style: none;
+
+ > li {
+ float: left;
+ }
+
+ &.list-items-separated {
+ > li:not(:last-child)::after {
+ content: '\00b7';
+ margin: 0 $gl-padding-4;
+ }
+ }
+}