summaryrefslogtreecommitdiffstats
path: root/client/components/cards/cardDetails.styl
diff options
context:
space:
mode:
authorIgnatzHome <ignatz@maschath.de>2018-05-17 20:21:07 +0200
committerIgnatzHome <ignatz@maschath.de>2018-05-17 20:21:07 +0200
commit9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874 (patch)
tree47ffe9a487aa6d66bbb4cd327ca248c4b30fda4a /client/components/cards/cardDetails.styl
parentc0c7b269a794fb28ddf5ffc17744f6724041de96 (diff)
parent8b16955cc27b29ae507be084adccc4fad61b05ef (diff)
downloadwekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.gz
wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.tar.bz2
wekan-9518a5c11ee5bc8556ad7af2d0bef1aa8ae47874.zip
resolving merge conflicts
Diffstat (limited to 'client/components/cards/cardDetails.styl')
-rw-r--r--client/components/cards/cardDetails.styl8
1 files changed, 6 insertions, 2 deletions
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl
index e5739a93..e18c07a1 100644
--- a/client/components/cards/cardDetails.styl
+++ b/client/components/cards/cardDetails.styl
@@ -69,10 +69,11 @@
.card-details-items
display: flex
- margin: 15px 0
+ flex-wrap: wrap
+ margin: 0 0 15px
.card-details-item
- margin-right: 0.5em
+ margin: 15px 0.5em 0 0
&:last-child
margin-right: 0
&.card-details-item-labels,
@@ -83,6 +84,9 @@
&.card-details-item-end
width: 50%
flex-shrink: 1
+ &.card-details-item-customfield
+ max-width: 50%
+ flex-grow: 1
.card-details-item-title
font-size: 16px