decidim-core 0.20.0 → 0.23.1.rc1

data/app/assets/stylesheets/decidim/modules/_cards.scss

@@ -28,15 +28,17 @@ $datetime-bg: var(--primary);
   background: $card-bg;
   border: $card-border;
   border-radius: $card-border-radius;
-  overflow: hidden;
+  // Keep visible for accessibility (active/focused card as a link)
+  overflow: visible;
 
-  @include modifiers(border-top-color, (muted: rgba($muted, .3))){
+  @include modifiers(
+    border-top-color,
+    (
+      muted: rgba($muted, .3),
+    )
+  ){
     border-top-width: $card-border-top-width;
   }
-
-  &:hover{
-    @include modifiers(border-color, (muted: rgba($muted, .3)));
-  }
 }
 
 .card--nomargin{
@@ -77,6 +79,13 @@ $datetime-bg: var(--primary);
   @extend .heading5;
 }
 
+a.card__title,
+a .card__title{
+  &:hover{
+    text-decoration: underline;
+  }
+}
+
 .card__header{
   margin-bottom: $card-padding / 2;
 
@@ -96,9 +105,9 @@ $datetime-bg: var(--primary);
   margin-top: .5rem;
   margin-bottom: -.75rem;
   font-size: 80%;
-  text-transform: uppercase;
   font-weight: 800;
   letter-spacing: .05em;
+  text-transform: uppercase;
   color: $muted;
   display: flex;
   align-self: flex-start;
@@ -113,6 +122,15 @@ $datetime-bg: var(--primary);
 }
 
 .card__text{
+  &:first-child{
+    margin-top: -.25em; //balances top alignment in card
+  }
+
+  a:hover{
+    color: darken($secondary, 20%);
+    text-decoration: underline;
+  }
+
   .card__text--status{
     font-weight: bold;
     text-transform: uppercase;
@@ -121,7 +139,12 @@ $datetime-bg: var(--primary);
       content: " ";
     }
 
-    @include modifiers(color, (muted: $muted));
+    @include modifiers(
+      color,
+      (
+        muted: $muted,
+      )
+    );
   }
 
   .card__text--category{
@@ -141,7 +164,7 @@ $datetime-bg: var(--primary);
 }
 
 .card__text--separated-mid-dot{
-  @include inline-separator(' · ');
+  @include inline-separator(" · ");
 }
 
 .card__image{
@@ -237,6 +260,10 @@ $datetime-bg: var(--primary);
   [data-toggler]{
     margin-bottom: -.5rem;
   }
+
+  &.inline-block{
+    display: inline-block;
+  }
 }
 
 .card__voting{
@@ -250,6 +277,24 @@ $datetime-bg: var(--primary);
   line-height: 1;
 }
 
+/* Card activity date */
+.card__activity-date{
+  margin-bottom: .5rem;
+
+  &.inline-block{
+    display: inline-block;
+
+    &.before-content::before{
+      content: "";
+      margin-right: .8rem;
+      border-right: $border;
+      height: .7rem;
+      display: inline-block;
+      vertical-align: middle;
+    }
+  }
+}
+
 /* Card data */
 
 .card-data{
@@ -257,14 +302,26 @@ $datetime-bg: var(--primary);
   margin: 0;
   display: flex;
   flex-wrap: wrap;
+
+  a:hover{
+    text-decoration: underline;
+  }
+
+  span:focus{
+    outline: $anchor-outline-focus;
+    outline-color: var(--highlight);
+    outline-offset: $anchor-outline-offset;
+  }
 }
 
 .card-data__item{
-  display: inline-block;
+  display: inline-flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
   flex-basis: 33.33%;
   flex-grow: 1;
   text-align: center;
-  text-transform: uppercase;
   font-size: rem-calc(15);
   line-height: 1;
   color: $muted;
@@ -281,6 +338,18 @@ $datetime-bg: var(--primary);
   &.card-data__item--expand{
     line-height: $global-lineheight;
   }
+
+  &.creation_date_status strong{
+    text-transform: uppercase;
+    font-weight: 600;
+    font-size: .8em;
+    letter-spacing: .05em;
+    color: $body-font-color;
+  }
+
+  [data-toggle]{
+    margin-bottom: 0;
+  }
 }
 
 .card-data__item__number{
@@ -318,7 +387,6 @@ $datetime-bg: var(--primary);
 
 .card__popularity__data{
   text-align: center;
-  text-transform: uppercase;
   font-size: 85%;
   line-height: 1;
   margin-bottom: .2rem;
@@ -350,7 +418,6 @@ $datetime-bg: var(--primary);
 
 .card__support__data{
   text-align: center;
-  text-transform: uppercase;
   font-size: 85%;
   line-height: 1;
   margin-bottom: .2rem;
@@ -404,6 +471,13 @@ $datetime-bg: var(--primary);
 
   &:hover{
     color: $anchor-color;
+    text-decoration: underline;
+  }
+
+  &:focus{
+    z-index: 2; // Raise the focus border on top of overflowing elements
+    outline: $anchor-outline-focus;
+    outline-offset: $anchor-outline-offset;
   }
 }
 
@@ -413,8 +487,8 @@ $datetime-bg: var(--primary);
 
 /* Card list */
 .card--list{
-  .card--list__item:not(:last-of-type),
-  *:not(:last-of-type) .card--list__item{
+  .card--list__item:not(:last-child),
+  *:not(:last-child) .card--list__item{
     border-bottom: $border;
   }
 }
@@ -426,6 +500,11 @@ $datetime-bg: var(--primary);
 
   .card--list--mini &{
     padding-left: $card-padding-small;
+
+    .card__link{
+      display: flex;
+      align-items: center;
+    }
   }
 
   @include breakpoint(medium){
@@ -462,9 +541,10 @@ $datetime-bg: var(--primary);
   flex-grow: 1;
   flex-shrink: 1;
   display: inline-flex;
-  overflow: hidden;
   align-items: center;
   padding: 1rem 1rem 1rem 0;
+  // Keep visible for accessibility (active/focused card as a link)
+  overflow: visible;
 
   &.card--list__text--top{
     align-items: start;
@@ -472,6 +552,10 @@ $datetime-bg: var(--primary);
 
   .card--list--mini &{
     padding: .5rem .5rem .5rem 0;
+
+    > *{
+      flex-grow: 1;
+    }
   }
 
   .author{
@@ -483,6 +567,12 @@ $datetime-bg: var(--primary);
 .card--list__heading{
   margin-bottom: 0;
   display: block;
+
+  &.heading6{
+    text-transform: unset;
+    letter-spacing: unset;
+    font-weight: unset;
+  }
 }
 
 .card--list .tags{
@@ -499,7 +589,6 @@ $datetime-bg: var(--primary);
   align-items: center;
   justify-content: center;
   text-align: center;
-  text-transform: uppercase;
   font-size: 85%;
   min-width: 7rem;
   line-height: 1;
@@ -516,6 +605,36 @@ $datetime-bg: var(--primary);
   }
 }
 
+.card--list__data-added{
+  background-color: tint($success, 80%);
+
+  a{
+    color: $body-font-color;
+  }
+}
+
+.card--list__check{
+  margin-bottom: 0;
+  border-radius: 50%;
+  align-self: center;
+  flex-shrink: 0;
+  width: 2em;
+  height: 2em;
+  padding: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-left: auto;
+
+  &--disabled{
+    pointer-events: none;
+  }
+
+  svg{
+    flex-basis: auto;
+  }
+}
+
 .card--list__data__icon{
   .icon{
     width: 20px;
@@ -558,10 +677,10 @@ $datetime-bg: var(--primary);
   }
 
   .card--list__annotation{
-    text-transform: uppercase;
     letter-spacing: .03em;
     font-size: .7em;
     font-weight: 600;
+    text-transform: uppercase;
     width: $date-width;
   }
 
@@ -585,9 +704,24 @@ $datetime-bg: var(--primary);
   }
 }
 
+.card--list__author{
+  @extend .card--list__titled-text;
+
+  padding: .5rem 1rem .5rem 0;
+  margin-left: -.5rem;
+
+  .author{
+    margin: 0;
+  }
+
+  .author__avatar img{
+    border-radius: 2px;
+  }
+}
+
 /* Card full width variant */
 .card--full{
-  margin-bottom: $card-margin-bottom*2;
+  margin-bottom: $card-margin-bottom * 2;
 
   &:last-child{
     margin-bottom: 0;
@@ -595,13 +729,23 @@ $datetime-bg: var(--primary);
 
   .card__title{
     @extend .heading2;
+
+    &:hover{
+      text-decoration: underline;
+    }
+
+    &:focus{
+      outline: $anchor-outline-focus;
+      outline-color: var(--highlight);
+      outline-offset: $anchor-outline-offset;
+    }
   }
 
   .card__content{
     padding: $card-padding;
 
     @include breakpoint(large){
-      padding: $card-padding*2;
+      padding: $card-padding * 2;
     }
   }
 }
@@ -730,7 +874,6 @@ $datetime-bg: var(--primary);
   display: inline-flex;
   color: $card-id;
   padding: 0 .5rem;
-  text-transform: uppercase;
   font-size: $small-font-size;
   font-weight: bold;
   position: absolute;
@@ -778,7 +921,12 @@ $datetime-bg: var(--primary);
     margin-left: $card-padding;
   }
 
-  @include modifiers(color, (muted: tint($muted, 50))){
+  @include modifiers(
+    color,
+    (
+      muted: tint($muted, 50),
+    )
+  ){
     margin-top: -$global-margin * .95;
   }
 }
@@ -811,8 +959,11 @@ $datetime-bg: var(--primary);
       justify-content: left;
 
       strong{
-        color: $body-font-color;
         text-transform: uppercase;
+        font-weight: 600;
+        font-size: .8em;
+        letter-spacing: .05em;
+        color: $body-font-color;
       }
 
       .card__icondata--address{
@@ -933,3 +1084,18 @@ $datetime-bg: var(--primary);
     }
   }
 }
+
+// card row
+.card__row{
+  @include flex;
+  @include flex-align($x: left, $y: null);
+
+  > *{
+    padding: $global-margin;
+    flex: 0 0 25%;
+
+    &:not(:nth-child(4n)){
+      border-right: $card-border;
+    }
+  }
+}

data/app/assets/stylesheets/decidim/modules/_collapsible-list.scss

@@ -26,10 +26,31 @@
 
   .collapsible-list__see-less{
     display: inline-block;
+    color: #599aa6;
+  }
+
+  .collapsible-list__see-less:hover{
+    color: #2d4d53;
+    text-decoration: underline;
   }
 
   .collapsible-list__see-more{
     display: none;
+    color: #599aa6;
+  }
+
+  .collapsible-list__see-more:hover{
+    color: #2d4d53;
+    text-decoration: underline;
+  }
+
+  .card__text--paragraph{
+    text-decoration: none;
+    color: #3d393c !important;
+  }
+
+  .card__text--paragraph:hover{
+    text-decoration: none;
   }
 
   > *{

data/app/assets/stylesheets/decidim/modules/_comments.scss

@@ -28,6 +28,7 @@ $comment-form-bg: $light-gray;
 
 .comment__header{
   padding: $comment-padding;
+  display: flex;
 }
 
 .comment__content{
@@ -36,9 +37,12 @@ $comment-form-bg: $light-gray;
   > :last-child{
     margin-bottom: 0;
   }
+
+  p:empty{
+    display: none;
+  }
 }
 
-.comment__footer,
 .comment__additionalreply{
   padding: $comment-padding;
   font-size: 90%;
@@ -46,6 +50,15 @@ $comment-form-bg: $light-gray;
   @include clearfix;
 }
 
+.comment__footer{
+  padding: $comment-padding;
+  font-size: 90%;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: baseline;
+  justify-content: space-between;
+}
+
 .comment--nested{
   background: $comment-nested-bg;
   margin: $comment-padding;
@@ -60,13 +73,46 @@ $comment-form-bg: $light-gray;
   }
 }
 
-.comment__reply{
+.comment__actions{
+  display: flex;
+  flex-wrap: wrap;
+
+  > button,
+  a{
+    cursor: pointer;
+    margin-top: .5rem;
+  }
+}
+
+.comment__reply,
+.comment__reply[data-toggle]{
   float: left;
   color: $muted;
+  margin-right: .75rem;
+  margin-bottom: 0;
+
+  span{
+    margin-right: 0;
+  }
+
+  &.muted-link{
+    color: $anchor-color;
+
+    &:hover{
+      color: $anchor-color-hover;
+    }
+  }
 }
 
 .comment__votes{
   float: right;
+  margin-top: .5rem;
+
+  button:focus{
+    background-color: $secondary;
+    color: $white;
+    outline: none;
+  }
 }
 
 .comment__votes--up{
@@ -122,12 +168,50 @@ $comment-form-bg: $light-gray;
   }
 }
 
+.comment__quote{
+  border-left-width: 6px;
+  font-size: 80%;
+  background-color: rgba(0, 0, 0, .03);
+  padding: 1rem;
+  margin-bottom: 1rem;
+
+  > p:last-of-type{
+    margin-bottom: 0;
+  }
+
+  > br{
+    display: none;
+  }
+}
+
 /* Comment form */
 
+.comment__quote{
+  border-left-width: 6px;
+  font-size: 80%;
+  background-color: rgba(0, 0, 0, .03);
+  padding: 1rem;
+  margin-bottom: 1rem;
+
+  > p:last-child{
+    margin-bottom: 0;
+  }
+}
+
 .add-comment{
   background: $comment-form-bg;
   padding: $comment-padding;
 
+  a:hover{
+    text-decoration: underline;
+  }
+
+  a:focus{
+    background-color: $secondary;
+    color: $white;
+    outline: none;
+  }
+
   .button{
     margin-bottom: 0;
   }
@@ -140,3 +224,19 @@ $comment-form-bg: $light-gray;
     display: block;
   }
 }
+
+/* Comments toggle */
+
+.comment{
+  &__text-is-open{
+    display: none;
+  }
+
+  &__is-open &__text-is-open{
+    display: inline;
+  }
+
+  &__is-open &__text-is-closed{
+    display: none;
+  }
+}