Merge aa169bb into 154dd0c

liqd · Apr 27, 2020 · 3f57396 · 3f57396
2 parents 154dd0c + aa169bb
commit 3f57396
Show file tree

Hide file tree

Showing 20 changed files with 87 additions and 46 deletions.
diff --git a/euth/dashboard/templates/euth_dashboard/dropdown.html b/euth/dashboard/templates/euth_dashboard/dropdown.html
@@ -13,7 +13,7 @@
         {% endif %}
         <span class="dropdown-title text-light">{{ title }}</span>
         {% if orgs %}
-            <span class="caret"></span>
+            <i class="fa fa-caret-down" aria-hidden="true"></i>
         {% endif %}
     </button>
     {% if orgs %}

diff --git a/euth/offlinephases/templates/euth_offlinephases/file_upload_widget.html b/euth/offlinephases/templates/euth_offlinephases/file_upload_widget.html
@@ -15,4 +15,3 @@
         </span>
         {{ file_input }}
     </div>
-
diff --git a/euth/organisations/templates/euth_organisations/organisation_detail.html b/euth/organisations/templates/euth_organisations/organisation_detail.html
@@ -41,10 +41,11 @@ <h1 class="herounit-title">{{ organisation.name }}</h1>
             <h2 class="accordion-title" id="organisation-title">
                 <a class="accordion-link collapsed" role="button" data-toggle="collapse" href="#organisation-panel" aria-expanded="false" aria-controls="organisation-panel">
                     {% trans "More info about" %} {{ organisation.name }}
+                    <i class="fa fa-chevron-down" aria-hidden="true"></i>
                 </a>
             </h2>
 
-            <div class="panel panel-default panel-collapse collapse" id="organisation-panel" role="tabpanel" aria-labelledby="organisation-title" aria-expanded="false">
+            <div class="card card-default card-collapse collapse" id="organisation-panel" role="tabpanel" aria-labelledby="organisation-title" aria-expanded="false">
                 <div class="card-body">
                     <h4>
                         {% trans "Why are we part of OPIN" %}

diff --git a/euth/projects/templates/euth_projects/project_detail.html b/euth/projects/templates/euth_projects/project_detail.html
@@ -84,7 +84,7 @@ <h4>{{ item.name }}</h4>
 {% endwith %}
 <nav class="tabs">
     <div class="container">
-        <ul class="row nav">
+        <ul class="row nav pt-3">
             <li class="col-md-4 nav-item"><a href="#information" data-toggle="tab" class="nav-link tab">{% trans "Information" %}</a></li>
             <li class="col-md-4 nav-item"><a href="#participation" data-toggle="tab" class="nav-link tab active">{% trans "Participation" %}</a></li>
             <li class="col-md-4 nav-item"><a href="#result" data-toggle="tab" class="nav-link tab">{% trans "Result" %}</a></li>

diff --git a/euth_wagtail/assets/scss/components/_accordion.scss b/euth_wagtail/assets/scss/components/_accordion.scss
@@ -2,8 +2,14 @@
     text-align: left;
     background: #f4f4f4;
 
-    .panel {
+    .card {
         margin-bottom: 9px;
+        border-radius: 0;
+    }
+
+    .card-header {
+        padding: 0;
+        background-color: inherit;
     }
 
     .card-body {
@@ -86,7 +92,7 @@
     .accordion-link {
         font-size: $font-size-medium;
         padding: 15px 50px 12px 15px;
-        border: 1px solid $brand-brand1;
+        // border: 1px solid $brand-brand1;
         position: relative;
         color: #fff;
 

diff --git a/euth_wagtail/assets/scss/components/_alerts.scss b/euth_wagtail/assets/scss/components/_alerts.scss
@@ -1,3 +1,7 @@
+.alert {
+    border-radius: 0;
+}
+
 .alert-text {
     text-align: center;
 }
@@ -6,6 +10,10 @@
     @extend .alert-danger;
 }
 
+.alert--info {
+    @extend .alert-info;
+}
+
 .alert--success {
     @extend .alert-success;
 }

diff --git a/euth_wagtail/assets/scss/components/_blueprints.scss b/euth_wagtail/assets/scss/components/_blueprints.scss
@@ -31,6 +31,7 @@
         padding: 15px 0;
         margin: 0 0 0 0;
         color: #fff;
+        font-size: $font-size-large;
     }
 
     .blueprint-image {

diff --git a/euth_wagtail/assets/scss/components/_breadcrumb.scss b/euth_wagtail/assets/scss/components/_breadcrumb.scss
@@ -1,6 +1,7 @@
 .breadcrumb {
     list-style: none;
     padding-left: 0;
+    background-color: inherit;
 
     li {
         display: inline-block;

diff --git a/euth_wagtail/assets/scss/components/_dropdown.scss b/euth_wagtail/assets/scss/components/_dropdown.scss
@@ -2,10 +2,11 @@
     border-radius: 0;
 }
 
-.dropdown-item {
+.dropdown-item,
+.dropdown-menu li {
     border-bottom: 2px solid $gray-lighter;
     width: 100%;
-    padding: 0.5$spacer $spacer;
+    padding: 0.5*$spacer $spacer;
     text-align: left;
 }
 

diff --git a/euth_wagtail/assets/scss/components/_filter_bar.scss b/euth_wagtail/assets/scss/components/_filter_bar.scss
@@ -90,6 +90,10 @@
     .filter-element {
         width: 100%;
     }
+
+    .btn-group {
+        display: inline-block;
+    }
 }
 
 .no-results {

diff --git a/euth_wagtail/assets/scss/components/_menus.scss b/euth_wagtail/assets/scss/components/_menus.scss
@@ -58,7 +58,7 @@ body {
     }
 
     .dropdown-text {
-        padding-left: 30px;
+        padding-left: $spacer;
     }
 
     .logout-button-form {

diff --git a/euth_wagtail/assets/scss/components/_progress.scss b/euth_wagtail/assets/scss/components/_progress.scss
@@ -2,6 +2,8 @@
     list-style: none;
     padding-left: 0;
     overflow: hidden;
+    height: auto;
+    background-color: inherit; 
 
     > li {
         padding: 4px 10px;

diff --git a/euth_wagtail/assets/scss/components/forms/_form-control-upload.scss b/euth_wagtail/assets/scss/components/forms/_form-control-upload.scss
@@ -23,10 +23,11 @@
         line-height: 48px;
     }
 
-    .btn-secondary {
+    .btn-secondary,
+    .btn-default {
         font-size: 24px;
         width: 48px;
-        background: $brand-success;
+        background-color: $brand-success;
         border: 0;
         color: #fff;
         padding: 0;

diff --git a/euth_wagtail/assets/scss/components/forms/_general-form.scss b/euth_wagtail/assets/scss/components/forms/_general-form.scss
@@ -2,7 +2,7 @@
     margin-bottom: 40px;
 
     label {
-        font-size: $font-size-small;
+        font-size: $font-size-base;
         height: 16px;
         font-weight: bold;
         font-family: $font-family-sans-serif;
@@ -74,7 +74,7 @@
 
 .form-help-text {
     font-style: italic;
-    font-size: $font-size-small;
+    font-size: $font-size-base;
 }
 
 .form-hint {

diff --git a/euth_wagtail/assets/scss/core/_bootstrap-variables.scss b/euth_wagtail/assets/scss/core/_bootstrap-variables.scss
@@ -4,7 +4,6 @@ $bootstrap-sass-asset-helper: false !default;
 // Variables
 // --------------------------------------------------
 
-
 //== Colors
 //
 //## Gray and brand colors for use across Bootstrap.
@@ -23,11 +22,16 @@ $brand-brand4:          #ef3789; // Pink
 $brand-brand5:          #3c487d; // Purple
 $brand-brand6:          #ffd102; // Yellow
 
+$primary:               $brand-brand1 !default;
 $brand-primary:         $brand-brand1 !default;
-$brand-success:         #7ed321 !default;
-$brand-info:            #41a9e0 !default;
-$brand-warning:         $brand-brand2 !default;
-$brand-danger:          #e01431 !default;
+$success:               #7ed321 !default;
+$brand-success:         $success !default;
+$info:                  #41a9e0 !default;
+$brand-info:            $info !default;
+$warning:               $brand-brand2 !default;
+$brand-warning:         $warning !default;
+$danger:                #e01431 !default;
+$brand-danger:          $danger !default;
 
 $black:                 $gray-darker;
 
@@ -716,19 +720,19 @@ $list-group-link-heading-color: #333 !default;
 //
 //##
 
-$panel-bg:                    #fff !default;
+// $panel-bg:                    #fff !default;
 $card-body-padding:           1rem !default;
 $card-header-padding:         1rem !default;
 $card-footer-padding:         $card-header-padding !default;
-$panel-border-radius:         $border-radius-base !default;
+// $panel-border-radius:         $border-radius-base !default;
 
 //** Border color for elements within panels
-$panel-inner-border:          #ddd !default;
+// $panel-inner-border:          #ddd !default;
 $card-footer-bg:              #f5f5f5 !default;
 
-$panel-default-text:          $gray-dark !default;
-$panel-default-border:        #ddd !default;
-$panel-default-heading-bg:    #f5f5f5 !default;
+// $panel-default-text:          $gray-dark !default;
+// $panel-default-border:        #ddd !default;
+// $panel-default-heading-bg:    #f5f5f5 !default;
 
 $card-primary-text:          #fff !default;
 $card-primary-border:        $brand-primary !default;

diff --git a/euth_wagtail/assets/scss/core/_buttons.scss b/euth_wagtail/assets/scss/core/_buttons.scss
@@ -41,6 +41,7 @@ button {
     border: 0;
     font-weight: bold;
     transition: color 0.2s, background 0.2s;
+    border-radius: 0;
 }
 
 .btn-sm {

diff --git a/euth_wagtail/assets/scss/wagtail-blocks/_blocks.scss b/euth_wagtail/assets/scss/wagtail-blocks/_blocks.scss
@@ -1,6 +1,5 @@
 .block-title,
 .page-title {
-    font-size: $font-size-xlarge;
     margin: 0 0 25px 0;
     text-align: center;
 }
@@ -109,9 +108,6 @@
     h5,
     h6 {
         @extend .block-title;
-        font-size: $font-size-large;
-        margin: 0 0 $font-size-large;
-        text-align: center;
     }
 
     p {

diff --git a/euth_wagtail/assets/scss/wagtail-blocks/_richtext-block.scss b/euth_wagtail/assets/scss/wagtail-blocks/_richtext-block.scss
@@ -15,3 +15,19 @@
     width: 100%;
     height: 100%;
 }
+
+.richtext-image.full-width {
+    min-width: 100%;
+}
+
+.richtext-image.left {
+    max-width: 65%;
+    float: left;
+    margin-right: $spacer;
+}
+
+.richtext-image.right {
+    max-width: 65%;
+    float: right;
+    margin-left: $spacer;
+}
diff --git a/euth_wagtail/templates/a4dashboard/includes/project_list_item.html b/euth_wagtail/templates/a4dashboard/includes/project_list_item.html
@@ -40,23 +40,23 @@ <h2 class="dashboard-list-name">
                       ...
                         </button>
                             <ul class="dropdown-menu">
-                            <li class="dropdown-item">
-                                <form method="post" class="">
-                                    {% csrf_token %}
-                                    <input type="hidden" name="project_pk" value="{{ project.pk }}">
-                                    <button type="submit" name="duplicate" value="{{ project }}"
-                                            class="">
-                                        <i class="far fa-copy" aria-hidden="true"></i>
-                                        {% trans 'Duplicate' %}
-                                    </button>
-                                </form>
-                            </li>
-                            <li class="dropdown-item">
-                                <a href="#" class="dropdown-item u-fontweight-normal" data-toggle="modal" data-target="#project{{ project.pk }}DeleteModal">
-                                    <i class="fa fa-trash" aria-hidden="true"></i>
-                                    {% trans 'delete' %}
-                                </a>
-                            </li>
+                                <li class="dropdown-item">
+                                    <form method="post" class="">
+                                        {% csrf_token %}
+                                        <input type="hidden" name="project_pk" value="{{ project.pk }}">
+                                        <button type="submit" name="duplicate" value="{{ project }}"
+                                                class="">
+                                            <i class="far fa-copy" aria-hidden="true"></i>
+                                            {% trans 'Duplicate' %}
+                                        </button>
+                                    </form>
+                                </li>
+                                <li class="dropdown-item">
+                                    <a href="#" class="u-fontweight-normal" data-toggle="modal" data-target="#project{{ project.pk }}DeleteModal">
+                                        <i class="fa fa-trash" aria-hidden="true"></i>
+                                        {% trans 'delete' %}
+                                    </a>
+                                </li>
                             </ul>
                     </div>
                 </div>

diff --git a/home/templates/home/blocks/accordion_block.html b/home/templates/home/blocks/accordion_block.html
@@ -1,7 +1,7 @@
 {% load i18n wagtailimages_tags static %}
 <section class="panel-group accordion accordion-content accordion-block block" role="tablist" aria-multiselectable="true">
     {% for item in self.accordion_items %}
-    <div class="panel panel-default">
+    <div class="card card-default">
         <div class="card-header" role="tab" id="headingOne">
             <h3 class="accordion-title">
                 <a class="accordion-link collapsed" role="button" data-toggle="collapse" data-parent=".accordion-block" href="#collapse{{ forloop.counter }}" aria-expanded="false" aria-controls="collapse{{ forloop.counter }}">