From d42df3179ae6483c861d7bf2ea116cca68525066 Mon Sep 17 00:00:00 2001 From: Brice Sanchez Date: Sun, 3 Jun 2018 00:36:54 -0400 Subject: [PATCH] Refactor dialog --- .../refinery/components/_dialog.sass | 3 +- .../refinery/components/_form_actions.sass | 91 ++++++++++--------- 2 files changed, 50 insertions(+), 44 deletions(-) diff --git a/core/app/assets/stylesheets/refinery/components/_dialog.sass b/core/app/assets/stylesheets/refinery/components/_dialog.sass index 6f01c341a4..3fdafc4fcd 100644 --- a/core/app/assets/stylesheets/refinery/components/_dialog.sass +++ b/core/app/assets/stylesheets/refinery/components/_dialog.sass @@ -28,7 +28,6 @@ height: 13px margin: -6px 0 0 -104px -.ui-dialog .ui-dialog-titlebar padding: 1.25em border-bottom: 1px solid $line_separator_colour @@ -59,8 +58,10 @@ iframe width: 100% !important + #dialog_container background-color: white + margin: 1em #dialog_container #content .field, .dialog_container .field diff --git a/core/app/assets/stylesheets/refinery/components/_form_actions.sass b/core/app/assets/stylesheets/refinery/components/_form_actions.sass index 7e05c4b78c..0061e57153 100644 --- a/core/app/assets/stylesheets/refinery/components/_form_actions.sass +++ b/core/app/assets/stylesheets/refinery/components/_form_actions.sass @@ -1,50 +1,55 @@ +#page_container + #page + #content + form + position: relative + .form-actions + position: absolute + bottom: -5em + left: 0 + width: 100% + + .form-actions-left, + .form-actions-right + margin: 1.5em 0 + + .form-actions-left + .button + margin-right: 0.25em + + .form-actions-right + text-align: right + + .button + margin-left: 0.25em + form .form-actions - position: absolute - bottom: -5em - left: 0 - width: 100% - - .form-actions-left, - .form-actions-right - margin: 1.5em 0 - - .form-actions-left - .button - margin-right: 0.25em - - .form-actions-right - text-align: right - - .button - margin-left: 0.25em + .button + background: linear-gradient(to bottom, #65c3f7, $base_color) + border: 1px solid $base_color + border-radius: 3px + color: white + cursor: pointer + display: inline-block + font-size: 0.9em + padding: 0.5em 1em + text-decoration: none + &:hover + background: $base_color - .button - background: linear-gradient(to bottom, #65c3f7, $base_color) - border: 1px solid $base_color - border-radius: 3px - color: white - cursor: pointer - display: inline-block - font-size: 0.9em - padding: 0.5em 1em - text-decoration: none - - &:hover - background: $base_color + &#delete_button + background: linear-gradient(to bottom, #de3618, #c73016) + border: 1px solid #b02b13 - &#delete_button - background: linear-gradient(to bottom, #de3618, #c73016) - border: 1px solid #b02b13 + &:hover + background: #c73016 - &:hover - background: #c73016 + &#cancel_button + background: linear-gradient(to bottom, white, #f9fafb) + border: 1px solid #c4cdd5 + color: #666A70 - &#cancel_button - background: linear-gradient(to bottom, white, #f9fafb) - border: 1px solid #c4cdd5 - color: #666A70 - - &:hover - background: #f9fafb + &:hover + background: #f9fafb