decidim-core 0.0.1 → 0.0.2

data/app/assets/stylesheets/decidim/modules/_cookie-bar.scss

@@ -0,0 +1,22 @@
+.cookie-warning{
+  background: $medium-gray;
+  padding: .5em 1em;
+  text-align: center;
+  a{
+    color: darken($anchor-color, 10%);
+  }
+}
+
+.cookie-warning__action{
+  text-align: center;
+  .button{
+    margin: .5em 0;
+  }
+  @include breakpoint(mediumlarge){
+    vertical-align: baseline;
+    display: inline-block;
+    .button{
+      margin: 0 0 0 1em;
+    }
+  }
+}

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

@@ -17,6 +17,10 @@
 }
 
 //Flexbox sticky footer
+html{
+  height: 100%;
+}
+
 body{
   display: flex;
   flex-direction: column;
@@ -32,6 +36,10 @@ body{
 }
 
 //fixes for off-canvas wrappers
+.off-canvas-wrapper{
+  background-color: $white;
+}
+
 .off-canvas-wrapper,
 .off-canvas-wrapper-inner,
 .off-canvas-content{
@@ -55,4 +63,4 @@ body{
   @include breakpoint(large){
     margin-bottom: 5rem;
   }
-}
+}

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

@@ -39,7 +39,7 @@ $navbar-active-shadow-medium: inset 0 4px 0 0 $primary;
   @include breakpoint(medium){
     top: 50%;
     margin-top: -19px;
-    img{ 
+    img{
       height: 38px !important;
     }
   }
@@ -62,9 +62,9 @@ $navbar-active-shadow-medium: inset 0 4px 0 0 $primary;
   }
   img{
     display: block;
-    max-width: 100px;
+    max-height: 33px;
     @include breakpoint(mediumlarge){
-      max-width: 140px;
+      max-height: 45px;
     }
   }
 }
@@ -190,6 +190,9 @@ $navbar-active-shadow-medium: inset 0 4px 0 0 $primary;
   text-align: right;
   font-size: 20px;
   margin-right: .1rem;
+  button {
+    color: inherit;
+  }
 }
 
 .usermenu-off-canvas-holder .usermenu-off-canvas{
@@ -251,7 +254,7 @@ $navbar-active-shadow-medium: inset 0 4px 0 0 $primary;
     background: $navbar-bg-hover;
     color: $navbar-color-hover;
   }
-  
+
   @include breakpoint(medium){
     padding: .75em 2em;
   }
@@ -264,4 +267,4 @@ $navbar-active-shadow-medium: inset 0 4px 0 0 $primary;
    @include breakpoint(medium) {
     box-shadow: $navbar-active-shadow-medium;
   }
-}
+}

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

@@ -63,4 +63,3 @@ $order-border: $border;
     border-left: none;
   }
 }
-

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

@@ -1,3 +1,7 @@
+.wrapper.steps {
+  padding-top: 0;
+}
+
 .phase-title{
   display: block;
   font-weight: 600;

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

@@ -13,7 +13,6 @@ $timeline-padding: 1rem;
 .timeline {
 	list-style: none;
   margin: 2rem 0 0;
-	transition: all .4s ease;
 }
 
 .timeline__item {
@@ -27,9 +26,6 @@ $timeline-padding: 1rem;
 		left: 1rem;
 		top: 0;
 		position: absolute;
-    @include breakpoint(medium){
-      left: 50%;
-    }
 	}
 	&:after {
 		content: "";
@@ -56,9 +52,6 @@ $timeline-padding: 1rem;
   background: $timeline-color;
   border: 2px solid $white;
   box-shadow: 0 0 0 1px $medium-gray;
-  @include breakpoint(medium){
-    left: 50%;
-  }
 }
 
 .timeline__phase__number{
@@ -73,83 +66,90 @@ $timeline-padding: 1rem;
   margin-top: -1px;
 }
 
-.timeline__desc{
+.timeline__info{
   width: 90%;
   width: calc(100% - 45px);
   float: right;
-  padding: $timeline-padding/2 $timeline-padding 0;
-  border: 1px solid $timeline-color;
-  border-radius: $global-radius;
-  transition: all .3s ease;
-  transform: translateY(-.4rem);
-  @include breakpoint(medium){
-    width: 45%;
-    float: left;
-  }
-  &:before {
-    content: '';
-    position: absolute;
-    right: 100%;
-    top: .6rem;
-    width: 0;
-    height: 0;
-    border-top: 10px solid transparent;
-    border-bottom: 10px solid transparent;
-    border-right: 10px solid $timeline-color;
-    @include breakpoint(medium){
-      left: 100%;
-      border-right: 0;
-      border-left: 10px solid $timeline-color;
-    }
-  }
-  .timeline__item:nth-of-type(even) &{
-    float: right;
-    &:before{
-      content: '';
-      right: 100%;
-      left: inherit;
-      border-left: 0;
-      border-right: 10px solid $timeline-color;
-    }
+  background-color: $white;
+  border: $border;
+  .timeline__item--current &{
+    border-color: $timeline-color;
   }
 }
 
-.timeline__title{
-  display: block;
+.timeline__header{
+  background: $medium-gray;
   padding: $timeline-padding/2 $timeline-padding;
-  background: $timeline-color;
-  color: $white;
-  margin: (-$timeline-padding/2) (-$timeline-padding) 0 (-$timeline-padding);
-  &:hover,
-  &:active{
+  .timeline__item--current &{
+    background-color: $timeline-color;
     color: $white;
   }
-  > h6{
-    margin-bottom: 0;
+}
+
+.timeline__date{
+  color: $muted;
+  .timeline__item--current &{
+    color: rgba($white,.8);
   }
 }
 
-.timeline__title__icon{
-  margin-left: 3px;
-  vertical-align: middle;
+.timeline__title{
+  margin-bottom: 0;
 }
 
 .timeline__content{
-  display: none;
-  padding-top: $timeline-padding/2;
+  padding: $timeline-padding;
+  :last-child{
+    margin-bottom: 0;
+  }
 }
 
-/* Collapse styles */
+.timeline__footer{
+  list-style: none;
+  margin: 0;
+  border-top: $border;
+  @include breakpoint(medium){
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
 
-.timeline__desc.is-expanded{
-  .timeline__content{
-    display: block;
+.timeline__footer-item{
+  flex-grow: 1;
+  text-align: center;
+  padding: .5em;
+  border-bottom: $border;
+  &:last-child{
+    border-bottom: 0;
   }
-  .timeline__title__icon{
-    transform: rotate(180deg);
+  @include breakpoint(medium){
+    border-bottom: 0;
+    border-right: $border;
+    &:last-child{
+      border-right: 0;
+    }
   }
 }
 
+.timeline__footer-inner{
+  display: block;
+}
+
+.timeline__item-icon{
+  width: 1.5em;
+  height: 1.5em;
+}
+
+.timeline__item-text{
+  display: block;
+  text-transform: uppercase;
+  letter-spacing: 0.03em;
+  font-size: 90%;
+  color: $body-font-color;
+  font-weight: 600;
+  line-height: 1;
+}
+
 /* Inactive timeline */
 
 .timeline__item--current{
@@ -168,22 +168,4 @@ $timeline-padding: 1rem;
   .timeline__phase__number{
     text-shadow: 0 1px 2px rgba(black, 0.1);
   }
-  .timeline__desc{
-    border-color: $timeline-inactive-color;
-    &:before{
-      border-right-color: $timeline-inactive-color;
-      @include breakpoint(medium){
-        border-left-color: $timeline-inactive-color;
-      }
-    }
-  }
-  .timeline__title{
-    background: $timeline-inactive-color;
-    color: inherit;
-  }
-}
-.timeline__item:nth-of-type(even).timeline__item--inactive{
-  .timeline__desc:before{
-    border-right-color: $timeline-inactive-color;
-  }
 }

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

@@ -2,57 +2,46 @@
 
 
 /* Typography - Foundation overrides */
+button,
+input{
+  font-family: inherit;
+}
 
-.heading1{
-  line-height: 1.1;
-  font-weight: 600;
-  font-size: map-get(map-get($header-sizes, small), h1) / 16 + em;
+@mixin heading($heading) {
+  line-height: 1.2;
+  font-size: map-get(map-get(map-get($header-styles, small), $heading), 'font-size') / 16 + em;
   @include breakpoint(medium){
-    font-size: map-get(map-get($header-sizes, medium), h1) / 16 + em;
+    font-size: map-get(map-get(map-get($header-styles, medium), $heading), 'font-size') / 16 + em;
   }
 }
 
+.heading1{
+  font-weight: 600;
+  @include heading(h1);
+  line-height: 1.1;
+}
+
 .heading2{
-  line-height: 1.2;
-  //font-weight: 600;
-  font-size: map-get(map-get($header-sizes, small), h2) / 16 + em;
-  @include breakpoint(medium){
-    font-size: map-get(map-get($header-sizes, medium), h2) / 16 + em;
-  }
+  @include heading(h2);
 }
 
 .heading3{
-  line-height: 1.2;
-  font-size: map-get(map-get($header-sizes, small), h3) / 16 + em;
-  @include breakpoint(medium){
-    font-size: map-get(map-get($header-sizes, medium), h3) / 16 + em;
-  }
+  @include heading(h3);
 }
 
 .heading4{
-  line-height: 1.2;
-  font-size: map-get(map-get($header-sizes, small), h4) / 16 + em;
-  @include breakpoint(medium){
-    font-size: map-get(map-get($header-sizes, medium), h4) / 16 + em;
-  }
+  @include heading(h4);
 }
 
 .heading5{
-  line-height: 1.2;
-  font-size: map-get(map-get($header-sizes, small), h5) / 16 + em;
-  @include breakpoint(medium){
-    font-size: map-get(map-get($header-sizes, medium), h5) / 16 + em;
-  }
+  @include heading(h5);
 }
 
 .heading6{
   text-transform: uppercase;
   letter-spacing: .03em;
   font-weight: 600;
-  font-size: map-get(map-get($header-sizes, small), h6) / 16 + em;
-  @include breakpoint(medium){
-    font-size: map-get(map-get($header-sizes, medium), h6) / 16 + em;
-  }
+  @include heading(h6);
 }
 
 .heading-small{
@@ -113,4 +102,4 @@ hr{
 
 .word-wrapper{
   display: inline-block;
-}
+}

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

@@ -3,12 +3,8 @@
 	font-style: normal;
 	font-weight: 400;
 	src:
-		local('Source Sans Pro'),
-		local('SourceSansPro-Regular'),
-		font-url('decidim/Source_Sans_Pro_400.eot?#iefix') format('embedded-opentype'),
-		font-url('decidim/Source_Sans_Pro_400.woff') format('woff'),
-		font-url('decidim/Source_Sans_Pro_400.woff2') format('woff2'),
-		font-url('decidim/Source_Sans_Pro_400.svg#SourceSansPro') format('svg'),
+    font-url('decidim/Source_Sans_Pro_400.woff2') format('woff2'),
+    font-url('decidim/Source_Sans_Pro_400.woff') format('woff'),
 		font-url('decidim/Source_Sans_Pro_400.ttf') format('truetype');
 }
 @font-face {
@@ -16,12 +12,8 @@
 	font-style: normal;
 	font-weight: 600;
 	src:
-		local('Source Sans Pro Semibold'),
-		local('SourceSansPro-Semibold'),
-		font-url('decidim/Source_Sans_Pro_600.eot?#iefix') format('embedded-opentype'),
+    font-url('decidim/Source_Sans_Pro_600.woff2') format('woff2'),
 		font-url('decidim/Source_Sans_Pro_600.woff') format('woff'),
-		font-url('decidim/Source_Sans_Pro_600.woff2') format('woff2'),
-		font-url('decidim/Source_Sans_Pro_600.svg#SourceSansPro') format('svg'),
 		font-url('decidim/Source_Sans_Pro_600.ttf') format('truetype');
 }
 @font-face {
@@ -29,11 +21,7 @@
 	font-style: normal;
 	font-weight: 900;
 	src:
-		local('Source Sans Pro Black'),
-		local('SourceSansPro-Black'),
-		font-url('decidim/Source_Sans_Pro_900.eot?#iefix') format('embedded-opentype'),
+    font-url('decidim/Source_Sans_Pro_900.woff2') format('woff2'),
 		font-url('decidim/Source_Sans_Pro_900.woff') format('woff'),
-		font-url('decidim/Source_Sans_Pro_900.woff2') format('woff2'),
-		font-url('decidim/Source_Sans_Pro_900.svg#SourceSansPro') format('svg'),
 		font-url('decidim/Source_Sans_Pro_900.ttf') format('truetype');
 }

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

@@ -42,6 +42,7 @@
 
 @import 'util/util';
 
+
 // 1. Global
 // ---------
 
@@ -108,27 +109,29 @@ $header-font-family: $body-font-family;
 $header-font-weight: $global-weight-normal;
 $header-font-style: normal;
 $font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace;
-$header-sizes: (
-  small: (
-    'h1': 40,
-    'h2': 32,
-    'h3': 28,
-    'h4': 24,
-    'h5': 20,
-    'h6': 16,
-  ),
-  medium: (
-    'h1': 48,
-    'h2': 32,
-    'h3': 28,
-    'h4': 24,
-    'h5': 20,
-    'h6': 16,
+$header-lineheight: 1.4;
+$header-margin-bottom: 0.5rem;
+
+$header-styles: (
+  'small': (
+    'h1': ('font-size': 40),
+    'h2': ('font-size': 32),
+    'h3': ('font-size': 28),
+    'h4': ('font-size': 24),
+    'h5': ('font-size': 20),
+    'h6': ('font-size': 16)
   ),
+  'medium': (
+    'h1': ('font-size': 48),
+    'h2': ('font-size': 32),
+    'h3': ('font-size': 28),
+    'h4': ('font-size': 24),
+    'h5': ('font-size': 20),
+    'h6': ('font-size': 16)
+  )
 );
+
 $header-color: inherit;
-$header-lineheight: 1.4;
-$header-margin-bottom: 0.5rem;
 $header-text-rendering: optimizeLegibility;
 $small-font-size: 90%;
 $header-small-font-color: lighten($body-font-color, 30);
@@ -195,14 +198,14 @@ $input-error-font-weight: $global-weight-bold;
 // 7. Accordion
 // ------------
 
-$accordion-background: $white;
+$accordion-background: $primary-color;
 $accordion-plusminus: true;
-$accordion-item-color: foreground($accordion-background, $primary-color);
+$accordion-item-color: $white;
 $accordion-item-background-hover: $light-gray;
 $accordion-item-padding: 1.25rem 1rem;
 $accordion-content-background: $white;
 $accordion-content-border: 1px solid $light-gray;
-$accordion-content-color: foreground($accordion-content-background, $body-font-color);
+$accordion-content-color: inherit;
 $accordion-content-padding: 1rem;
 
 // 8. Accordion Menu
@@ -215,7 +218,7 @@ $accordionmenu-arrow-color: $primary-color;
 // --------
 
 $badge-background: $primary-color;
-$badge-color: foreground($badge-background);
+$badge-color: $white;
 $badge-padding: 0.3em;
 $badge-minwidth: 1.5em;
 $badge-font-size: 0.6rem;
@@ -363,7 +366,8 @@ $input-radius: $global-radius;
 // ---------
 
 $label-background: $primary-color;
-$label-color: foreground($label-background);
+$label-color: $white;
+$label-color-alt: $body-font-color;
 $label-font-size: 0.8rem;
 $label-padding: 0.33333rem 0.5rem;
 $label-radius: $global-radius;
@@ -434,7 +438,7 @@ $pagination-item-spacing: rem-calc(1);
 $pagination-radius: $global-radius;
 $pagination-item-background-hover: $white;
 $pagination-item-background-current: $secondary-color;
-$pagination-item-color-current: foreground($pagination-item-background-current);
+$pagination-item-color-current: $white;
 $pagination-item-color-disabled: lighten($body-font-color, 30);
 $pagination-ellipsis-color: $body-font-color;
 $pagination-mobile-items: false;
@@ -520,7 +524,7 @@ $tab-item-padding: 1.25rem 1.5rem;
 $tab-expand-max: 6;
 $tab-content-background: $white;
 $tab-content-border: transparent;
-$tab-content-color: foreground(transparent, transparent);
+$tab-content-color: inherit;
 $tab-content-padding: 0;
 
 // 33. Thumbnail
@@ -566,4 +570,3 @@ $topbar-submenu-background: $topbar-background;
 $topbar-title-spacing: 1rem;
 $topbar-input-width: 200px;
 $topbar-unstack-breakpoint: medium;
-