Переглянути джерело

Merge pull request #4073 from mfilser/labels_wrapped_if_too_long

Labels wrapped if too long
Lauri Ojansivu 3 роки тому
батько
коміт
fe2a7e207c

+ 0 - 4
client/components/cards/cardDetails.styl

@@ -230,10 +230,6 @@ avatar-radius = 50%
     font-weight: bold
     font-weight: bold
     color: #4d4d4d
     color: #4d4d4d
 
 
-  .card-label
-    padding-top: 5px
-    padding-bottom: 5px
-
   .activities
   .activities
     padding-top: 10px
     padding-top: 10px
 
 

+ 8 - 6
client/components/cards/labels.styl

@@ -2,6 +2,7 @@
 
 
 // XXX Use .board-widget-labels as a flexbox container
 // XXX Use .board-widget-labels as a flexbox container
 .card-label
 .card-label
+  border: 1px solid #000000
   border-radius: 4px
   border-radius: 4px
   color: white  //Default white text, in select cases,  changed to black to improve contrast between label colour and text
   color: white  //Default white text, in select cases,  changed to black to improve contrast between label colour and text
   display: inline-block
   display: inline-block
@@ -12,10 +13,11 @@
   padding: 3px 8px
   padding: 3px 8px
   max-width: 210px
   max-width: 210px
   min-width: 8px
   min-width: 8px
-  overflow: ellipsis
   word-wrap: break-word
   word-wrap: break-word
-  height: 18px
-  vertical-align: bottom
+  min-height: 18px
+  vertical-align: middle
+  white-space: initial
+  overflow: initial
 
 
   &:hover
   &:hover
     color: white
     color: white
@@ -27,12 +29,13 @@
 
 
   &.add-label
   &.add-label
     box-shadow: 0 0 0 2px darken(white, 25%) inset
     box-shadow: 0 0 0 2px darken(white, 25%) inset
+    border: initial
 
 
     &:hover, &.is-active
     &:hover, &.is-active
       box-shadow: 0 0 0 2px darken(white, 60%) inset
       box-shadow: 0 0 0 2px darken(white, 60%) inset
 
 
-    i.fa-plus
-      margin-top: 3px
+  p
+    margin: 0px
 
 
 .palette-colors
 .palette-colors
   display: flex
   display: flex
@@ -47,7 +50,6 @@
 .card-label-white
 .card-label-white
   background-color: #ffffff
   background-color: #ffffff
   color: #000000 //Black text for better visibility
   color: #000000 //Black text for better visibility
-  border: 1px solid #c0c0c0
 
 
 .card-label-white:hover
 .card-label-white:hover
   color: #aaaaaa //grey text for better visibility
   color: #aaaaaa //grey text for better visibility

+ 0 - 2
client/components/cards/minicard.styl

@@ -80,8 +80,6 @@
 
 
   .minicard-labels
   .minicard-labels
     float: none
     float: none
-    display: flex
-    flex-wrap: wrap
 
 
     .minicard-label
     .minicard-label
       width: 11px
       width: 11px