decidim-core 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90088cf15e64d2ce6b1d18dc801aafd4f2bcaf25
-  data.tar.gz: 03fbfda546c53214106febeea0e31b94f5b07e8e
+  metadata.gz: a032ffa156def30465db5d8b3d20ca95a7ea2dc0
+  data.tar.gz: 855965c6e8eecfbe557440501e0d717c4a7a4a80
 SHA512:
-  metadata.gz: f2ddf2c4e04870bd329115a24a5c43680133b4cdc3e750b7606d67594123d2f8668f702ed0c80c56aef68f803e5727a3974e8289d3eb47532aa6ad50ac588e71
-  data.tar.gz: c3c192e8f660653064880131624f897d41ebe1a070925dd25a8780e4f182c731bc188962b931e54034139543d231d7b6fcc03beef7f58b8a4af8840cb5ba43d4
+  metadata.gz: 1552bb8342aebc959620e05d4934651d0a54aa61d508a6b2c3db634e27418b3d28211173fdddea6a3964a07decb467da0ea87a439ea63de0b81cfb1ae749bff6
+  data.tar.gz: 246850a6564065e2f2ee93b0c49c1a41f5cfbf902cdd3675f114e9648eecd24011665141115fdd609681b98bea1219f69344583870d6f6440c451ca2a86a6e40

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

@@ -1,14 +1,12 @@
-// = require foundation
+// = require decidim/foundation
 // = require modernizr
-// = require owl.carousel.min
 // = require svg4everybody.min
 // = require decidim/append_elements
-// = require decidim/inline_svg
 // = require decidim/user_registrations
 
 /* globals svg4everybody */
 
-$(document).on('turbolinks:load', () => {
+$(() => {
   $(document).foundation();
   svg4everybody();
 });

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

@@ -1,7 +1,7 @@
 // = require appendAround
 
 (function() {
-  $(document).on("turbolinks:load", function () {
+  $(() => {
     let $appendableElements = $('.js-append');
     $appendableElements.appendAround();
   })

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

@@ -1,46 +1,44 @@
 // = require quill.min
 // = require_self
 
-$(document).on('turbolinks:load', () => {
-  $(() => {
-    const $container = $('.editor-container');
-    const quillFormats = ['bold', 'italic', 'link', 'underline', 'header', 'list'];
+$(() => {
+  const $container = $('.editor-container');
+  const quillFormats = ['bold', 'italic', 'link', 'underline', 'header', 'list'];
 
-    $container.each((idx, container) => {
-      const toolbar = $(container).data('toolbar');
+  $container.each((idx, container) => {
+    const toolbar = $(container).data('toolbar');
 
-      let quillToolbar = [
-        ['bold', 'italic', 'underline'],
-        [{ list: 'ordered' }, { list: 'bullet' }],
-        ['link', 'clean']
-      ];
-
-      if (toolbar === 'full') {
-        quillToolbar = [
-          [{ header: [1, 2, 3, 4, 5, 6, false] }],
-          ...quillToolbar
-        ];
-      }
+    let quillToolbar = [
+      ['bold', 'italic', 'underline'],
+      [{ list: 'ordered' }, { list: 'bullet' }],
+      ['link', 'clean']
+    ];
 
-      const $input = $(container).siblings('input[type="hidden"]');
-      const quill = new Quill(container, {
-        modules: {
-          toolbar: quillToolbar
-        },
-        formats: quillFormats,
-        theme: 'snow'
-      });
+    if (toolbar === 'full') {
+      quillToolbar = [
+        [{ header: [1, 2, 3, 4, 5, 6, false] }],
+        ...quillToolbar
+      ];
+    }
 
-      quill.on('text-change', () => {
-        const text = quill.getText();
-        if (text === '\n') {
-          $input.val('');
-        } else {
-          $input.val(quill.root.innerHTML);
-        }
-      });
+    const $input = $(container).siblings('input[type="hidden"]');
+    const quill = new Quill(container, {
+      modules: {
+        toolbar: quillToolbar
+      },
+      formats: quillFormats,
+      theme: 'snow'
+    });
 
-      quill.root.innerHTML = $input.val();
+    quill.on('text-change', () => {
+      const text = quill.getText();
+      if (text === '\n') {
+        $input.val('');
+      } else {
+        $input.val(quill.root.innerHTML);
+      }
     });
+
+    quill.root.innerHTML = $input.val();
   });
 });

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

@@ -1,22 +1,16 @@
+/* eslint-disable no-invalid-this */
 // = require ./form_filter.component
 // = require_self
 
-// Initializes the form filter. We're unmounting the component before
-// changing the page so that we stop listening to events and we don't bind
-// multiple times when re-visiting the page.
+// Initializes the form filter.
 ((exports) => {
   const { Decidim: { FormFilterComponent } } = exports;
-  const formFilter = new FormFilterComponent('form.new_filter');
+  
+  $(() => {
+    $('form.new_filter').each(function () {
+      const formFilter = new FormFilterComponent($(this));
 
-  const onDocumentReady = () => {
-   formFilter.mountComponent();
-  };
-
-  const onTurboLinksBeforeVisit = () => {
-    formFilter.unmountComponent();
-    $(document).off('turbolinks:before-visit', onTurboLinksBeforeVisit);
-  };
-
-  $(document).ready(onDocumentReady);
-  $(document).on('turbolinks:before-visit', onTurboLinksBeforeVisit);
+      formFilter.mountComponent();
+    })
+  });
 })(window);

data/app/assets/javascripts/decidim/form_filter.component.js.es6

@@ -10,8 +10,8 @@
     mounted;
     $form;
 
-    constructor(selector) {
-      this.$form = $(selector);
+    constructor($form) {
+      this.$form = $form;
       this.mounted = false;
 
       this._onFormChange = this._onFormChange.bind(this);
@@ -127,7 +127,7 @@
         // Iterate the filter params and set the correct form values
         fieldIds.forEach((fieldId) => {
           let field = null;
-          
+
           // Since we are using Ruby on Rails generated forms the field ids for a
           // checkbox or a radio button has the following form: filter_${key}_${value}
           field = this.$form.find(`input#filter_${fieldId}_${filterParams[fieldId]}`);
@@ -138,7 +138,7 @@
             // If the field is not a checkbox neither a radio it means is a input or a select.
             // Ruby on Rails ensure the ids are constructed like this: filter_${key}
             field = this.$form.find(`input#filter_${fieldId},select#filter_${fieldId}`);
-            
+
             if (field.length > 0) {
               field.val(filterParams[fieldId]);
             }
@@ -155,9 +155,9 @@
      * @returns {Void} - Returns nothing.
      */
     _onFormChange() {
-      let newUrl = '';
       const formAction = this.$form.attr('action');
       const params = this.$form.serialize();
+      let newUrl = '';
 
       this.$form.submit();
 

data/app/assets/javascripts/decidim/form_filter.component.test.js

@@ -34,7 +34,7 @@ describe('FormFilterComponent', () => {
     window.history = {
       pushState: sinon.stub()
     };
-    subject = new FormFilterComponent(selector);
+    subject = new FormFilterComponent($(document).find('form'));
   });
 
   it('exists', () => {

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

@@ -0,0 +1,17 @@
+// = require foundation.core.js
+// = require foundation.dropdown.js
+// = require foundation.dropdownMenu.js
+// = require foundation.offcanvas.js
+// = require foundation.responsiveMenu.js
+// = require foundation.responsiveToggle.js
+// = require foundation.reveal.js
+// = require foundation.sticky.js
+// = require foundation.tabs.js
+// = require foundation.toggler.js
+// = require foundation.util.box.js
+// = require foundation.util.keyboard.js
+// = require foundation.util.mediaQuery.js
+// = require foundation.util.motion.js
+// = require foundation.util.nest.js
+// = require foundation.util.touch.js
+// = require foundation.util.triggers.js

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

@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', () => {
+$(() => {
   const $userRegistrationForm = $('.register-form');
   const $userGroupFields      = $userRegistrationForm.find('.user-group-fields');
   const inputSelector         = 'input[name="user[sign_up_as]"]';
@@ -12,11 +12,10 @@ $(document).on('turbolinks:load', () => {
   }
 
   setGroupFieldsVisibility($userRegistrationForm.find(`${inputSelector}:checked`).val());
-  
+
   $userRegistrationForm.on('change', inputSelector, (event) => {
     const value = event.target.value;
 
     setGroupFieldsVisibility(value);
   });
-
 });

data/app/assets/stylesheets/decidim/_decidim.scss

@@ -0,0 +1,9 @@
+//@import compass
+@import "variables";
+@import "utils/*";
+
+@import "foundation";
+@include foundation-everything;
+
+@import "modules/modules";
+@import "layouts/*";

data/app/assets/stylesheets/decidim/_variables.scss

@@ -1,12 +1,10 @@
 // Variables
 
-$primary: map-get($foundation-palette, primary) !default;
-$secondary: map-get($foundation-palette, secondary) !default;
-$success: map-get($foundation-palette, success) !default;
-$warning: map-get($foundation-palette, warning) !default;
-$alert: map-get($foundation-palette, alert) !default;
-
-$light-gray-dark: darken($light-gray, 2.5) !default;
+$primary: #ef604d !default;
+$secondary: #599aa6 !default;
+$success: #57d685 !default;
+$warning: #ffae00 !default;
+$alert: #ec5840 !default;
 
 $proposals: #238FF7 !default;
 $actions: #57D685 !default;
@@ -16,7 +14,3 @@ $meetings: #FABC6C !default;
 $twitter: #55acee !default;
 $facebook: #3b5998 !default;
 $google: #dd4b39 !default;
-
-$muted: lighten($body-font-color, 30) !default;
-
-$border: 1px solid $medium-gray !default;

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

@@ -0,0 +1,6 @@
+@import "decidim";
+@import "editor";
+
+<% Decidim.feature_manifests.map(&:stylesheet).compact.each do |stylesheet| %>
+@import "<%= stylesheet %>";
+<% end %>

data/app/assets/stylesheets/decidim/extras/_leaflet.scss

@@ -0,0 +1,13 @@
+.leaflet-container {
+  .map-info {
+    border: 1px solid $primary;
+
+    .leaflet-popup-content-wrapper {
+      border-radius: 0;
+    }
+
+    a.button {
+      color: #fff;
+    }
+  }
+}

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

@@ -9,6 +9,11 @@
     padding-top: .25rem;
     padding-bottom: .25rem;
   }
+
+  &:disabled{
+    @extend .button;
+    @extend .button.disabled;
+  }
 }
 
 
@@ -78,7 +83,8 @@
 }
 
 .show-more{
-  font-size: 90%;
+  text-align: center;
+  margin-bottom: $margin-s;
 }
 
 /*Social buttons*/
@@ -117,4 +123,4 @@
   &:hover{
     background-color: lighten($google,5);
   }
-}
+}

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

@@ -502,5 +502,3 @@ $datetime-bg: $primary;
     margin-top: auto;
   }
 }
-
-

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

@@ -30,11 +30,8 @@ $comment-form-bg: $light-gray;
 }
 
 .show-more--comment-thread{
-  text-align: right;
-  margin-top: -$card-margin-bottom;
+  margin-top: -$card-margin-bottom / 2;
   margin-bottom: $card-margin-bottom;
-  padding-top: 3px;
-  font-size: 90%;
 }
 
 .comment{
@@ -85,16 +82,44 @@ $comment-form-bg: $light-gray;
   float: right;
 }
 .comment__votes--up{
-  color: $comment-vote-up-color;
-  &:hover{
+  color: $muted;
+  .icon{
+    color: $comment-vote-up-color;
+  }
+  &:hover,
+  &.is-vote-selected{
     color: darken($comment-vote-up-color,10);
+    .icon{
+      color: inherit;
+    }
+  }
+  &.is-vote-notselected{
+    color: $muted;
+    opacity: .3;
+    .icon{
+      color: inherit;
+    }
   }
 }
 .comment__votes--down{
-  color: $comment-vote-down-color;
+  color: $muted;
   padding-left: .3rem;
-  &:hover{
+  .icon{
+    color: $comment-vote-down-color;
+  }
+  &:hover,
+  &.is-vote-selected{
     color: darken($comment-vote-down-color,10);
+    .icon{
+      color: inherit;
+    }
+  }
+  &.is-vote-notselected{
+    color: $muted;
+    opacity: .3;
+    .icon{
+      color: inherit;
+    }
   }
 }
 

data/app/assets/stylesheets/decidim/modules/_filter-tags.scss

@@ -0,0 +1,24 @@
+//Variables
+
+$filter-tags-color: $light-gray-dark;
+$filter-tags-padding: .2rem;
+
+/* Filter tags */
+.filter-tags__title{
+  margin-right: $filter-tags-padding * 2;
+}
+.filter-tags{
+  margin-bottom: 1rem - $filter-tags-padding;
+}
+.filter-tag{
+  display: inline-block;
+  background-color: $filter-tags-color;
+  border: $border;
+  padding: $filter-tags-padding $filter-tags-padding * 2;
+  margin-right: $filter-tags-padding * 2;
+  margin-bottom: $filter-tags-padding;
+}
+.filter-tag__close{
+  padding-left: .5rem;
+  color: $body-font-color;
+}

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

@@ -37,7 +37,7 @@ body{
 
 //fixes for off-canvas wrappers
 .off-canvas-wrapper{
-  background-color: $white;
+  background-color: $light-gray;
 }
 
 .off-canvas-wrapper,
@@ -56,11 +56,3 @@ body{
     margin-right: -.5rem;
   }
 }
-
-//Sections
-.section{
-  margin-bottom: 3rem;
-  @include breakpoint(large){
-    margin-bottom: 5rem;
-  }
-}