Merge 5e94696 into 9594619

liqd · Oct 17, 2019 · 455c1f9 · 455c1f9
2 parents 9594619 + 5e94696
commit 455c1f9
Show file tree

Hide file tree

Showing 13 changed files with 374 additions and 244 deletions.
diff --git a/apps/contrib/templates/a4_candy_contrib/component_library.html b/apps/contrib/templates/a4_candy_contrib/component_library.html
diff --git a/liqd_product/assets/scss/_form.scss b/liqd_product/assets/scss/_form.scss
@@ -24,6 +24,7 @@ select {
     border-color: $brand-primary;
     box-shadow: 0 0 2px $brand-primary-tint inset;
     border-radius: 0;
+    border-width: 2px;
 
     &:invalid {
         border-color: $brand-primary;

diff --git a/liqd_product/assets/scss/components/_accordion.scss b/liqd_product/assets/scss/components/_accordion.scss
@@ -1,8 +1,5 @@
 .accordion {
     border: solid 1px $border-color;
-    border-radius: 5px;
-
-    // make border-radius work with contents
     overflow: hidden;
     margin-bottom: $padding * 1.8;
 }

diff --git a/liqd_product/assets/scss/components/_action.scss b/liqd_product/assets/scss/components/_action.scss
@@ -30,7 +30,7 @@
 
 .action__main {
     @include multi-line-main(2);
-    margin-left: 2.5*$padding;
+    margin-left: 3*$padding;
 }
 
 .action__date {

diff --git a/liqd_product/assets/scss/components/_alerts.scss b/liqd_product/assets/scss/components/_alerts.scss
@@ -19,6 +19,7 @@ $messages-margin-bottom: 25px;
     background-color: lighten($brand-info, 40);
     color: $text-color;
     text-align: center;
+    border-radius: 0;
 }
 
 .alert--success {

diff --git a/liqd_product/assets/scss/components/_category_formset.scss b/liqd_product/assets/scss/components/_category_formset.scss
@@ -7,8 +7,7 @@
     }
 }
 
-.category-formset__form,
-.category-formset__btn {
+.category-formset__form {
     @extend .l-tiles-2;
 }
 
@@ -25,7 +24,7 @@
 
     & ~ .category-formset__delete-label {
         position: absolute;
-        right: 0.5em;
+        right: 1em;
         top: 0.6em;
         color: $gray;
     }

diff --git a/liqd_product/assets/scss/components/_commenting.scss b/liqd_product/assets/scss/components/_commenting.scss
@@ -7,7 +7,6 @@
     margin-bottom: $spacer / 2;
     padding: $padding;
     border: 1px solid $border-color;
-    border-radius: ($padding / 2);
 }
 
 .commenting--toc__button {

diff --git a/liqd_product/assets/scss/components/_doc_toc.scss b/liqd_product/assets/scss/components/_doc_toc.scss
@@ -4,7 +4,6 @@
     padding: 0;
     font-size: $font-size-lg;
     border: 1px solid $border-color;
-    border-radius: 0.3em;
 }
 
 .doc-toc__toggle {

diff --git a/liqd_product/assets/scss/components/_dropdown.scss b/liqd_product/assets/scss/components/_dropdown.scss
@@ -1,7 +1,6 @@
 .dropdown {
     position: relative;
     text-align: left;
-    // margin-bottom: $spacer / 2; for bootstrap
 }
 
 .dropdown-item {
@@ -107,3 +106,9 @@
         display: none;
     }
 }
+
+.filter-bar {
+    .dropdown {
+        margin-right: 0.25em;
+    }
+}
diff --git a/liqd_product/assets/scss/components/_progress.scss b/liqd_product/assets/scss/components/_progress.scss
@@ -28,8 +28,6 @@
     align-items: center;
     padding: $padding;
     border: 1px solid $border-color;
-    border-top-left-radius: 0.3em;
-    border-top-right-radius: 0.3em;
     border-bottom: 0;
 }
 

diff --git a/liqd_product/assets/scss/components/_rating.scss b/liqd_product/assets/scss/components/_rating.scss
@@ -11,15 +11,12 @@
 .rating-button {
     font-weight: normal;
     padding: 0 0.4em;
+    margin-right: 0.2em;
 
     &.is-read-only,
     &:disabled {
         cursor: default;
     }
-
-    &:first-child {
-        margin-right: 0.2em;
-    }
 }
 
 @mixin rating-button($color) {

diff --git a/liqd_product/assets/scss/components/_tile.scss b/liqd_product/assets/scss/components/_tile.scss
@@ -1,7 +1,7 @@
 .tile {
     display: flex;
     flex-direction: column;
-    margin-bottom: $padding;
+    margin: 0.5*$r-spacer 0.5*$r-spacer 0.5*$r-spacer 0.5*$r-spacer;
     page-break-inside: avoid;
     overflow-wrap: break-word;
     background-color: $body-bg;

diff --git a/liqd_product/templates/a4forms/includes/inline_form.html b/liqd_product/templates/a4forms/includes/inline_form.html
@@ -1,6 +1,6 @@
 {% load i18n widget_tweaks %}
-<div class="js-form category-formset__form form-group">
-    <div class="category-formset__form__category">
+<div class="js-form category-formset__form form-group form-row">
+    <div class="category-formset__form__category col pl-0">
         {% if can_delete %}
             <input type="checkbox" name="{{ form.DELETE.html_name }}" id="{{ form.DELETE.id_for_label }}" class="category-formset__delete">
         {% endif %}
@@ -11,7 +11,7 @@
         {{ form.name }}
 
         {% if not form.name.value %}
-            <button type="button" class="category-formset__delete-label js-remove-form" title="{% trans 'Remove category' %}">
+            <button type="button" class="category-formset__delete-label js-remove-form col pr-0" title="{% trans 'Remove category' %}">
                 <i class="fa fa-times" aria-label="{% trans 'Remove category' %}"></i>
             </button>
         {% elif can_delete %}
@@ -29,7 +29,7 @@
         <label for="{{ form.name.id_for_label }}" class="sr-only">
             {{ form.name.label }}
         </label>
-        <div class="category-formset__form__icon select-icon">
+        <div class="category-formset__form__icon select-icon col">
             {{ form.icon|add_class:'d-none category-icon-select' }}
         </div>
     {% endif %}