decidim-core 0.15.2 → 0.16.0

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

@@ -1,11 +1,9 @@
-/* Variables */
-
-/* Navigation */
+$nav-border-width: 3px;
 
 .process-nav{
   background-color: $white;
-  border: $border;
   padding: .75rem $container-padding-y;
+  box-shadow: inset 0 (-1 * $nav-border-width) 0 0 $medium-gray;
 
   ul{
     margin: 0;
@@ -17,7 +15,7 @@
   }
 
   @include breakpoint(medium){
-    padding: .25rem;
+    padding: 0;
 
     ul{
       overflow-x: auto;
@@ -27,6 +25,7 @@
       align-items: center;
       flex-wrap: wrap;
       justify-content: space-between;
+      flex-grow: 1;
     }
 
     ul::-webkit-scrollbar{
@@ -41,7 +40,7 @@
 
     li{
       display: inline-block;
-      margin: .5rem .75rem;
+      padding: .5rem .75rem .75rem + rem-calc($nav-border-width - 1px);
     }
 
     .about-link{
@@ -65,7 +64,7 @@
   top: .55rem;
 }
 
-.js .process-nav__content{
+.process-nav__content{
   @include breakpoint(smallmedium down){
     display: none;
   }
@@ -73,6 +72,10 @@
   &.is-active{
     display: block;
   }
+
+  display: flex;
+  justify-content: space-between;
+  align-items: baseline;
 }
 
 .process-nav__content li{
@@ -81,16 +84,65 @@
   }
 
   &.is-active{
+    box-shadow: inset 0 (-1 * ($nav-border-width + 1px)) 0 0 $primary;
+
     @include breakpoint(smallmedium down){
       display: none;
     }
   }
 }
 
+.process-nav__more{
+  margin: 0;
+  color: $primary;
+  background-color: rgba($primary, .1);
+  text-transform: uppercase;
+  font-weight: $global-weight-bold;
+  font-size: rem-calc(14);
+
+  i{
+    @include square(5px);
+
+    border-radius: 100%;
+    background-color: $primary;
+    display: inline-block;
+    vertical-align: middle;
+    margin-bottom: .1rem;
+
+    &:not(:last-child){
+      margin-right: .1rem;
+    }
+  }
+}
+
+.process-nav__hidden-content{
+  background-color: $white;
+  box-shadow: 0 0 4px 0 rgba($black, .08);
+  padding: 0;
+
+  ul{
+    padding: $global-padding / 2 0;
+  }
+
+  li{
+    width: 100%;
+    padding: $global-padding / 2 $global-padding;
+  }
+}
+
+.process-nav__hidden-content__more{
+  @extend .process-nav__more;
+
+  background-color: transparent;
+  text-align: right;
+  border-bottom: $border;
+  padding: $global-padding / 2 $global-padding;
+}
+
 .process-nav__link{
-  color: $muted;
+  color: $primary;
   text-transform: uppercase;
-  font-weight: 600;
+  font-weight: $global-weight-bold;
   display: flex;
   align-items: center;
 
@@ -113,7 +165,6 @@
 }
 
 @include breakpoint(medium){
-  .process-nav__link:hover,
   .process-nav__link.is-active{
     color: $primary;
 

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

@@ -1,15 +1,34 @@
+.process-header__phase{
+  background: $white;
+  padding: $global-padding;
+  margin: $global-margin 0;
+  border-radius: $global-radius;
+
+  .button{
+    margin-top: $global-margin * .75;
+    margin-bottom: 0;
+    font-weight: $global-weight-normal;
+  }
+}
+
+.process-header__phase--simple{
+  padding: .5rem 1rem;
+
+  @include breakpoint (medium){
+    padding: 2rem 1rem;
+  }
+}
+
 .phase-title{
   display: block;
-  font-weight: 600;
+  font-weight: $global-weight-bold;
   font-size: 1rem;
+  line-height: 1;
 
   @include breakpoint(medium){
-    font-size: 1.1rem;
+    font-size: rem-calc(20);
   }
 
-  line-height: 1;
-  text-transform: uppercase;
-
   .is-inactive &{
     color: $muted;
   }
@@ -22,55 +41,48 @@
 }
 
 .process-header__progress{
-  margin-bottom: 1rem;
+  margin-bottom: $global-margin / 2;
 
   ol{
     list-style: none;
     margin: 0;
     padding: 0;
     display: flex;
-    justify-content: space-between;
+    justify-content: flex-start;
   }
 
   li{
     margin: 0;
     padding: 0;
     position: relative;
-    width: 100%;
+    width: 1rem;
     text-align: center;
 
+    &:first-child{
+      width: auto;
+    }
+
     &::after{
+      $line-thickness: 2px;
+
       content: "";
       display: block;
-      height: 2px;
+      height: $line-thickness;
       width: 100%;
-      background-color: $muted;
+      background-color: $medium-gray;
       position: absolute;
-      top: 4px;
+      top: calc(50% - (#{$line-thickness} / 2));
       z-index: 0;
     }
 
     span{
       display: block;
-      width: 10px;
-      height: 10px;
+      width: 9px;
+      height: 9px;
       border-radius: 50%;
-      background-color: $muted;
-      margin: auto;
+      background-color: $medium-gray;
       z-index: 1;
-    }
-  }
-  //Between 11 and 20 elements
-  li:nth-last-child(n+11):nth-last-child(-n+20):first-child,
-  li:nth-last-child(n+11):nth-last-child(-n+20):first-child ~ li{
-    span{
-      width: 5px;
-      height: 5px;
-    }
-
-    &::after{
-      height: 1px;
-      top: 2px;
+      margin-left: auto;
     }
   }
 
@@ -84,11 +96,32 @@
       opacity: 1;
     }
   }
+
+  // arrow
+  .phase-item--current{
+    span::before{
+      content: ' ';
+      height: 0;
+      position: absolute;
+      width: 0;
+      border: 4px solid transparent;
+      border-top-color: $primary;
+      top: -8px;
+      left: calc(50% - 1px);
+      z-index: 2;
+    }
+
+    &:first-child span::before{
+      left: 0;
+    }
+  }
 }
 
 .phase-current{
-  font-weight: 600;
-  font-size: 90%;
+  font-weight: $global-weight-normal;
+  font-size: rem-calc(12);
+  text-transform: uppercase;
+  color: $muted;
 }
 
 .process-phase{

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

@@ -28,3 +28,7 @@ $share-color: $muted;
   padding: .1em 0 0;
   margin-right: .5em;
 }
+
+.share-link.calendar{
+  float: right;
+}

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

@@ -23,6 +23,15 @@ input{
   line-height: 1.1;
 }
 
+.subheading1{
+  text-align: center;
+  font-size: 1.25rem;
+  margin: 0 auto;
+  max-width: 600px;
+  padding-bottom: 2rem;
+  margin-top: -3rem;
+}
+
 .heading2{
   @include heading(h2);
 }
@@ -82,6 +91,10 @@ hr{
   &.collapse{
     margin: 0;
   }
+
+  span{
+    font-weight: normal;
+  }
 }
 
 .mini-title{
@@ -132,6 +145,10 @@ $map: map-merge($foundation-palette, (muted: $muted));
   .text-#{$key}{
     color: $value;
   }
+
+  .bg-#{$key}{
+    background-color: lighten($value, 30);
+  }
 }
 
 .text-large{

data/app/assets/stylesheets/decidim/{modules → vizzs}/_orgchart.scss

@@ -1,17 +1,9 @@
 .orgchart{
   // Colors
-  $bg-color: $white;
-  $dot-color: $medium-gray;
-
-  // Dimensions
-  $dot-size: rem-calc(2px);
-  $dot-space: rem-calc(10px);
-
-  background: linear-gradient(90deg, $bg-color ($dot-space - $dot-size), transparent 1%) center, linear-gradient($bg-color ($dot-space - $dot-size), transparent 1%) center, $dot-color;
-  background-size: $dot-space $dot-space;
+  $bg-color: $light-gray-dark;
 
   // Other vars
-  $stroke-width: 1px;
+  $stroke-width: 3px;
   $stroke-color: $medium-gray;
 
   .as-card{

data/app/cells/decidim/activities_cell.rb

@@ -26,9 +26,13 @@ module Decidim
     end
 
     def activity_cell_for(activity)
-      cell "#{activity.resource_type.constantize.name.underscore}_activity", activity
+      options = {
+        show_author: (context[:user] != activity.user)
+      }
+
+      cell "#{activity.resource_type.constantize.name.underscore}_activity", activity, context: options
     rescue NameError
-      cell "decidim/activity", activity
+      cell "decidim/activity", activity, context: options
     end
 
     def activities

data/app/cells/decidim/activity/show.erb

@@ -1,21 +1,24 @@
-<article class="card">
-  <div class="card__content">
-    <% if title.present? %>
-      <div class="card__text">
-        <div class="text-medium">
-          <span class="icon--container">
-            <%= resource_icon resource, class: "primary" %>&nbsp;
-            <%= title %>
-          </span>
-        </div>
+<article class="card card--widget">
+  <ul class="card-data">
+    <li class="card-data__item">
+      <div class="card__link text-center">
+        <%= resource_icon resource, class: "icon--large" %>
+        <span class="text-medium mt-xs"><%= created_at %></span>
       </div>
-    <% end %>
-    <div class="card__header mb-none">
-      <%= link_to resource_link_path, class: "card__link" do %>
-        <h5 class="card__title mb-none">
-          <%= html_truncate resource_link_text, length: 100 %>
-        </h5>
-      <% end %>
-    </div>
-  </div>
+    </li>
+    <li class="card-data__item card-data__item--expand">
+      <div>
+        <%= author %>
+        <% if title.present? %>
+          <span class="text-small"><%= title %></span>
+        <% end %>
+        <%= link_to resource_link_path, class: "card__link" do %>
+          <h5 class="card__title mb-none">
+            <%= html_truncate resource_link_text, length: 100 %>
+          </h5>
+        <% end %>
+        <%= description %>
+      </div>
+    </li>
+  </ul>
 </article>

data/app/cells/decidim/activity_cell.rb

@@ -31,15 +31,32 @@ module Decidim
     #
     # The card will also be displayed OK if there's no title.
     def title
-      return unless resource.respond_to?(:title)
+      resource_title = resource.try(:resource_title) || resource.try(:title)
+      return if resource_title.blank?
 
-      if resource.title.is_a?(String)
-        resource.title
-      elsif resource.title.is_a?(Hash)
-        translated_attribute(resource.title)
+      if resource_title.is_a?(String)
+        resource_title
+      elsif resource_title.is_a?(Hash)
+        translated_attribute(resource_title)
       end
     end
 
+    # The description to show at the card.
+    #
+    # The card will also be displayed OK if there's no description.
+    def description
+      resource_description = resource.try(:resource_description) || resource.try(:description)
+      return if resource_description.blank?
+
+      resource_description = if resource_description.is_a?(String)
+                               resource_description
+                             elsif resource_description.is_a?(Hash)
+                               translated_attribute(resource_description)
+                             end
+
+      truncate(strip_tags(resource_description), length: 300)
+    end
+
     # The link to the resource linked to the activity.
     def resource_link_path
       resource_locator(resource).path
@@ -50,6 +67,10 @@ module Decidim
       translated_attribute(resource.title)
     end
 
+    def created_at
+      I18n.l(model.created_at, format: :short)
+    end
+
     private
 
     def published?
@@ -69,6 +90,11 @@ module Decidim
       model.user_lazy
     end
 
+    def author
+      return unless show_author? && user.is_a?(UserBaseEntity)
+      cell "decidim/author", UserPresenter.new(user)
+    end
+
     def participatory_space
       return resource if resource.is_a?(Decidim::Participable)
 
@@ -81,5 +107,9 @@ module Decidim
         resource_locator(participatory_space).path
       )
     end
+
+    def show_author?
+      context[:show_author]
+    end
   end
 end