From 8b76b5fb90876f9ea65f25897df29cc11a2c1196 Mon Sep 17 00:00:00 2001 From: Diana Whitten Date: Tue, 15 Mar 2016 15:32:39 -0700 Subject: [PATCH] Initial Clean Up Old Styles in _debt.scss Unnecessary Styles: * #create_container_form .modal-footer * .list-bullet * dt Can't find usage: * .btn-inline * #actions.single * div.input input[type="checkbox"] * .item_detail Not used any longer: * .modal-body fieldset .form-field select[data-add-item-url Change-Id: Ibfeeec84a58d4dffaa669fc48f27cac02a2011c7 Partially-implements: blueprint horizon-theme-css-reorg --- .../static/dashboard/scss/_debt.scss | 69 ------------------- .../dashboard/scss/components/_forms.scss | 14 +++- .../dashboard/scss/components/_messages.scss | 7 ++ openstack_dashboard/templates/base.html | 2 +- 4 files changed, 19 insertions(+), 73 deletions(-) diff --git a/openstack_dashboard/static/dashboard/scss/_debt.scss b/openstack_dashboard/static/dashboard/scss/_debt.scss index 2671b49149..8a86e8b766 100644 --- a/openstack_dashboard/static/dashboard/scss/_debt.scss +++ b/openstack_dashboard/static/dashboard/scss/_debt.scss @@ -1,51 +1,20 @@ /* The styles in this file need to be researched and/or removed when possible */ -#create_container_form .modal-footer { - margin-top: 190px; -} - #usage { margin-bottom: 25px; height: 125px; } -#actions.single { - width: 90px; -} - ul { list-style: none; margin: 0; } -// Disc-styled list. This list should be used to build bullet-items lists. -.list-bullet { - list-style: disc; -} - -dt { - font-weight: bold; -} - -.static_page { - float: left; //should be removed (jtomasek) - background-color: $body-bg; //should be removed (jtomasek) - > form { - margin-bottom: 0; - } -} - // should be removed and replaced by row + col-sm-6 in template .left, .right { @extend .col-sm-6; } -// Fixes issue with bootstrap positioning of modal container -// Note (hurgleburgler) Is this really still an issue? Further research needed -.modal { - top: 0 !important; -} - .dynamic-error { background: $body-bg; border: 1px solid $border-color; @@ -53,15 +22,6 @@ dt { margin-bottom: 0.5em; } -/* Styling for inline object creation buttons */ -.btn-inline { - margin-bottom: 9px; -} -.modal-body fieldset .form-field select[data-add-item-url] { - width: 275px; - margin-right: 2px; -} - /* Styling for draged network object */ #networkListSortContainer { display: none; @@ -165,33 +125,12 @@ dt { background:transparent; } } - -} - -div.input input[type="checkbox"] { - float: left; - width: 25px; -} - -.javascript_disabled_alert { - @extend .alert-danger; - border-bottom-style: solid; - border-bottom-width: 1px; - padding: 8px; - text-align: center; } iframe { border: none; } -.item_detail ul li label { - color: $text-color; - font-weight: bold; - display: block; - margin-top: 5px; -} - .progress_bar { height: 100%; width: 100%; @@ -218,14 +157,6 @@ iframe { background-color: $brand-danger; } -/* Fix for password fields reveal icon */ -.form-group span.form-control-feedback.fa { - line-height: 32px; -} -.has-feedback .form-control-feedback { - top: 0; -} - /* ============ */ /* Known issues */ /* ============ */ diff --git a/openstack_dashboard/static/dashboard/scss/components/_forms.scss b/openstack_dashboard/static/dashboard/scss/components/_forms.scss index 2ff5e8b028..4e07b54a9e 100644 --- a/openstack_dashboard/static/dashboard/scss/components/_forms.scss +++ b/openstack_dashboard/static/dashboard/scss/components/_forms.scss @@ -1,5 +1,13 @@ /**** Prevent long image names from breaking form layout in Firefox ****/ -.form-group input[type="file"] { - width: 100%; - white-space: normal; +.form-group { + input[type="file"] { + width: 100%; + white-space: normal; + } + + /* Fix for input icon alignment */ + input + .fa { + line-height: $input-height-base; + top: 0; + } } diff --git a/openstack_dashboard/static/dashboard/scss/components/_messages.scss b/openstack_dashboard/static/dashboard/scss/components/_messages.scss index 6d19c6d678..8ed42c2a4b 100644 --- a/openstack_dashboard/static/dashboard/scss/components/_messages.scss +++ b/openstack_dashboard/static/dashboard/scss/components/_messages.scss @@ -23,6 +23,13 @@ } } +.javascript-disabled { + margin-top: $navbar-height; + width: 100%; + position: absolute; + z-index: 1; +} + .alert > ul { padding: 0; } diff --git a/openstack_dashboard/templates/base.html b/openstack_dashboard/templates/base.html index 61a35160db..75dafc864c 100644 --- a/openstack_dashboard/templates/base.html +++ b/openstack_dashboard/templates/base.html @@ -19,7 +19,7 @@