Merge pull request #1970 from consul/minor-fixes

Minor fixes

app/assets/stylesheets/_consul_settings.scss

@@ -75,3 +75,5 @@ $accordion-content-color: foreground($accordion-background, $text);
 $tab-item-font-size: $base-font-size;
 $tab-item-padding: $line-height / 2  0;
 $tab-content-border: $border;
+
+$orbit-bullet-diameter: 0.8rem;

app/assets/stylesheets/_settings.scss

@@ -411,7 +411,7 @@ $maincontent-shadow: 0 0 10px rgba($black, 0.5);
 
 $orbit-bullet-background: $medium-gray;
 $orbit-bullet-background-active: $dark-gray;
-$orbit-bullet-diameter: 0.8rem;
+$orbit-bullet-diameter: 1.2rem;
 $orbit-bullet-margin: 0.1rem;
 $orbit-bullet-margin-top: 0.8rem;
 $orbit-bullet-margin-bottom: 0.8rem;

app/assets/stylesheets/layout.scss

@@ -343,11 +343,9 @@ a {
 }
 
 .truncate-horizontal-text {
-  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  -o-text-overflow: ellipsis;
-  -ms-text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .align-top {
@@ -633,7 +631,7 @@ header {
     text-align: left;
 
     @include breakpoint(medium) {
-      margin-right: rem-calc(24);
+      margin-right: $line-height;
     }
 
     &:hover {
@@ -2183,9 +2181,10 @@ table {
 }
 
 // 19. Recommended Section Home
-// -----------
+// ----------------------------
 
 .home-page {
+
   .push {
     display: none;
   }
@@ -2219,7 +2218,7 @@ table {
 
     .card-section {
       padding: $line-height 0;
-      max-width: 300px;
+      max-width: rem-calc(300);
       margin: 0 auto;
 
       p {
@@ -2229,10 +2228,10 @@ table {
     }
 
     .orbit {
-      height: 300px;
+      height: rem-calc(300);
 
       .orbit-wrapper {
-        max-height: 250px;
+        max-height: rem-calc(250);
         overflow: hidden;
         position: relative;
       }
@@ -2248,7 +2247,7 @@ table {
     background: image-url('truncate.png');
     background-repeat: repeat-x;
     bottom: 0;
-    height: 20px;
+    height: rem-calc(20);
     position: absolute;
     width: 100%;
   }
@@ -2269,21 +2268,21 @@ table {
   .proposals-inner,
   .budget-investments-inner {
     background: #fff;
-    max-height: 350px;
+    max-height: rem-calc(350);
 
     @include breakpoint(small) {
-      max-height: 400px;
+      max-height: rem-calc(400);
     }
 
     h4 {
       margin-top: $line-height;
       margin-bottom: 0;
       font-size: rem-calc(18);
-      min-height: 50px;
+      min-height: rem-calc(50);
     }
 
     h5 {
-      font-size: rem-calc(14);
+      font-size: $small-font-size;
       text-align: left;
     }
   }
@@ -2291,20 +2290,20 @@ table {
   .carousel-image {
 
     .card .orbit {
-      height: 480px;
+      height: rem-calc(480);
 
       .orbit-wrapper {
-        max-height: 450px;
+        max-height: rem-calc(450);
       }
     }
 
     .debates-inner,
     .proposals-inner,
     .budget-investments-inner {
-      max-height: 500px;
+      max-height: rem-calc(500);
 
       @include breakpoint(small) {
-        max-height: 600px;
+        max-height: rem-calc(600);
       }
     }
   }
@@ -2318,7 +2317,9 @@ table {
   }
 }
 
-// 19. Documents
+// 20. Documents
+// -------------
+
 .documents-list {
 
   table {

app/assets/stylesheets/mixins.scss

@@ -2,7 +2,8 @@
 //
 // 01. Logo
 // 02. Orbit bullets
-//
+// 03. Direct uploads
+// ------------------
 
 // 01. Logo
 // --------
@@ -34,6 +35,7 @@
 
 // 02. Orbit bullet
 // ----------------
+
 @mixin orbit-bullets {
   @include disable-mouse-outline;
   position: relative;
@@ -59,8 +61,9 @@
   }
 }
 
-// 02. Direct uploads
+// 03. Direct uploads
 // ------------------
+
 @mixin direct-uploads {
 
   .cached-image {
@@ -133,5 +136,4 @@
   .loading-bar.no-transition {
     transition: none;
   }
-
 }

app/assets/stylesheets/participation.scss

@@ -672,16 +672,15 @@
         padding-top: 100%;
       }
     }
-
-    .column:first-child {
-      text-align: center;
-    }
   }
 
   @include breakpoint(medium) {
 
     .panel {
-      padding: 0 $line-height / 2 0 0;
+
+      &.with-image {
+        padding: 0 $line-height / 2 0 0;
+      }
 
       .no-image {
         height: 100%;
@@ -829,7 +828,7 @@
     background: image-url('truncate.png');
     background-repeat: repeat-x;
     bottom: 0;
-    height: 24px;
+    height: rem-calc(24);
     position: absolute;
     width: 100%;
   }

app/views/budgets/investments/_form.html.erb

@@ -41,7 +41,7 @@
                    parent_class: "budget_investment" %>
 
       </div>
-    <% end %>    
+    <% end %>
 
     <div class="small-12 column">
       <%= f.text_field :location %>

app/views/budgets/investments/_investment.html.erb

@@ -1,8 +1,8 @@
 <div id="<%= dom_id(investment) %>" class="budget-investment clear">
-  <div class="panel">
+  <div class="panel with-image">
     <div class="row" data-equalizer>
 
-      <div class="small-12 medium-3 large-2 column">
+      <div class="small-12 medium-3 large-2 column text-center">
         <div data-equalizer-watch>
           <% if investment.image.present? %>
             <%= image_tag investment.image_url(:thumb), alt: investment.image.title %>

app/views/proposals/_proposal.html.erb

@@ -1,11 +1,11 @@
 <div id="<%= dom_id(proposal) %>"
      class="proposal clear <%= ("successful" if proposal.total_votes > Proposal.votes_needed_for_success) %>"
      data-type="proposal">
-  <div class="panel">
+  <div class="panel with-image">
     <div class="icon-successful"></div>
     <div class="row" data-equalizer>
 
-      <div class="small-12 medium-3 large-2 column">
+      <div class="small-12 medium-3 large-2 column text-center">
         <div data-equalizer-watch>
           <% if proposal.image.present? %>
             <%= image_tag proposal.image_url(:thumb), alt: proposal.image.title %>

config/i18n-tasks.yml

@@ -154,6 +154,7 @@ ignore_unused:
   - 'users.show.filters.*'
   - 'polls.index.filters.*'
   - 'polls.index.section_header.*'
+  - 'polls.index.orders.*'
   - 'debates.index.select_order'
   - 'debates.index.orders.*'
   - 'debates.index.section_header.*'