decidim-core 0.11.2 → 0.12.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c938b913ac377c051536707a486ad119a8e4a2cbaba41c72d77f1fd8968e8e6
-  data.tar.gz: f1ec6bd3fbbfa831db0262bbd08587371a4dae31b1feb2a0a24b051e0d56750c
+  metadata.gz: f084c611918e66b6c38487ff54a283e4324622e4dfc964671e91bf1d474cab79
+  data.tar.gz: 3d824e63e64d4798907b90857a2313bd99cfe80c039d5bc4cc3ae78b0756d095
 SHA512:
-  metadata.gz: 549042ceee9e335c2397281f41d7d5870e4b2bbaf678cf4af2c27ef311fcdbb592b83e72550b655ccaafa28951312088cf148e9bc8821d8fe810026ade60be64
-  data.tar.gz: 1a3ba897c5e23368b56bc63b765fbe2304abd9d756c3fab2db45f60db7352b401882ee18783adc3016f1d057e4cf9264edf9a5040601738f6aff466a33b028ae
+  metadata.gz: 160d7796c4b7ed57f0a733cf840dfec87d7651e942b84c55598e9710cdca77144b12f719398f10cb6420dd80709272b603d0bd0964901f8c524ab28245883b10
+  data.tar.gz: 39a9aa3a953ec79e58c53f06cebf3caccbbb3411ee3e0a0bcfa001acb79953cade3327c080c1ca23f1de48e9bb2b32e739cdf76ab403d3c1d787a90d35ee5ba9

data/app/assets/javascripts/decidim/notifications.js.es6

@@ -1,11 +1,12 @@
 $(() => {
-  const $wrapper = $("#notifications");
-  const $section = $wrapper.find("section#notifications-list");
-  const $noNotificationsText = $wrapper.find(".empty-notifications");
+  const $notificationsBellIcon = $(".title-bar .topbar__notifications");
+  const $wrapper = $(".tabs-content");
+  const $section = $wrapper.find("#notifications");
+  const $noNotificationsText = $(".empty-notifications");
   const $pagination = $wrapper.find("ul.pagination");
   const FADEOUT_TIME = 500;
 
-  const anyNotifications = () => $wrapper.find(".card--list__item").length > 0;
+  const anyNotifications = () => $wrapper.find(".card--widget").length > 0;
   const emptyNotifications = () => {
     if (!anyNotifications()) {
       $section.remove();
@@ -14,7 +15,7 @@ $(() => {
   };
 
   $section.on("click", ".mark-as-read-button", (event) => {
-    const $item = $(event.target).parents(".card--list__item");
+    const $item = $(event.target).parents(".card--widget");
     $item.fadeOut(FADEOUT_TIME, () => {
       $item.remove();
       emptyNotifications();
@@ -24,7 +25,8 @@ $(() => {
   $wrapper.on("click", ".mark-all-as-read-button", () => {
     $section.fadeOut(FADEOUT_TIME, () => {
       $pagination.remove();
-      $wrapper.find(".card--list__item").remove();
+      $notificationsBellIcon.removeClass("is-active");
+      $wrapper.find(".card--widget").remove();
       emptyNotifications();
     });
   });

data/app/assets/javascripts/decidim/user_registrations.js.es6

@@ -1,7 +1,10 @@
 $(() => {
-  const $userRegistrationForm = $(".register-form");
+  const $userRegistrationForm = $("#register-form");
   const $userGroupFields      = $userRegistrationForm.find(".user-group-fields");
   const inputSelector         = 'input[name="user[sign_up_as]"]';
+  const newsletterSelector    = 'input[type="checkbox"][name="user[newsletter]"]';
+  const $newsletterModal      = $("#sign-up-newsletter-modal");
+
 
   const setGroupFieldsVisibility = (value) => {
     if (value === "user") {
@@ -11,6 +14,13 @@ $(() => {
     }
   }
 
+  const checkNewsletter = (check) => {
+    $userRegistrationForm.find(newsletterSelector).prop("checked", check);
+    $newsletterModal.data("continue", true);
+    $newsletterModal.foundation("close");
+    $userRegistrationForm.submit();
+  }
+
   setGroupFieldsVisibility($userRegistrationForm.find(`${inputSelector}:checked`).val());
 
   $userRegistrationForm.on("change", inputSelector, (event) => {
@@ -18,4 +28,18 @@ $(() => {
 
     setGroupFieldsVisibility(value);
   });
+
+  $userRegistrationForm.on("submit", (event) => {
+    const newsletterChecked = $userRegistrationForm.find(newsletterSelector);
+    if (!$newsletterModal.data("continue")) {
+      if (!newsletterChecked.prop("checked")) {
+        event.preventDefault();
+        $newsletterModal.foundation("open");
+      }
+    }
+  });
+
+  $newsletterModal.find(".check-newsletter").on("click", (event) => {
+    checkNewsletter($(event.target).data("check"));
+  });
 });

data/app/assets/stylesheets/decidim/application.scss.erb

@@ -4,3 +4,7 @@
 <% Decidim.component_manifests.map(&:stylesheet).compact.each do |stylesheet| %>
 @import "<%= stylesheet %>";
 <% end %>
+
+<% Decidim.participatory_space_manifests.map(&:stylesheet).compact.each do |stylesheet| %>
+@import "<%= stylesheet %>";
+<% end %>

data/app/assets/stylesheets/decidim/layouts/_home.scss

@@ -35,6 +35,85 @@
   }
 }
 
+.hero__boxes{
+  text-align: center;
+  border-radius: 4px;
+  background-color: rgba($black, .5);
+  color: $white;
+  margin-top: 1rem;
+  padding: $global-padding;
+
+  @include breakpoint(medium){
+    text-align: left;
+    padding: 2rem 1.5rem;
+    margin-top: 2rem;
+  }
+
+  @include breakpoint(mediumlarge){
+    margin-top: 3rem;
+  }
+
+  @include breakpoint(large){
+    margin-top: 4rem;
+  }
+
+  p{
+    font-size: rem-calc(17);
+  }
+
+  .button{
+    display: block;
+    margin: 0 auto;
+  }
+
+  .box__search{
+    position: relative;
+    margin: 0 auto;
+
+    $color: rgba($body-font-color, .3);
+
+    input,
+    input:focus{
+      color: $body-font-color;
+      margin: 0;
+      box-shadow: none;
+      background: $white;
+
+      // NOTE: Input height same as button height
+      line-height: 1;
+      padding: $button-padding;
+      padding-left: $input-padding * 4;
+      height: auto;
+      border: 1px solid transparent;
+
+      &::-webkit-input-placeholder{ /* Chrome/Opera/Safari */
+        color: $color;
+      }
+
+      &::-moz-placeholder{ /* Firefox 19+ */
+        color: $color;
+      }
+
+      &:-ms-input-placeholder{ /* IE 10+ */
+        color: $color;
+      }
+
+      &:-moz-placeholder{ /* Firefox 18- */
+        color: $color;
+      }
+    }
+
+    svg{
+      color: $color;
+      position: absolute;
+      top: 50%;
+      left: $input-padding;
+      transform: translateY(-50%);
+      opacity: .5;
+    }
+  }
+}
+
 .hero-heading{
   margin-bottom: 1.5rem;
   font-size: 2rem;

data/app/assets/stylesheets/decidim/modules/_author-avatar.scss

@@ -8,7 +8,8 @@ $author-data-color: $muted;
 //Styles
 
 .author-data{
-  @include clearfix();
+  @include flex;
+  @include flex-align($x: left, $y: middle);
 
   color: $author-data-color;
   font-size: .9rem;

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

@@ -1,9 +1,10 @@
 /* Variables */
 
-$card-bg: $white;
+$card-bg: $white !default;
 $card-secondary-bg: $light-gray-dark;
 $card-border: $border;
 $card-border-radius: $global-radius;
+$card-border-top-width: 8px !default;
 $card-shadow: 0 2px 7px rgba(black, .1);
 $card-id: $medium-gray;
 
@@ -30,7 +31,7 @@ $datetime-bg: $primary;
   overflow: hidden;
 
   @include modifiers(border-top-color, (muted: rgba($muted, .3))){
-    border-top-width: 8px;
+    border-top-width: $card-border-top-width;
   }
 
   &:hover{
@@ -57,14 +58,6 @@ $datetime-bg: $primary;
   }
 }
 
-.card__content--multiple{
-  @extend .card__content;
-
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-}
-
 .card__content--center{
   text-align: center;
 }
@@ -93,6 +86,7 @@ $datetime-bg: $primary;
 
 .card__button{
   margin-bottom: 0;
+  cursor: pointer;
 }
 
 .card__type{
@@ -145,10 +139,24 @@ $datetime-bg: $primary;
   }
 }
 
+.card__text--separated-mid-dot{
+  @include inline-separator(' · ');
+}
+
 .card__image{
   width: 100%;
   max-height: 10rem;
+  min-height: 5rem;
   object-fit: cover;
+
+  &.card__image--smaller{
+    max-height: 5rem;
+  }
+
+  &.card__image--larger{
+    max-height: 20rem;
+    min-height: 10rem;
+  }
 }
 
 /* Card datetime */
@@ -274,6 +282,10 @@ $datetime-bg: $primary;
   .card-data__item--centerblock{
     margin: 0 auto;
   }
+
+  &.card-data__item--expand{
+    line-height: $global-lineheight;
+  }
 }
 
 .card-data__item__number{
@@ -285,6 +297,19 @@ $datetime-bg: $primary;
   margin-bottom: .2rem;
 }
 
+.card-data__item--multiple{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  @include flexgap(1rem);
+
+  > div{
+    text-align: left;
+    display: block;
+  }
+}
+
 /* Card popularity */
 
 .card__popularity{
@@ -706,9 +731,39 @@ $datetime-bg: $primary;
   font-size: $small-font-size;
   font-weight: bold;
   position: absolute;
-  background-color: $card-bg;
-  margin-top: -$global-margin * .75;
+  background-color: transparent;
+  text-shadow:
+    -1px -1px 0 $card-bg,
+    1px -1px 0 $card-bg,
+    -1px 1px 0 $card-bg,
+    1px 1px 0 $card-bg;
+  margin-top: ($global-margin * .6) * -1;
   margin-left: $card-padding-small;
+  z-index: 0;
+
+  &::before{
+    content: " ";
+    height: $border-width;
+    display: inline-block;
+    background: $card-bg;
+    position: absolute;
+    left: 0;
+    right: 0;
+    z-index: -1;
+    top: $global-margin * .5;
+  }
+
+  .card.success &,
+  .card.muted &,
+  .card.warning &,
+  .card.alert &{
+    margin-top: ($global-margin * .95) * -1;
+
+    &::before{
+      height: $card-border-top-width;
+      top: $global-margin * .45;
+    }
+  }
 
   .icon{
     // Reduces some icon space
@@ -827,40 +882,29 @@ $datetime-bg: $primary;
     .card-data__item{
       color: $body-font-color;
       text-transform: none;
+      font-size: rem-calc(16);
+      text-align: left;
+      padding: $card-padding-small;
 
-      strong{
-        display: block;
-        text-transform: uppercase;
-        font-size: rem-calc(16);
-
-        &:not(:first-child){
-          margin-top: $global-margin;
-        }
-      }
+      @include modifiers(color);
 
-      span{
-        color: $muted;
-        font-size: 90%;
+      @include breakpoint(medium){
+        padding: $card-padding;
       }
 
-      @include modifiers(color);
-
       &:first-child{
-        flex: 0;
+        flex-grow: 0;
+        flex-basis: 12%;
         background-color: $card-secondary-bg;
-      }
-    }
-  }
+        position: relative;
 
-  &.card--widget__list{
-    @extend .card--list;
+        > div{
+          display: flex;
+          flex-direction: column;
+          align-items: center;
 
-    .card--list__item{
-      padding-left: $global-padding;
-
-      > :first-child{
-        flex-grow: 0;
-        flex-shrink: 0;
+          @include absolute-center;
+        }
       }
     }
   }

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

@@ -10,6 +10,22 @@
         display: none;
       }
     }
+
+    .collapsible-list__see-more{
+      display: inline-block;
+    }
+
+    .collapsible-list__see-less{
+      display: none;
+    }
+  }
+
+  .collapsible-list__see-less{
+    display: inline-block;
+  }
+
+  .collapsible-list__see-more{
+    display: none;
   }
 
   > *{

data/app/assets/stylesheets/decidim/modules/_definition-data.scss

@@ -18,6 +18,33 @@
       display: block;
     }
   }
+
+  &.expanded{
+    display: flex;
+    justify-content: space-between;
+
+    > :first-child{
+      flex: 1 1 80%;
+      min-width: 0;
+
+      div{
+        display: inline;
+
+        @include ellipsis();
+
+        .author__name{
+          // Allow the ellipsis, otherwise it's not shown
+          display: inherit;
+        }
+      }
+    }
+
+    > :last-child{
+      flex: 1 0 40%;
+    }
+
+    @include flexgap(.5rem);
+  }
 }
 
 .definition-data__item--double{