decidim-core 0.26.10 → 0.27.0.rc1

data/app/packs/stylesheets/decidim/modules/_buttons.scss

@@ -123,10 +123,6 @@
     }
   }
 
-  &.primary{
-    @include button-hollow-variant(var(--primary));
-  }
-
   &.secondary{
     @include button-hollow-variant(var(--secondary));
   }
@@ -261,12 +257,12 @@
 
 .button--shadow{
   $shadows: (
-    primary: shade($primary, 50%),
-    secondary: shade($secondary, 50%),
-    success: shade($success, 50%),
-    warning: shade($warning, 50%),
-    alert: shade($alert, 50%),
-    muted: shade($muted, 50%),
+    primary: shade($primary, 50),
+    secondary: shade($secondary, 50),
+    success: shade($success, 50),
+    warning: shade($warning, 50),
+    alert: shade($alert, 50),
+    muted: shade($muted, 50),
   );
 
   @include modifiers(background-color, $shadows){

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

@@ -30,8 +30,6 @@ $datetime-bg: var(--primary);
   border-radius: $card-border-radius;
   // Keep visible for accessibility (active/focused card as a link)
   overflow: visible;
-  overflow-wrap: break-word;
-  hyphens: auto;
 
   @include modifiers(
     border-top-color,
@@ -934,7 +932,7 @@ a .card__title{
   @include modifiers(
     color,
     (
-      muted: tint($muted, 50%),
+      muted: tint($muted, 50),
     )
   ){
     margin-top: -$global-margin * .95;

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

@@ -17,30 +17,6 @@ $comment-form-bg: $light-gray;
 
 .comment-thread{
   @extend .card;
-
-  .show-comment-replies{
-    display: none;
-  }
-
-  .hide-comment-replies{
-    display: inline;
-  }
-
-  .comment__hide{
-    float: left;
-    margin-bottom: 0;
-  }
-
-  .no-comments{
-    .show-comment-replies{
-      display: inline;
-    }
-
-    .hide-comment-replies,
-    .replies{
-      display: none;
-    }
-  }
 }
 
 .comment-thread__title{
@@ -104,8 +80,6 @@ $comment-form-bg: $light-gray;
 
 .comment__content{
   padding: 0 $comment-padding;
-  overflow-wrap: break-word;
-  hyphens: auto;
 
   > :last-child{
     margin-bottom: 0;

data/app/packs/stylesheets/decidim/modules/_cookie-consent.scss

@@ -0,0 +1,115 @@
+#cc-dialog-wrapper{
+  z-index: 1000000;
+
+  .cc-dialog{
+    position: fixed;
+    background-color: $white;
+    bottom: 0;
+    width: 100%;
+
+    @include breakpoint(large){
+      width: unset;
+    }
+
+    .cc-button-wrapper{
+      flex-direction: column;
+      margin: 1rem 0;
+
+      > *{
+        width: 100%;
+        margin: .5rem 0;
+      }
+
+      @include breakpoint(medium){
+        flex-direction: row;
+
+        > *{
+          width: unset;
+          margin: 0 1rem;
+        }
+      }
+
+      @include breakpoint(large){
+        justify-content: flex-end;
+      }
+    }
+  }
+}
+
+#cc-modal{
+  background-color: $white;
+
+  .category-wrapper{
+    background-color: $light-gray;
+    padding: .2rem;
+
+    .category-row{
+      position: relative;
+      justify-content: space-between;
+
+      .cc-title{
+        &::before{
+          border: solid #2d4156;
+          border-width: 0 2px 2px 0;
+          padding: .2em;
+          display: inline-block;
+          content: '';
+          margin-right: 15px;
+          position: absolute;
+          left: 1.2em;
+          top: 50%;
+          transform: translateY(-50%) rotate(45deg);
+        }
+
+        &.open{
+          &::before{
+            transform: translateY(-50%) rotate(225deg);
+          }
+        }
+      }
+
+      .cc-switch{
+        padding: .5rem 0 0;
+      }
+    }
+
+    .cookie-details-wrapper{
+      .detail-titles{
+        border-bottom: 1px solid $medium-gray;
+
+        > *{
+          font-weight: 600;
+        }
+      }
+
+      .cookie-detail-row{
+        font-size: .6rem;
+      }
+    }
+  }
+
+  .cc-buttons-wrapper{
+    justify-content: space-between;
+  }
+}
+
+.disabled-iframe{
+  background-color: $light-gray;
+  border: 1px solid $medium-gray;
+  cursor: auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  max-height: 20rem;
+
+  &.ql-video{
+    display: flex;
+  }
+}
+
+.cookie-warning{
+  flex-direction: column;
+  font-size: 2rem;
+  font-weight: $global-weight-bold;
+}

data/app/packs/stylesheets/decidim/modules/_footer.scss

@@ -7,6 +7,10 @@ $footer-bg: $black;
 .mini-footer{
   color: $medium-gray;
 
+  .link-separator{
+    margin: 0 .5rem;
+  }
+
   a{
     color: darken($medium-gray, 40%);
 

data/app/packs/stylesheets/decidim/modules/_forms.scss

@@ -77,11 +77,6 @@ label > [type="radio"]{
     margin-right: 1rem;
     flex-shrink: 0;
   }
-
-  &,
-  &.tiny{
-    height: auto;
-  }
 }
 
 .switch{

data/app/packs/stylesheets/decidim/modules/_input-multiple-mentions.scss

@@ -1,5 +1,32 @@
 @import "tributejs/tribute";
 
-input.js-multiple-mentions.mentions__container::placeholder{
-  color: $input-multiple-placeholder-color;
+.multiple-mentions{
+  input::placeholder{
+    color: $input-multiple-placeholder-color;
+  }
+}
+
+.multiple-mentions-selected{
+  font-size: 1.3rem;
+  line-height: 1.8;
+  list-style: none;
+  margin: 1rem 0 0;
+
+  button{
+    cursor: pointer;
+  }
+
+  img{
+    &.author__avatar{
+      display: inline-block;
+      padding: 0;
+      border-radius: 50%;
+      width: 35px;
+      height: 35px;
+    }
+  }
+
+  li b{
+    font-size: .875rem;
+  }
 }

data/app/packs/stylesheets/decidim/modules/_modules.scss

@@ -53,6 +53,7 @@
 @import "stylesheets/decidim/modules/sticky";
 @import "stylesheets/decidim/modules/notification";
 @import "stylesheets/decidim/modules/statistics";
+@import "stylesheets/decidim/modules/autocomplete";
 
 //Process elements
 @import "stylesheets/decidim/modules/process-header";
@@ -81,7 +82,7 @@
 //Additional elements
 @import "stylesheets/decidim/modules/share";
 @import "stylesheets/decidim/modules/help";
-@import "stylesheets/decidim/modules/cookie-bar";
+@import "stylesheets/decidim/modules/cookie-consent";
 @import "stylesheets/decidim/modules/map";
 @import "stylesheets/decidim/modules/omnipresent_banner";
 @import "stylesheets/decidim/modules/wizard-steps";
@@ -90,3 +91,4 @@
 @import "stylesheets/decidim/modules/fingerprint";
 @import "stylesheets/decidim/modules/toggle";
 @import "stylesheets/decidim/modules/loading-spinner";
+@import "stylesheets/decidim/modules/upload_modal";

data/app/packs/stylesheets/decidim/modules/_reveal.scss

@@ -19,6 +19,21 @@
   }
 }
 
+.reveal{
+  .calendar-url-description{
+    margin-bottom: .5rem;
+  }
+
+  .calendar_url_input{
+    margin-top: 1rem;
+  }
+
+  #urlCalendarUrl{
+    // Prevent the "not-allowed" cursor in the share input.
+    cursor: auto;
+  }
+}
+
 .reveal__footer{
   border-top: $border;
 

data/app/packs/stylesheets/decidim/modules/_upload_modal.scss

@@ -0,0 +1,143 @@
+@import "stylesheets/decidim/variables";
+
+.upload-modal{
+  .button{
+    margin: 0;
+  }
+
+  .dropzone-container{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin-bottom: 1rem;
+
+    input[type="file"]{
+      display: none;
+    }
+
+    label{
+      background-color: $white;
+      margin: 1rem 0;
+      cursor: pointer;
+
+      &.is-dragover{
+        background-color: lighten($secondary, 50);
+      }
+
+      &.dropzone{
+        padding: 1rem;
+        text-align: center;
+        border-style: dashed;
+        border-color: $secondary;
+        border-width: 2px;
+        border-radius: 4px;
+
+        * >{
+          display: none;
+        }
+
+        .form-error{
+          margin: 0;
+        }
+      }
+
+      &.disabled{
+        background-color: $light-gray;
+        cursor: not-allowed;
+        border-color: lighten($secondary, 50);
+
+        span{
+          color: #ccc;
+        }
+      }
+    }
+  }
+
+  .upload-items{
+    .upload-item{
+      input[type="text"]{
+        margin: 0;
+      }
+
+      .file-name-span{
+        overflow: hidden;
+      }
+
+      .progress-bar-wrapper{
+        .progress-bar-border{
+          height: 2rem;
+          border: 1px solid $primary;
+          box-sizing: border-box;
+          padding: 0;
+
+          .progress-bar{
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+            color: white;
+            background-color: $primary;
+            padding: 0 .5rem;
+            height: 2rem;
+
+            &.filled{
+              justify-content: center;
+              width: 100% !important;
+            }
+          }
+        }
+      }
+    }
+
+    .remove-upload-item{
+      cursor: pointer;
+    }
+
+    .upload-errors{
+      .form-error{
+        margin: 0;
+      }
+    }
+  }
+}
+
+.dynamic-uploads{
+  display: flex;
+  flex-direction: column;
+
+  @include breakpoint(large down){
+    margin-bottom: .5rem;
+  }
+
+  .actions-wrapper{
+    display: flex;
+    justify-content: flex-start;
+    align-items: baseline;
+
+    button.primary{
+      margin-right: .5rem;
+    }
+
+    button.remove-upload{
+      cursor: pointer;
+    }
+
+    &.titled{
+      flex-direction: column-reverse;
+    }
+
+    .active-uploads{
+      span.filename{
+        margin-right: .5rem;
+      }
+
+      span:last-child{
+        margin-right: .5rem;
+      }
+    }
+  }
+
+  &.with-title{
+    display: block;
+    margin: 0;
+  }
+}

data/app/packs/stylesheets/decidim/utils/_fontface.scss

@@ -2,6 +2,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
+  font-display: swap;
   src:
     url('fonts/decidim/Source_Sans_Pro_400.woff2') format('woff2'),
     url('fonts/decidim/Source_Sans_Pro_400.woff') format('woff'),
@@ -12,6 +13,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 600;
+  font-display: swap;
   src:
     url('fonts/decidim/Source_Sans_Pro_600.woff2') format('woff2'),
     url('fonts/decidim/Source_Sans_Pro_600.woff') format('woff'),
@@ -22,6 +24,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 900;
+  font-display: swap;
   src:
     url('fonts/decidim/Source_Sans_Pro_900.woff2') format('woff2'),
     url('fonts/decidim/Source_Sans_Pro_900.woff') format('woff'),

data/app/packs/stylesheets/decidim/vizzs/_linechart.scss

@@ -36,8 +36,8 @@
   @mixin loop-colors-types($color, $max: 12){
     @for $i from 0 through ($max - 1){
       $interval: ($i % 4) * 24 + 1;
-      $tints: tint($color, $interval * 1%);
-      $shades: shade($color, $interval * 1%);
+      $tints: tint($color, $interval);
+      $shades: shade($color, $interval);
       $adjusts: adjust-color($color, $lightness: $interval * 1%, $hue: -$interval);
 
       .type-#{$i}:not(.legend){

data/app/packs/stylesheets/decidim/vizzs/_rowchart.scss

@@ -27,8 +27,8 @@
   @mixin loop-colors-types($color, $max: 12){
     @for $i from 0 through ($max - 1){
       $interval: ($i % 4) * 24 + 1;
-      $tints: tint($color, $interval * 1%);
-      $shades: shade($color, $interval * 1%);
+      $tints: tint($color, $interval);
+      $shades: shade($color, $interval);
       $adjusts: adjust-color($color, $lightness: $interval * 1%, $hue: -$interval);
 
       .type-#{$i}{

data/app/permissions/decidim/permissions.rb

@@ -116,11 +116,9 @@ module Decidim
     end
 
     def apply_endorsement_permissions
-      is_allowed = current_settings.endorsements_enabled &&
-                   !current_settings.endorsements_blocked &&
-                   authorized?(:endorse, resource: context.fetch(:resource, nil))
+      return disallow! if !current_settings.endorsements_enabled || current_settings.endorsements_blocked
 
-      toggle_allow(is_allowed)
+      allow!
     end
 
     def notification_action?
@@ -150,7 +148,7 @@ module Decidim
       user_group = context.fetch(:user_group)
 
       if permission_action.action == :leave
-        user_can_leave_group = Decidim::UserGroupMembership.where(user: user, user_group: user_group).where.not(role: :creator).any?
+        user_can_leave_group = Decidim::UserGroupMembership.where(user: user, user_group: user_group).any?
         return toggle_allow(user_can_leave_group)
       end
 
@@ -164,9 +162,7 @@ module Decidim
 
     def user_can_preview_component?
       return allow! if context[:share_token].present? && Decidim::ShareToken.use!(token_for: component, token: context[:share_token])
-    rescue ActiveRecord::RecordNotFound
-      nil
-    rescue StandardError
+    rescue ActiveRecord::RecordNotFound, StandardError
       nil
     end
 

data/app/presenters/decidim/admin_log/area_type_presenter.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::AreaType`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    AreaTypePresenter.new(action_log, view_helpers).present
+    class AreaTypePresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          plural: :i18n
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.area_type.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/attachment_collection_presenter.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::AttachmentCollection`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    AttachmentCollectionPresenter.new(action_log, view_helpers).present
+    class AttachmentCollectionPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          description: :i18n,
+          weight: :integer
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.attachment_collection.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/attachment_presenter.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::Attachment`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    AttachmentPresenter.new(action_log, view_helpers).present
+    class AttachmentPresenter < Decidim::Log::BasePresenter
+      private
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.attachment.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/category_presenter.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::Category`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    CategoryPresenter.new(action_log, view_helpers).present
+    class CategoryPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          description: :i18n,
+          weight: :integer,
+          parent_id: :integer
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.category.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end