diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:42:10 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:42:10 +0200 |
| commit | 2b3017974bc7cd4b3a74f83c956224cfe4e5a918 (patch) | |
| tree | ff6aab8dc6bfa7afbe9ef714ca157ebc0185d2fd /addons/theme_bootswatch/static/lib/bootswatch/simplex/_bootswatch.scss | |
| parent | 8ed8b46f6434a2a3adea69e0134317e30bf9b936 (diff) | |
| parent | 519594e9cab9a6362ef7c3e911605e4507a0a008 (diff) | |
[MERGE] *: migrate Bootstrap 3.3.7 to 4.1.3
See sub-commits for details.
task-49280
Closes https://github.com/odoo/odoo/pull/25045
Diffstat (limited to 'addons/theme_bootswatch/static/lib/bootswatch/simplex/_bootswatch.scss')
| -rw-r--r-- | addons/theme_bootswatch/static/lib/bootswatch/simplex/_bootswatch.scss | 178 |
1 files changed, 69 insertions, 109 deletions
diff --git a/addons/theme_bootswatch/static/lib/bootswatch/simplex/_bootswatch.scss b/addons/theme_bootswatch/static/lib/bootswatch/simplex/_bootswatch.scss index b039d33a311..14cc52984f5 100644 --- a/addons/theme_bootswatch/static/lib/bootswatch/simplex/_bootswatch.scss +++ b/addons/theme_bootswatch/static/lib/bootswatch/simplex/_bootswatch.scss @@ -1,170 +1,130 @@ -// Simplex 3.3.7 +// Simplex 4.1.3 // Bootswatch -// ----------------------------------------------------- + + +// Variables =================================================================== $web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700" !default; -@import url(#{$web-font-path}); +@import url($web-font-path); @mixin btn-shadow($color){ - @include gradient-vertical-three-colors(lighten($color, 3%), $color, 6%, darken($color, 3%)); + @include gradient-y-three-colors(lighten($color, 3%), $color, 6%, darken($color, 3%)); filter: none; - border: 1px solid darken($color, 10%); + border: 1px solid darken($color, 6.5%); } -// Navbar ===================================================================== +// Navbar ====================================================================== .navbar { + border-width: 1px; + border-style: solid; - &-inverse { + &-fixed-top { + border-width: 0 0 1px 0; + } - .badge { - background-color: #fff; - color: $brand-primary; - } + &-fixed-bottom { + border-top-width: 1px 0 0 0; + border-style: solid; } } -// Buttons ==================================================================== +.bg-primary { + background-color: $primary !important; + border-color: darken($primary, 6.5%) !important; +} -.btn { - font-family: $headings-font-family; +.bg-dark { + border-color: darken($dark, 6.5%) !important; } -.btn-default, -.btn-default:hover { - @include btn-shadow($btn-default-bg); +.bg-light { + border-color: darken(#fff, 6.5%); } +// Buttons ===================================================================== + .btn-primary, .btn-primary:hover { - @include btn-shadow($btn-primary-bg); + @include btn-shadow($primary); +} + +.btn-secondary, +.btn-secondary:hover { + @include btn-shadow($secondary); +} + +.btn-secondary:focus, +.btn-secondary:not([disabled]):not(.disabled):active, +.btn-secondary:not([disabled]):not(.disabled).active { + box-shadow: 0 0 0 0.2rem rgba($gray-200, 0.5); } .btn-success, .btn-success:hover { - @include btn-shadow($btn-success-bg); + @include btn-shadow($success); } .btn-info, .btn-info:hover { - @include btn-shadow($btn-info-bg); + @include btn-shadow($info); } .btn-warning, .btn-warning:hover { - @include btn-shadow($btn-warning-bg); + @include btn-shadow($warning); } .btn-danger, .btn-danger:hover { - @include btn-shadow($btn-danger-bg); + @include btn-shadow($danger); } -// Typography ================================================================= - -body { - font-weight: 200; +.btn-dark, +.btn-dark:hover { + @include btn-shadow($dark); } -// Tables ===================================================================== - -th { - color: $headings-color; +.btn-light, +.btn-light:hover { + @include btn-shadow($light); } -// Forms ====================================================================== - -legend { - color: $headings-color; -} +.btn-outline-secondary { + border-color: $gray-400; + color: $gray-400; -label { - font-weight: normal; -} - -.has-warning { - .help-block, - .control-label, - .radio, - .checkbox, - .radio-inline, - .checkbox-inline, - &.radio label, - &.checkbox label, - &.radio-inline label, - &.checkbox-inline label, - .form-control-feedback { - color: $brand-danger; - } - - .form-control, - .form-control:focus { - border-color: $brand-danger; + &:hover { + background-color: $gray-400; + color: $white; } } -.has-error { - .help-block, - .control-label, - .radio, - .checkbox, - .radio-inline, - .checkbox-inline, - &.radio label, - &.checkbox label, - &.radio-inline label, - &.checkbox-inline label, - .form-control-feedback { - color: $brand-primary; - } +// Typography ================================================================== - .form-control, - .form-control:focus { - border-color: $brand-primary; - } -} +// Tables ====================================================================== -.has-success { - .help-block, - .control-label, - .radio, - .checkbox, - .radio-inline, - .checkbox-inline, - &.radio label, - &.checkbox label, - &.radio-inline label, - &.checkbox-inline label, - .form-control-feedback { - color: $brand-success; - } +// Forms ======================================================================= - .form-control, - .form-control:focus { - border-color: $brand-success; - } +legend, +label { + color: $headings-color; } // Navs ======================================================================= -.pager { - a { - color: $headings-color; - } - - a:hover, - .active > a, { - border-color: $brand-primary; - color: #fff; - } +.breadcrumb { + border: 1px solid darken(#fff, 6.5%); +} - .disabled > a { - border-color: $pager-border; +.pagination { + .page-link:hover { + text-decoration: none; } } -// Indicators ================================================================= +// Indicators ================================================================== -// Progress bars ============================================================== +// Progress bars =============================================================== -// Containers =================================================================
\ No newline at end of file +// Containers ================================================================== |
