Merge ac190a9 into d012989

liqd · Oct 2, 2019 · 4edbf79 · 4edbf79
2 parents d012989 + ac190a9
commit 4edbf79
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 53 deletions.
diff --git a/apps/contrib/templates/a4_candy_contrib/includes/filter_and_sort.html b/apps/contrib/templates/a4_candy_contrib/includes/filter_and_sort.html
@@ -3,7 +3,9 @@
 <div class="filter-bar form-inline mb-2" role="group" aria-label="{% trans 'Filter bar '%}">
     {% for field in filter.form %}
         {% if field.name != 'ordering' %}
+        <div class="mr-1">
             {{ field }}
+        </div>
         {% endif %}
     {% endfor %}
 

diff --git a/apps/organisations/templates/organisation_landing_page.html b/apps/organisations/templates/organisation_landing_page.html
@@ -25,27 +25,29 @@ <h2 class="u-no-margin organisation__slogan">{{ organisation.slogan }}</h2>
     </div>
 
     <div class="l-wrapper">
-        <div class="l-col-8-0">
-            <ul class="u-list-reset">
-                {% for project in project_list %}
-                    <li>
-                        {% include 'a4_candy_projects/includes/project_list_tile.html' with project=project %}
-                    </li>
-                {% endfor %}
-            </ul>
-        </div>
-
-        <aside class="l-col-4-8 aside">
-            <div class="aside__block">
-                <h2 class="aside__block__title heading3">{% trans 'Activity' %}</h2>
-                <div>
-                    {% for action in action_list %}
-                        {% include 'a4_candy_actions/includes/action.html' with action=action %}
-                    {% empty %}
-                        {% trans 'No activity yet. '%}
+        <div class="row">
+            <div class="l-col-8-0">
+                <ul class="u-list-reset">
+                    {% for project in project_list %}
+                        <li>
+                            {% include 'a4_candy_projects/includes/project_list_tile.html' with project=project %}
+                        </li>
                     {% endfor %}
-                </div>
+                </ul>
             </div>
-        </aside>
+
+            <aside class="l-col-4-8 aside">
+                <div class="aside__block">
+                    <h2 class="aside__block__title heading3">{% trans 'Activity' %}</h2>
+                    <div>
+                        {% for action in action_list %}
+                            {% include 'a4_candy_actions/includes/action.html' with action=action %}
+                        {% empty %}
+                            {% trans 'No activity yet. '%}
+                        {% endfor %}
+                    </div>
+                </div>
+            </aside>
+        </div>
     </div>
 {% endblock %}
diff --git a/liqd_product/assets/scss/_layout.scss b/liqd_product/assets/scss/_layout.scss
@@ -55,12 +55,10 @@
 
 .l-col-4-8 {
     @extend .col-sm-4;
-    @extend .offset-sm-8;
 }
 
 .l-col-3-9 {
     @extend .col-sm-3;
-    @extend .offset-sm-9;
 }
 
 .l-tiles-2,

diff --git a/liqd_product/assets/scss/_shame.scss b/liqd_product/assets/scss/_shame.scss
@@ -34,16 +34,6 @@ input[type="search"] {
 .btngroup .btn {
     @extend .btn--light;
     @extend .btn--small;
-
-    &:first-child {
-        border-bottom-right-radius: 0;
-        border-top-right-radius: 0;
-    }
-
-    &:last-child {
-        border-bottom-left-radius: 0;
-        border-top-left-radius: 0;
-    }
 }
 
 // maps usually have a height of 300px in their element style, defined in adhocracy4.

diff --git a/liqd_product/assets/scss/components/_button.scss b/liqd_product/assets/scss/components/_button.scss
@@ -208,11 +208,6 @@
     margin-bottom: $spacer;
 }
 
-.btn--attached-top {
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-}
-
 .btn-group {
     .dropdown {
         display: inline-block;
@@ -221,7 +216,7 @@
     > *,
     .dropdown-toggle {
         border-radius: 0;
-        margin-left: -1px;
+        margin-left: -2px !important;
 
         &:focus {
             // highlighted border should be on top
@@ -231,16 +226,8 @@
     }
 
     > :first-child {
-        border-top-left-radius: 0.3em;
-        border-bottom-left-radius: 0.3em;
         margin-left: 0;
     }
-
-    > :last-child,
-    > :last-child .dropdown-toggle {
-        border-top-right-radius: 0.3em;
-        border-bottom-right-radius: 0.3em;
-    }
 }
 
 @media print {

diff --git a/liqd_product/assets/scss/components/_dashboard_nav.scss b/liqd_product/assets/scss/components/_dashboard_nav.scss
@@ -1,6 +1,5 @@
 .dashboard-nav {
     border: 1px solid $border-color;
-    border-radius: 0.3em;
     overflow: hidden;
     margin-bottom: 0.5em;
 }

diff --git a/liqd_product/assets/scss/components/_datepicker.scss b/liqd_product/assets/scss/components/_datepicker.scss
@@ -12,7 +12,6 @@
     background-image: none !important;
     min-width: 3em;
     z-index: 0;
-    border-radius: 0 0.3em 0.3em 0;
 
     @extend .input-group__after;
     @extend .btn;

diff --git a/liqd_product/assets/scss/components/_rating.scss b/liqd_product/assets/scss/components/_rating.scss
@@ -9,7 +9,6 @@
 }
 
 .rating-button {
-    border: 1px solid $border-color;
     font-weight: normal;
     padding: 0 0.4em;
 
@@ -25,8 +24,8 @@
 
 @mixin rating-button($color) {
     color: $color;
-    padding: 0.65em 1.2em;
-    border-radius: 0.3em;
+    padding: 0.3em 0.6em;
+    border: 2px solid $color;
 
     &:hover,
     &:focus {

diff --git a/liqd_product/templates/a4dashboard/includes/project_list_item.html b/liqd_product/templates/a4dashboard/includes/project_list_item.html
@@ -58,7 +58,7 @@ <h2 class="list-item__title">
                                 <input type="hidden" name="project_pk" value="{{ project.pk }}">
                                 <button type="submit" name="duplicate" value="{{ project }}"
                                         class="dropdown-item">
-                                    <i class="fa fa-files-o" aria-hidden="true"></i>
+                                    <i class="far fa-copy" aria-hidden="true"></i>
                                     {% trans 'Duplicate' %}
                                 </button>
                             </form>

diff --git a/liqd_product/templates/a4forms/datetime_input.html b/liqd_product/templates/a4forms/datetime_input.html
@@ -1,4 +1,4 @@
-<div class="l-tiles-2 category-formset__datetime-input">
+<div class="d-flex category-formset__datetime-input">
     <div class="widget--datetimeinput__date input-group">
         {{ date }}
     </div>