after review

ezsystems · Dec 19, 2017 · 8b062ef · 8b062ef
1 parent c279d26
commit 8b062ef
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 64 deletions.
diff --git a/src/bundle/Resources/public/scss/_buttons.scss b/src/bundle/Resources/public/scss/_buttons.scss
@@ -70,43 +70,39 @@
     justify-content: center;
 }
 
-.ez-modal {
-    &--send-to-trash {
-        .modal-header {
-            .close {
-                position: absolute;
-                right: 1rem;
-            }
+.ez-modal--send-to-trash {
+    .modal-header {
+        .close {
+            position: absolute;
+            right: 1rem;
         }
+    }
 
-        .modal-footer {
-            .btn {
-                line-height: 1.25;
-                padding: .5rem .75rem;
-            }
+    .modal-footer {
+        .btn {
+            line-height: 1.25;
+            padding: .5rem .75rem;
+        }
 
-            .btn-secondary {
-                background-color: $ez-color-base-medium;
-                border-color: $ez-color-base-medium;
+        .btn-secondary {
+            background-color: $ez-color-base-medium;
+            border-color: $ez-color-base-medium;
 
-                &:hover {
-                    background-color: darken($ez-color-base-medium, 15%);
-                    border-color: darken($ez-color-base-medium, 15%);
-                }
+            &:hover {
+                background-color: $ez-ground-base-medium-hover;
+                border-color: $ez-ground-base-medium-hover;
             }
         }
     }
 }
 
 .ez-content-view,
 .ez-trash-list-view {
-    .ez-modal {
-        &--send-to-trash {
-            .modal-footer {
-                .btn {
-                    font-size: 1rem;
-                    padding-bottom: .5rem;
-                }
+    .ez-modal--send-to-trash {
+        .modal-footer {
+            .btn {
+                font-size: 1rem;
+                padding-bottom: .5rem;
             }
         }
     }

diff --git a/src/bundle/Resources/public/scss/_custom.scss b/src/bundle/Resources/public/scss/_custom.scss
@@ -18,6 +18,7 @@ $ez-ground-base-pale: #fafafa;
 $ez-ground-base-light: #f5f5f5;
 $ez-ground-base: #f3f3f3;
 $ez-ground-base-medium: #ededed;
+$ez-ground-base-medium-hover: darken($ez-color-base-medium, 15%);
 $ez-ground-base-dark: #e5e3e3;
 $ez-color-base-pale: #dbdbdb;
 $ez-color-base-light: #878787;

diff --git a/src/bundle/Resources/public/scss/_modals.scss b/src/bundle/Resources/public/scss/_modals.scss
@@ -1,43 +1,39 @@
-.ez-modal {
-    &--send-to-trash {
-        .modal-dialog {
-            background-color: $ez-ground-base-medium;
-            border-radius: .25rem;
-        }
+.ez-modal--send-to-trash {
+    .modal-dialog {
+        background-color: $ez-ground-base-medium;
+        border-radius: .25rem;
+    }
 
-        .modal-header {
-            border-bottom: none;
-            padding: 15px 15px 0 15px;
-            position: relative;
-            min-height: 2.5rem;
-        }
+    .modal-header {
+        border-bottom: none;
+        padding: 15px 15px 0 15px;
+        position: relative;
+        min-height: 2.5rem;
+    }
 
-        .modal-body {
-            padding: 15px 30px;
+    .modal-body {
+        padding: 15px 30px;
 
-            .ez-modal-body__main,
-            .ez-modal-body__explanation {
-                margin-bottom: 0;
-            }
+        .ez-modal-body__main,
+        .ez-modal-body__explanation {
+            margin-bottom: 0;
         }
+    }
 
-        .modal-footer {
-            border-top: none;
-        }
+    .modal-footer {
+        border-top: none;
     }
 }
 
 .ez-trash-list-view {
-    .ez-modal {
-        &--send-to-trash {
-            .modal-body {
-                .ez-modal-body__main {
-                    font-weight: 700;
-                }
+    .ez-modal--send-to-trash {
+        .modal-body {
+            .ez-modal-body__main {
+                font-weight: 700;
+            }
 
-                .ez-modal-body__explanation {
-                    font-size: .9375rem;
-                }
+            .ez-modal-body__explanation {
+                font-size: .9375rem;
             }
         }
     }

diff --git a/src/bundle/Resources/views/admin/bulk_delete_confirmation_modal.html.twig b/src/bundle/Resources/views/admin/bulk_delete_confirmation_modal.html.twig
@@ -1,4 +1,4 @@
-<div class="modal fade ez-modal--send-to-trash" id="{{ id }}" tabindex="-1" role="dialog">
+<div class="modal fade ez-modal ez-modal--send-to-trash" id="{{ id }}" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">

diff --git a/src/bundle/Resources/views/admin/content_type/delete_confirmation_modal.html.twig b/src/bundle/Resources/views/admin/content_type/delete_confirmation_modal.html.twig
@@ -1,6 +1,6 @@
 {% trans_default_domain 'content_type' %}
 
-<div class="modal fade ez-modal--send-to-trash" id="delete-content-type-modal" tabindex="-1" role="dialog">
+<div class="modal fade ez-modal ez-modal--send-to-trash" id="delete-content-type-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">

diff --git a/src/bundle/Resources/views/admin/language/delete_confirmation_modal.html.twig b/src/bundle/Resources/views/admin/language/delete_confirmation_modal.html.twig
@@ -1,6 +1,6 @@
 {% trans_default_domain 'language' %}
 
-<div class="modal fade ez-modal--send-to-trash" id="delete-language-modal" tabindex="-1" role="dialog">
+<div class="modal fade ez-modal ez-modal--send-to-trash" id="delete-language-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
@@ -12,8 +12,8 @@
                 <p>{{ 'language.modal.message'|trans|desc('Do you want to delete Language?') }}</p>
             </div>
             <div class="modal-footer">
-                {{ form_widget(deleteForm.delete, { 'attr': {'class': 'btn btn-danger'} }) }}
                 <button type="button" class="btn btn-secondary btn--no" data-dismiss="modal">{{ 'language.form.cancel'|trans|desc('Cancel') }}</button>
+                {{ form_widget(deleteForm.delete, { 'attr': {'class': 'btn btn-danger'} }) }}
             </div>
         </div>
     </div>

diff --git a/src/bundle/Resources/views/admin/section/delete_confirmation_modal.html.twig b/src/bundle/Resources/views/admin/section/delete_confirmation_modal.html.twig
@@ -1,4 +1,4 @@
-<div class="modal fade ez-modal--send-to-trash" id="delete-section-modal" tabindex="-1" role="dialog">
+<div class="modal fade ez-modal ez-modal--send-to-trash" id="delete-section-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">

diff --git a/src/bundle/Resources/views/admin/trash/empty_trash_confirmation_modal.html.twig b/src/bundle/Resources/views/admin/trash/empty_trash_confirmation_modal.html.twig
@@ -1,6 +1,6 @@
 {% form_theme form 'EzPlatformAdminUiBundle:parts/form:flat_widgets.html.twig' %}
 
-<div class="modal fade ez-modal--send-to-trash" id="confirmEmptyTrash" tabindex="-1" role="dialog" aria-labelledby="confirmEmptyTrash"
+<div class="modal fade ez-modal ez-modal--send-to-trash" id="confirmEmptyTrash" tabindex="-1" role="dialog" aria-labelledby="confirmEmptyTrash"
      aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">

diff --git a/src/bundle/Resources/views/bulk_delete_confirmation_modal.html.twig b/src/bundle/Resources/views/bulk_delete_confirmation_modal.html.twig
@@ -1,4 +1,4 @@
-<div class="modal fade ez-modal--send-to-trash" id="{{ id }}" tabindex="-1" role="dialog">
+<div class="modal fade ez-modal ez-modal--send-to-trash" id="{{ id }}" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">

diff --git a/src/bundle/Resources/views/content/modal_location_trash.html.twig b/src/bundle/Resources/views/content/modal_location_trash.html.twig
@@ -1,4 +1,4 @@
-<div class="modal fade ez-modal--send-to-trash" id="trash-location-modal" tabindex="-1" role="dialog">
+<div class="modal fade ez-modal ez-modal--send-to-trash" id="trash-location-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">