From 07011b2fc3a8c7383e0aee11ed909673688f6901 Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Thu, 12 Jan 2017 10:25:15 -0500 Subject: [PATCH 1/2] Updated spacing in modal elements --- awx/ui/client/legacy-styles/ansible-ui.less | 42 ++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index e925bff5d4..2b9d4dfc67 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -729,18 +729,6 @@ legend { .navigation { margin: 15px 0 15px 0; } - .modal-body { - .alert { - padding: 0; - border: none; - margin: 0; - } - .alert-danger { - background-color: @default-bg; - border: none; - color: @default-interface-txt; - } - } .footer-navigation { margin: 10px 0 10px 0; @@ -1638,17 +1626,20 @@ tr td button i { } /* overrides to TB modal */ +.modal-content { + padding: 20px; +} .modal-header { color: @default-interface-txt; - margin: .1em 0; + // margin: .1em 0; white-space: nowrap; width: 90%; overflow: hidden; text-overflow: ellipsis; width: 100%; border: none; - padding: 12px 14px 0 12px; + padding: 0; } .modal { @@ -1677,8 +1668,19 @@ tr td button i { } .modal-body { - padding: 20px 14px 7px 14px; + // padding: 20px 14px 7px 14px; min-height: 120px; + padding: 20px 0; + + .alert { + padding: 0; + margin: 0; + } + .alert-danger { + background-color: @default-bg; + border: none; + color: @default-interface-txt; + } } #prompt-modal .modal-body { @@ -1690,15 +1692,17 @@ tr td button i { } .modal-footer { - padding: .3em 1em .5em .4em; + // padding: .3em 1em .5em .4em; + padding: 0; border: none; + margin-top: 0; .btn.btn-primary { text-transform: uppercase; background-color: @default-succ; border-color: @default-succ; padding: 5px 15px; - margin: .5em .4em .5em 0; + // margin: .5em .4em .5em 0; cursor: pointer; &:hover { @@ -2219,10 +2223,6 @@ a:hover { font-family: 'Open Sans'; } -.modal-body .alert { - padding: 10px; -} - .WorkflowBadge{ background-color: @b7grey; border-radius: 10px; From b046f66cd10a5ac6fdfccb421d0615d2e22e6bed Mon Sep 17 00:00:00 2001 From: kensible Date: Tue, 17 Jan 2017 09:26:52 -0500 Subject: [PATCH 2/2] Added back alert padding and removed comments --- awx/ui/client/legacy-styles/ansible-ui.less | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 2b9d4dfc67..4e239f9dfd 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -1632,7 +1632,6 @@ tr td button i { .modal-header { color: @default-interface-txt; - // margin: .1em 0; white-space: nowrap; width: 90%; overflow: hidden; @@ -1668,12 +1667,11 @@ tr td button i { } .modal-body { - // padding: 20px 14px 7px 14px; min-height: 120px; padding: 20px 0; .alert { - padding: 0; + padding: 10px; margin: 0; } .alert-danger { @@ -1692,7 +1690,6 @@ tr td button i { } .modal-footer { - // padding: .3em 1em .5em .4em; padding: 0; border: none; margin-top: 0; @@ -1702,7 +1699,6 @@ tr td button i { background-color: @default-succ; border-color: @default-succ; padding: 5px 15px; - // margin: .5em .4em .5em 0; cursor: pointer; &:hover {