assest/form_control: updating upload btn and bootstrap issues fixes #…

…1841
liqd · Apr 27, 2020 · aa169bb · aa169bb
1 parent f279d8c
commit aa169bb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
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_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/_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/templates/a4dashboard/includes/project_list_item.html b/euth_wagtail/templates/a4dashboard/includes/project_list_item.html
@@ -52,7 +52,7 @@ <h2 class="dashboard-list-name">
                                     </form>
                                 </li>
                                 <li class="dropdown-item">
-                                    <a href="#" class="dropdown-item u-fontweight-normal" data-toggle="modal" data-target="#project{{ project.pk }}DeleteModal">
+                                    <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>