From e55dc49e3461a5feecef274e1f033b7d4b9c69b1 Mon Sep 17 00:00:00 2001 From: djmaze Date: Thu, 11 Feb 2021 10:58:33 +0100 Subject: [PATCH] Cleanup some bootstrap css --- dev/Styles/_BootstrapFix.less | 45 ++--------------------- vendors/bootstrap/less/button-groups.less | 1 - vendors/bootstrap/less/buttons.less | 11 ++---- vendors/bootstrap/less/forms.less | 41 +++------------------ 4 files changed, 12 insertions(+), 86 deletions(-) diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index 165480193..8d93e281b 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -21,7 +21,7 @@ label.inline, span.inline { small { font-size: @baseLineHeight * .75; color: @grayLight; - }; + } } .legend + .control-group { @@ -29,7 +29,7 @@ label.inline, span.inline { -webkit-margin-top-collapse: separate; } -.input-append input, .input-append select, .input-append .uneditable-input { +.input-append input, .input-append select { border-radius: 3px; } @@ -81,34 +81,10 @@ label.inline, span.inline { } } -.btn { -// &:active { -// .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.3), 0 0 0 rgba(0,0,0,.1)"); -// } - - html.textshadow &{ - - text-shadow: 0 1px 0 #fff; - - &.btn-danger, &.btn-success, &.btn-primary, &.btn-warning { - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.3); - } - } -} - -//.btn-group.open { -// .dropdown-toggle { -// .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.3), 0 0 0 rgba(0,0,0,.1)"); -// } -//} - .dropdown-menu * + .dividerbar { margin-top: 9px; padding-top: 9px; border-top: 1px solid #e5e5e5; -/* - border-image: linear-gradient(to right, #00F 10%, #FFF 10%, #FFF 19%, #F00 19%, #F00 28%, #FFF 28%, #FFF 37%, #00F 37%, #00F 46%, #FFF 46%, #FFF 55%, #F00 55%, #F00 64%, #FFF 64%, #FFF 73%, #00F 73%, #00F 82%, #FFF 82%, #FFF 91%, #F00 91%) 1; -*/ } .btn-group > .btn.single { @@ -127,26 +103,11 @@ label.inline, span.inline { } } -textarea, input[type="text"], input[type="password"], input[type="email"], input[type="search"] { - - border: @rlInputBorderSize solid @inputBorder; - - &:focus { - background-color: #fff; - border: @rlInputBorderSize solid darken(@inputBorder, 20%); - box-shadow: none; - } -} - -input[type="text"], input[type="password"], input[type="email"], input[type="search"] { +input:not([type="radio"]):not([type="checkbox"]):not([type="hidden"]) { height: @baseLineHeight - (@rlInputBorderSize - 1) * 2; line-height: @baseLineHeight - (@rlInputBorderSize - 1) * 2; } -select { - border: @rlInputBorderSize solid @inputBorder; -} - .alert a { text-decoration: underline; } diff --git a/vendors/bootstrap/less/button-groups.less b/vendors/bootstrap/less/button-groups.less index ee81b6098..59a342836 100644 --- a/vendors/bootstrap/less/button-groups.less +++ b/vendors/bootstrap/less/button-groups.less @@ -37,7 +37,6 @@ .btn-group > .btn + .btn { margin-left: -1px; } -.btn-group > .btn, .btn-group > .dropdown-menu { font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack } diff --git a/vendors/bootstrap/less/buttons.less b/vendors/bootstrap/less/buttons.less index c54705a56..45e64cc1d 100644 --- a/vendors/bootstrap/less/buttons.less +++ b/vendors/bootstrap/less/buttons.less @@ -19,11 +19,12 @@ vertical-align: middle; cursor: pointer; border: 1px solid @btnBorder; - border-color: rgba(0, 0, 0, 0.25) rgba(0, 0, 0, 0.25) rgba(0, 0, 0, 0.25); + border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25); box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); color: @grayDark; text-shadow: 0 -1px 0 rgba(0,0,0,.25); background-color: @btnBackground; + text-decoration: none; // Hover state &:hover { @@ -47,7 +48,7 @@ &.disabled, &[disabled] { cursor: default; - opacity: 0.7; + opacity: 0.7; box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } @@ -102,12 +103,6 @@ color: rgba(255,255,255,.75); } -// Set the backgrounds -// ------------------------- -.btn { - // reset here as of 2.0.3 due to Recess property order - border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25); -} // Warning appears are orange .btn-warning { color: #fff; diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less index fd48377bd..f3571365a 100644 --- a/vendors/bootstrap/less/forms.less +++ b/vendors/bootstrap/less/forms.less @@ -65,20 +65,7 @@ label { // Shared size and type resets select, textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"] { +input:not([type="radio"]):not([type="checkbox"]):not([type="hidden"]) { display: inline-block; height: @baseLineHeight; padding: 4px 6px; @@ -101,20 +88,7 @@ textarea { } // Everything else textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"] { +input:not([type="radio"]):not([type="checkbox"]):not([type="hidden"]) { background-color: @inputBackground; border: 1px solid @inputBorder; box-shadow: inset 0 1px 1px rgba(0,0,0,.075); @@ -122,9 +96,10 @@ input[type="color"] { // Focus state &:focus { - border-color: rgba(82,168,236,.8); + background-color: #fff; + border-color: darken(@inputBorder, 20%); + box-shadow: none; outline: 0; - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } } @@ -138,10 +113,6 @@ input[type="checkbox"] { // Reset width of input images, buttons, radios, checkboxes input[type="file"], -input[type="image"], -input[type="submit"], -input[type="reset"], -input[type="button"], input[type="radio"], input[type="checkbox"] { width: auto; // Override of generic input selector @@ -157,7 +128,7 @@ input[type="file"] { // Make select elements obey height by applying a border select { width: 223px; // default input width + 10px of padding that doesn't get applied - border: 1px solid #bbb; + border: 1px solid @inputBorder; background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color }