From 10f663d44c3a9740e7bd02ab06d6c72063a787b3 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Thu, 2 May 2019 14:02:18 +0200 Subject: [PATCH 1/5] added comma seperated list styling --- scm-ui/styles/scm.scss | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/scm-ui/styles/scm.scss b/scm-ui/styles/scm.scss index fccccc2bb7..d7b3e12a64 100644 --- a/scm-ui/styles/scm.scss +++ b/scm-ui/styles/scm.scss @@ -102,6 +102,24 @@ $fa-font-path: "webfonts"; .has-border-white { border-color: #fff !important; } +ul.is-separated { + > li { + display: inline-block; + font-weight: bold; + } + > li + li:before { + content: ", "; + } + > li + li.is-info { + font-weight: normal; + margin-left: 1em; + + &:before { + content: ""; + } + } +} + // buttons .button { padding-left: 1.5em; From 137e3b5ae667382ec5339dc1ff9ad816660a9762 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Thu, 2 May 2019 16:16:00 +0200 Subject: [PATCH 2/5] fixed list break --- scm-ui/styles/scm.scss | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/scm-ui/styles/scm.scss b/scm-ui/styles/scm.scss index d7b3e12a64..7de16db896 100644 --- a/scm-ui/styles/scm.scss +++ b/scm-ui/styles/scm.scss @@ -107,16 +107,17 @@ ul.is-separated { display: inline-block; font-weight: bold; } - > li + li:before { - content: ", "; - } - > li + li.is-info { + > li:after { + content: "\002C\2800"; font-weight: normal; + } + > li.is-info { margin-left: 1em; - - &:before { - content: ""; - } + font-weight: normal; + } + > li:last-child:after, + > li.is-info:after { + content: ""; } } @@ -213,7 +214,8 @@ ul.is-separated { // tables .table { width: 100%; - td, th { + td, + th { border-color: #eee; padding: 1rem; } @@ -263,12 +265,12 @@ ul.is-separated { // panels .panel { border: 1px solid #dbdbdb; - border-radius: .25rem; + border-radius: 0.25rem; .panel-heading { border: none; border-bottom: 1px solid #dbdbdb; - border-radius: .25rem .25rem 0 0; + border-radius: 0.25rem 0.25rem 0 0; > .field { margin-bottom: 0; // replace selector margin @@ -289,7 +291,7 @@ ul.is-separated { padding: 0.5em 0.75em; border: none; border-top: 1px solid #dbdbdb; - border-radius: 0 0 .25rem .25rem; + border-radius: 0 0 0.25rem 0.25rem; } } From 229dcc7d31bb4e921ae819760ed0b5dafb1148af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 3 May 2019 08:34:06 +0200 Subject: [PATCH 3/5] Divide list and content style --- scm-ui/styles/scm.scss | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/scm-ui/styles/scm.scss b/scm-ui/styles/scm.scss index 7de16db896..17f87ac2e5 100644 --- a/scm-ui/styles/scm.scss +++ b/scm-ui/styles/scm.scss @@ -103,24 +103,19 @@ $fa-font-path: "webfonts"; border-color: #fff !important; } ul.is-separated { - > li { - display: inline-block; - font-weight: bold; - } > li:after { content: "\002C\2800"; - font-weight: normal; } - > li.is-info { - margin-left: 1em; - font-weight: normal; - } - > li:last-child:after, - > li.is-info:after { + > li:last-child:after { content: ""; } } +.user { + display: inline-block; + font-weight: bold; +} + // buttons .button { padding-left: 1.5em; From 3bae1b62a38ac03c52c0c42ea9e58e11442b4f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 3 May 2019 08:45:00 +0200 Subject: [PATCH 4/5] A comma is a comma --- scm-ui/styles/scm.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm-ui/styles/scm.scss b/scm-ui/styles/scm.scss index 17f87ac2e5..6c64849cd0 100644 --- a/scm-ui/styles/scm.scss +++ b/scm-ui/styles/scm.scss @@ -104,7 +104,7 @@ $fa-font-path: "webfonts"; } ul.is-separated { > li:after { - content: "\002C\2800"; + content: ",\2800"; } > li:last-child:after { content: ""; From df9b46ffb6fc0739b2ebd0e5e70e76ade0e64838 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Fri, 3 May 2019 06:46:08 +0000 Subject: [PATCH 5/5] Close branch feature/author_presentation