decidim-core 0.16.1 → 0.17.0

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

@@ -14,13 +14,13 @@ $card-margin-bottom: map-get($grid-column-gutter, medium);
 
 $card-footer-bg: $light-gray-dark;
 
-$card-proposal: $proposals;
-$card-action: $actions;
-$card-debate: $debates;
-$card-meeting: $meetings;
-$card-spaces: $card-meeting;
+$card-proposal: var(--proposals);
+$card-action: var(--actions);
+$card-debate: var(--debates);
+$card-meeting: var(--meetings);
+$card-spaces: var(--meetings);
 
-$datetime-bg: $primary;
+$datetime-bg: var(--primary);
 
 /* Cards */
 .card{
@@ -77,11 +77,6 @@ $datetime-bg: $primary;
   @extend .heading5;
 }
 
-.card__title--strong{
-  font-weight: bold;
-  text-transform: uppercase;
-}
-
 .card__header{
   margin-bottom: $card-padding / 2;
 
@@ -175,7 +170,7 @@ $datetime-bg: $primary;
   font-weight: 600;
   display: flex;
   align-items: baseline;
-  border-left: 4px solid $primary;
+  border-left: 4px solid var(--primary);
   background: $card-secondary-bg;
   line-height: 1;
 }
@@ -205,12 +200,6 @@ $datetime-bg: $primary;
   .card__content{
     display: flex;
   }
-
-  &.card__footer--spaces{
-    background: rgba($card-spaces, .2);
-    border-top-color: rgba($card-spaces, .6);
-    border-top-width: .25rem;
-  }
 }
 
 .card__footer--transparent{
@@ -413,10 +402,6 @@ $datetime-bg: $primary;
 .card__link{
   color: $anchor-color;
 
-  @include breakpoint(small only){
-    word-break: break-all;
-  }
-
   &:hover{
     color: $anchor-color;
   }
@@ -516,6 +501,7 @@ $datetime-bg: $primary;
   text-align: center;
   text-transform: uppercase;
   font-size: 85%;
+  min-width: 7rem;
   line-height: 1;
   color: $muted;
   padding: $card-padding-small;
@@ -815,7 +801,7 @@ $datetime-bg: $primary;
     }
 
     li:first-child{
-      color: $primary;
+      color: var(--primary);
       flex: 0;
     }
 

data/app/assets/stylesheets/decidim/modules/_conference-nav.scss

@@ -20,7 +20,7 @@
         display: inline-block;
         width: 5px;
         height: $list-lineheight * 1rem;
-        background-color: $primary;
+        background-color: var(--primary);
         position: absolute;
         top: 50%;
         left: -.5rem;

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

@@ -84,7 +84,7 @@ $filters-padding-y: 1rem;
 
   .section-title{
     text-transform: uppercase;
-    color: $primary;
+    color: var(--primary);
     text-decoration: underline;
     margin-right: $global-margin;
   }

data/app/assets/stylesheets/decidim/modules/_horizontal-tabs.scss

@@ -18,9 +18,9 @@
         &:focus,
         &[aria-selected='true']{
           background: transparent;
-          color: $primary;
+          color: var(--primary);
           font-weight: 600;
-          border-bottom: 3px solid $primary;
+          border-bottom: 3px solid var(--primary);
         }
 
         &:hover{

data/app/assets/stylesheets/decidim/modules/_loading-spinner.scss

@@ -4,7 +4,7 @@
   text-align: center;
 
   &::before{
-    @include spinner(25px, $medium-gray, $primary, 800ms);
+    @include spinner(25px, $medium-gray, var(--primary), 800ms);
 
     content: "";
     vertical-align: middle;

data/app/assets/stylesheets/decidim/modules/_main-container.scss

@@ -66,7 +66,7 @@ $container-padding-2y: 2rem;
     &.is-active > [role=tab],
     &.is-active > a{
       color: $anchor-color;
-      box-shadow: inset 4px 0 0 $primary;
+      box-shadow: inset 4px 0 0 var(--primary);
     }
   }
 }

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

@@ -10,12 +10,12 @@
 }
 
 .map-info{
-  background: $primary;
+  background: var(--primary);
   border-radius: $global-radius;
 
   > div:first-child{ //Map styles container
     > div:first-child{ //Triangle
-      border-top-color: $primary !important;
+      border-top-color: var(--primary) !important;
     }
 
     > div:nth-child(2){
@@ -43,7 +43,7 @@
 
   .card__datetime{
     float: none;
-    border-color: $primary;
+    border-color: var(--primary);
     display: flex;
     flex-direction: column;
     justify-content: center;

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

@@ -6,8 +6,8 @@ $navbar-color: rgba(white, .5);
 $navbar-color-hover: $white;
 $navbar-active-color: $white;
 $navbar-active-bg: $navbar-bg-hover;
-$navbar-active-shadow-small: inset 4px 0 0 0 $primary;
-$navbar-active-shadow-medium: inset 0 4px 0 0 $primary;
+$navbar-active-shadow-small: inset 4px 0 0 0 var(--primary);
+$navbar-active-shadow-medium: inset 0 4px 0 0 var(--primary);
 
 /* Navigation */
 
@@ -170,7 +170,7 @@ $navbar-active-shadow-medium: inset 0 4px 0 0 $primary;
 
       &:hover{
         cursor: pointer;
-        background-color: rgba($secondary, .05);
+        background-color: rgba(var(--secondary), .05);
       }
     }
   }

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

@@ -1,5 +1,5 @@
 .omnipresent-banner{
-  background-color: $primary;
+  background-color: var(--primary);
   color: $white;
   text-align: center;
   padding: 1rem;

data/app/assets/stylesheets/decidim/modules/_order-by.scss

@@ -4,7 +4,7 @@ $order-border: $border;
 /* Order by styles */
 .order-by{
   margin-bottom: 1rem;
-  display: inline-flex;
+  display: flex;
   align-items: baseline;
   flex-wrap: wrap;
 

data/app/assets/stylesheets/decidim/modules/_process-header.scss

@@ -1,5 +1,5 @@
 .process-header{
-  background-image: linear-gradient(to right, rgba($black, .8) 50%, $primary 50%);
+  background-image: linear-gradient(to right, rgba($black, .8) 50%, var(--primary) 50%);
 
   .heading2{
     font-weight: bold;

data/app/assets/stylesheets/decidim/modules/_process-nav.scss

@@ -84,7 +84,7 @@ $nav-border-width: 3px;
   }
 
   &.is-active{
-    box-shadow: inset 0 (-1 * ($nav-border-width + 1px)) 0 0 $primary;
+    box-shadow: inset 0 (-1 * ($nav-border-width + 1px)) 0 0 var(--primary);
 
     @include breakpoint(smallmedium down){
       display: none;
@@ -94,8 +94,8 @@ $nav-border-width: 3px;
 
 .process-nav__more{
   margin: 0;
-  color: $primary;
-  background-color: rgba($primary, .1);
+  color: var(--primary);
+  background-color: rgba(var(--primary), .1);
   text-transform: uppercase;
   font-weight: $global-weight-bold;
   font-size: rem-calc(14);
@@ -104,7 +104,7 @@ $nav-border-width: 3px;
     @include square(5px);
 
     border-radius: 100%;
-    background-color: $primary;
+    background-color: var(--primary);
     display: inline-block;
     vertical-align: middle;
     margin-bottom: .1rem;
@@ -140,7 +140,7 @@ $nav-border-width: 3px;
 }
 
 .process-nav__link{
-  color: $primary;
+  color: var(--primary);
   text-transform: uppercase;
   font-weight: $global-weight-bold;
   display: flex;
@@ -166,13 +166,13 @@ $nav-border-width: 3px;
 
 @include breakpoint(medium){
   .process-nav__link.is-active{
-    color: $primary;
+    color: var(--primary);
 
     svg{
-      fill: $primary;
+      fill: var(--primary);
 
       .stroked-shape{
-        stroke: $primary;
+        stroke: var(--primary);
       }
     }
   }

data/app/assets/stylesheets/decidim/modules/_process-phase.scss

@@ -88,11 +88,11 @@
 
   .phase-item--past{
     &::after{
-      background-color: $primary;
+      background-color: var(--primary);
     }
 
     span{
-      background-color: $primary;
+      background-color: var(--primary);
       opacity: 1;
     }
   }
@@ -105,7 +105,7 @@
       position: absolute;
       width: 0;
       border: 4px solid transparent;
-      border-top-color: $primary;
+      border-top-color: var(--primary);
       top: -8px;
       left: calc(50% - 1px);
       z-index: 2;
@@ -156,7 +156,7 @@
 
 .process-header__button{
   .button{
-    border-color: $primary;
+    border-color: var(--primary);
     text-transform: uppercase;
   }
 }

data/app/assets/stylesheets/decidim/modules/_status-labels.scss

@@ -3,11 +3,11 @@
 }
 
 .label--highlight{
-  background-color: $secondary;
+  background-color: var(--secondary);
 }
 
 .label--admin{
-  background-color: $primary;
+  background-color: var(--primary);
 }
 
 .proposal-status,

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

@@ -1,7 +1,7 @@
 
 /* Variables */
 
-$timeline-color: $primary;
+$timeline-color: var(--primary);
 $timeline-inactive-color: $medium-gray;
 
 $timeline-padding: 1rem;

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

@@ -83,7 +83,7 @@ hr{
     display: inline-block;
     width: 4px;
     height: .8em;
-    background-color: $primary;
+    background-color: var(--primary);
     margin-right: .5rem;
     margin-bottom: -.1rem;
   }
@@ -133,7 +133,7 @@ hr{
     color: inherit;
 
     &:hover{
-      color: $primary;
+      color: var(--primary);
     }
   }
 }

data/app/assets/stylesheets/decidim/modules/_wizard-steps.scss

@@ -8,8 +8,8 @@
 
   li{
     border: none;
-    color: $primary;
-    border-left: 2px solid $primary;
+    color: var(--primary);
+    border-left: 2px solid var(--primary);
     box-sizing: border-box;
     border-radius: 0;
     padding: 1rem 0;
@@ -19,7 +19,7 @@
 
   li::before{
     border-radius: 50%;
-    background-color: $primary;
+    background-color: var(--primary);
     content: "";
     display: inline-block;
     float: left;

data/app/assets/stylesheets/decidim/utils/_mixins.scss

@@ -41,7 +41,13 @@
 }
 
 // Status modifier mixin
-$palette: $foundation-palette;
+$palette: (
+  primary: var(--primary),
+  secondary: var(--secondary),
+  success: var(--success),
+  warning: var(--warning),
+  alert: var(--alert),
+);
 
 @mixin modifiers($vars, $colors: $palette){
   $map: map-merge($palette, $colors);

data/app/assets/stylesheets/decidim/vizzs/_areachart.scss

@@ -13,17 +13,17 @@
   }
 
   .area{
-    fill: rgba($primary, .05);
+    fill: rgba(var(--primary), .05);
   }
 
   .line{
     fill: none;
-    stroke: rgba($primary, .2);
+    stroke: rgba(var(--primary), .2);
     stroke-width: 4px;
   }
 
   .circle{
-    fill: rgba($primary, .2);
+    fill: rgba(var(--primary), .2);
   }
 
   .tick{
@@ -62,10 +62,6 @@
   &.small{
     .sum{
       font-size: rem-calc(map-get(map-get(map-get($header-styles, medium), 'h3'), 'font-size'));
-
-      @include breakpoint(medium down){
-        font-size: rem-calc(map-get(map-get(map-get($header-styles, medium), 'h1'), 'font-size')) * 1.5;
-      }
     }
   }
 }

data/app/cells/decidim/activities_cell.rb

@@ -8,8 +8,6 @@ module Decidim
     include Decidim::IconHelper
     include Decidim::Core::Engine.routes.url_helpers
 
-    delegate :current_organization, to: :controller
-
     # Since we're rendering each activity separatedly we need to trigger
     # BatchLoader in order to accumulate all the ids to be found later.
     def show

data/app/cells/decidim/card_m_cell.rb

@@ -97,13 +97,15 @@ module Decidim
     end
 
     def comments_count
+      return model.comments.not_hidden.count if model.comments.respond_to? :not_hidden
+
       model.comments.count
     end
 
     def statuses
       collection = [:creation_date]
       collection << :follow if model.is_a?(Decidim::Followable) && model != try(:current_user)
-      collection << :comments_count if model.is_a?(Decidim::Comments::Commentable)
+      collection << :comments_count if model.is_a?(Decidim::Comments::Commentable) && model.commentable?
       collection
     end
 

data/app/cells/decidim/content_blocks/footer_sub_hero_cell.rb

@@ -5,7 +5,6 @@ module Decidim
     class FooterSubHeroCell < Decidim::ViewModel
       include Decidim::IconHelper
 
-      delegate :current_organization, to: :controller
       delegate :current_user, to: :controller
     end
   end

data/app/cells/decidim/content_blocks/hero_cell.rb

@@ -6,8 +6,6 @@ module Decidim
       include Decidim::CtaButtonHelper
       include Decidim::SanitizeHelper
 
-      delegate :current_organization, to: :controller
-
       # Needed so that the `CtaButtonHelper` can work.
       def decidim_participatory_processes
         Decidim::ParticipatoryProcesses::Engine.routes.url_helpers

data/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb

@@ -9,8 +9,6 @@ module Decidim
         return unless current_organization.highlighted_content_banner_enabled
         render
       end
-
-      delegate :current_organization, to: :controller
     end
   end
 end