promethee 4.1.17 → 4.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e6e42f0d4cb145f8b35d05d3f25bd1aa3a232893b582a33dd1b87f6ec12a043
-  data.tar.gz: bf7f8e5795187559af358cd49d9c765e410aba8636c3015e6b51f4f6b4dd11b6
+  metadata.gz: 1aafecb12274f0287bef271deebf2fc5bdd95a34e28d81f206ec0a9bb15ff7cb
+  data.tar.gz: 7748db008cdbd1ae0c6e789667cfd7a873434270066561fecaa64f92bd67eb61
 SHA512:
-  metadata.gz: 0b2631fe22a469a19b9e76dddb109c9b6829cffc46df68f123a4cc2fae106474c6927a93bcf2d6fd89af06a9f981dadf96683c74b365aabde8a2febfcb2ff3e9
-  data.tar.gz: 4f3b348bceb066ad90efecaf6b5bd7cc621cc57facab8cfba2de7c9a0917f02075e54a9c729bafe62eb106f49842ad57a2b24c7ba2be1794512fac3c00da113b
+  metadata.gz: c1ebfe5ce1a60ec06ef2a03e797d39203e6d371f37f5fdc81c301fe93cd01d44b45fdfb2fe8f81283e14ac5d7cb6421e84f58a800ef9e690b94714110a3d592f
+  data.tar.gz: 3bd2cd1fe7c731142a1740814227bbede04afeff790d4a783e3b80738786fb22ecd4bf94232f197e5ba470d88df33d81ac06c5b206913b7043d7835016f05034

data/app/assets/stylesheets/promethee-edit/_layout.sass

@@ -140,8 +140,8 @@
 
     &__component--blockquote
         text-align: center
-
         .blockquote
+            padding-top: 20px
             &::before, &::after
                 display: inline-block
             &::before
@@ -151,6 +151,8 @@
             p
                 display: inline
                 line-height: 1.4rem
+                &:last-child
+                    margin-bottom: 0
 
 
 @media (min-width: 768px)

data/app/assets/stylesheets/promethee-edit/_move.sass

@@ -8,7 +8,7 @@
             border: 1px solid #CCCCCC
             display: flex
             flex-direction: column
-            justify-content: center
+            justify-content: flex-start
             min-height: 70px
             position: relative
             p.text-empty
@@ -21,14 +21,38 @@
                     color: white
         &__remove
             background: white
-            font-size: 12px
-            line-height: 12px
-            padding: 1px 2px 1px 3px
+            font-size: 10px
+            line-height: 10px
+            padding: 1px 3px
             position: absolute
-            right: 4px
+            right: 5px
             top: 4px
             z-index: 1
 
+        &--row
+            .row
+                margin-left: -10px
+                margin-right: -10px
+            .promethee-edit__component--column
+                padding-bottom: 5px
+                padding-top: 5px
+
+        &--text
+            .promethee-edit__component__inner
+                padding: 10px
+            h1, h2, h3
+                margin-top: 0
+            p
+                line-height: 1.2
+                &:last-of-type
+                    margin-bottom: 0
+
+        &--image
+            figure
+                margin-bottom: 0
+            figcaption
+                padding: 5px
+
         &--aside
             .btn
                 &.left
@@ -57,6 +81,9 @@
                     align-items: center
                     display: flex
                     justify-content: center
+                p
+                    &:last-of-type
+                        margin-bottom: 0
             .dots
                 margin-top: 5px
                 text-align: center
@@ -118,24 +145,23 @@
         color: white
         font-size: 8px
         margin-bottom: 5px
-        padding: 4px 5px 5px
+        padding: 5px 10px
         text-transform: uppercase
     &__component
         user-select: none
 
     &__droppable
         background: white
-        border: 1px dashed #253742
+        border: 0 dashed #253742
         box-sizing: border-box
-        height: 20px
-        margin: 2px 0
         opacity: .2
         position: relative
-        transition: width .2s, height .2s, opacity .2s
-        visibility: hidden
-        width: 100%
+        transition: all .5s
+        width: calc(100% - 4px)
         &.ui-droppable-active
-            visibility: visible
+            border-width: 1px
+            height: 20px
+            margin: 2px
         &.ui-droppable-hover
             height: 100px
             opacity: 1
@@ -157,7 +183,7 @@
             padding: 30px 20px 15px
             position: fixed
             top: 50px
-            width: calc(50vw - 365px)
+            width: calc(50vw - 367px)
             z-index: 1000
             &-header
                 font-size: 18px
@@ -194,7 +220,7 @@
                 background-color: #253742
                 color: white
                 height: 100px
-                margin: 0 10px 20px
+                margin: 0 9px 18px
                 max-width: 100px
                 min-width: 100px
                 padding: 10px 5px 0 5px

data/app/assets/stylesheets/promethee.sass

@@ -63,14 +63,15 @@ $black: #000000 !default
 
         &__collection
             margin-bottom: $grid-gutter-width
-            > div
+            [class*="col-"]
                 margin-bottom: $grid-gutter-width
             .collection-item__content
                 &:not(:last-of-type)
                     margin-bottom: $grid-gutter-width
-                a + p
-                    margin-bottom: 0
+                &__caption
                     margin-top: 10px
+                    p:last-of-type
+                        margin-bottom: 0
 
         &__cover
             background-position: center center

data/app/views/promethee/components/collection/_show.html.erb

@@ -12,20 +12,22 @@
   end
 %>
 
-<div  class="row <%= promethee_class_for component %>"
+<div  class="<%= promethee_class_for component %>"
       id="<%= promethee_id_for component %>">
   <% component[:children].each.with_index do |child, n| %>
-    <div class="<%= col_classes %>">
-        <%= render 'promethee/show/component', component: child %>
-    </div>
-    <% if n%items_per_line === items_per_line - 1 %>
-      <div class="clearfix hidden-sm hidden-xs d-none d-md-block"></div>
+    <div class="row promethee__component__row">
+      <div class="<%= col_classes %>">
+          <%= render 'promethee/show/component', component: child %>
+      </div>
+      <% if n%items_per_line === items_per_line - 1 %>
+        <div class="clearfix hidden-sm hidden-xs d-none d-md-block"></div>
+      <% end %>
+      <% if items_per_line >= 4 && n.odd? %>
+        <div class="clearfix visible-xs-block d-block <%= items_per_line === 4 ? 'visible-sm-block d-md-none' : 'd-sm-none' %>"></div>
+      <% end %>
+      <% if items_per_line == 6 && n%3 == 2 %>
+        <div class="clearfix visible-sm-block .d-none .d-sm-block .d-md-none"></div>
+      <% end %>
     <% end %>
-    <% if items_per_line >= 4 && n.odd? %>
-      <div class="clearfix visible-xs-block d-block <%= items_per_line === 4 ? 'visible-sm-block d-md-none' : 'd-sm-none' %>"></div>
-    <% end %>
-    <% if items_per_line == 6 && n%3 == 2 %>
-      <div class="clearfix visible-sm-block .d-none .d-sm-block .d-md-none"></div>
-    <% end %>
-  <% end %>
+  </div>
 </div>

data/app/views/promethee/components/page/_edit.inspect.html.erb

@@ -7,7 +7,7 @@
 
     <div class="form-group">
       <label class="label-control">Description</label>
-      <textarea class="form-control" ng-model="promethee.inspected.attributes.description.value"></textarea>
+      <textarea rows="6" class="form-control" ng-model="promethee.inspected.attributes.description.value"></textarea>
     </div>
   <% end %>
 
@@ -16,12 +16,12 @@
 
     <div class="form-group">
       <label class="label-control">Stylesheets</label>
-      <textarea class="form-control" ng-model="promethee.inspected.attributes.stylesheets.value"></textarea>
+      <textarea rows="6" class="form-control" ng-model="promethee.inspected.attributes.stylesheets.value"></textarea>
     </div>
 
     <div class="form-group">
       <label class="label-control">Javascripts</label>
-      <textarea class="form-control" ng-model="promethee.inspected.attributes.javascripts.value"></textarea>
+      <textarea rows="6" class="form-control" ng-model="promethee.inspected.attributes.javascripts.value"></textarea>
     </div>
   </div>
 </script>

data/app/views/promethee/components/page/_localize.html.erb

@@ -25,7 +25,7 @@
       <div class="col-md-6">
         <div class="form-group">
           <b>Page description</b>
-          <textarea class="form-control" ng-model="component.attributes.description.value"></textarea>
+          <textarea class="form-control" rows="6" ng-model="component.attributes.description.value"></textarea>
         </div>
       </div>
     </div>

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '4.1.17'
+    VERSION = '4.1.22'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 4.1.17
+  version: 4.1.22
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,16 +40,16 @@ dependencies:
   name: angularjs-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement