You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2021/01/13 19:08:20 UTC

[myfaces-tobago] 01/02: TOBAGO-2044: Evaluate use of Bootstrap 5

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit e9bb2bc3e84456f9eae003fadf7c437c93ef4943
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Jan 13 18:07:28 2021 +0100

    TOBAGO-2044: Evaluate use of Bootstrap 5
    
    update to 5.0.0-beta1
---
 tobago-core/npm/scss/_variables.scss | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/tobago-core/npm/scss/_variables.scss b/tobago-core/npm/scss/_variables.scss
index e4a4c1f..698899e 100644
--- a/tobago-core/npm/scss/_variables.scss
+++ b/tobago-core/npm/scss/_variables.scss
@@ -358,7 +358,7 @@ $gutters: $spacers !default;
 
 // Container padding
 
-$container-padding-x: $grid-gutter-width !default;
+$container-padding-x: $grid-gutter-width / 2 !default;
 
 
 // Components
@@ -700,7 +700,7 @@ $input-transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out !d
 
 $form-check-input-width: 1em !default;
 $form-check-min-height: $font-size-base * $line-height-base !default;
-$form-check-padding-left: $form-check-input-width + .5em !default;
+$form-check-padding-start:                $form-check-input-width + .5em !default;
 $form-check-margin-bottom: .125rem !default;
 $form-check-label-color: null !default;
 $form-check-label-cursor: null !default;
@@ -732,7 +732,7 @@ $form-check-btn-check-disabled-opacity: $btn-disabled-opacity !default;
 
 $form-switch-color: rgba(0, 0, 0, .25) !default;
 $form-switch-width: 2em !default;
-$form-switch-padding-left: $form-switch-width + .5em !default;
+$form-switch-padding-start:       $form-switch-width + .5em !default;
 $form-switch-bg-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='3' fill='#{$form-switch-color}'/></svg>") !default;
 $form-switch-border-radius: $form-switch-width !default;
 
@@ -743,7 +743,7 @@ $form-switch-checked-color: $component-active-color !default;
 $form-switch-checked-bg-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='3' fill='#{$form-switch-checked-color}'/></svg>") !default;
 $form-switch-checked-bg-position: right center !default;
 
-$form-check-inline-margin-right: 1rem !default;
+$form-check-inline-margin-end:    1rem !default;
 
 $input-group-addon-padding-y: $input-padding-y !default;
 $input-group-addon-padding-x: $input-padding-x !default;
@@ -769,7 +769,7 @@ $form-select-bg-size: 16px 12px !default; // In pixels because image dimensions
 $form-select-indicator-color: $gray-800 !default;
 $form-select-indicator: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'><path fill='none' stroke='#{$form-select-indicator-color}' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/></svg>") !default;
 
-$form-select-feedback-icon-padding-right: add(1em * .75, (2 * $form-select-padding-y * .75) + $form-select-padding-x + $form-select-indicator-padding) !default;
+$form-select-feedback-icon-padding-end: add(1em * .75, (2 * $form-select-padding-y * .75) + $form-select-padding-x + $form-select-indicator-padding) !default;
 $form-select-feedback-icon-position: center right ($form-select-padding-x + $form-select-indicator-padding) !default;
 $form-select-feedback-icon-size: $input-height-inner-half $input-height-inner-half !default;
 
@@ -900,7 +900,7 @@ $navbar-brand-font-size: $font-size-lg !default;
 $nav-link-height: $font-size-base * $line-height-base + $nav-link-padding-y * 2 !default;
 $navbar-brand-height: $navbar-brand-font-size * $line-height-base !default;
 $navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) / 2 !default;
-$navbar-brand-margin-right: 1rem !default;
+$navbar-brand-margin-end:           1rem !default;
 
 $navbar-toggler-padding-y: .25rem !default;
 $navbar-toggler-padding-x: .75rem !default;
@@ -990,7 +990,7 @@ $pagination-color: $link-color !default;
 $pagination-bg: $white !default;
 $pagination-border-width: $border-width !default;
 $pagination-border-radius: $border-radius !default;
-$pagination-margin-left: -$pagination-border-width !default;
+$pagination-margin-start:           -$pagination-border-width !default;
 $pagination-border-color: $gray-300 !default;
 
 $pagination-focus-color: $link-hover-color !default;
@@ -1129,6 +1129,7 @@ $toast-border-width: 1px !default;
 $toast-border-color: rgba(0, 0, 0, .1) !default;
 $toast-border-radius: $border-radius !default;
 $toast-box-shadow: $box-shadow !default;
+$toast-spacing:                     $container-padding-x !default;
 
 $toast-header-color: $gray-600 !default;
 $toast-header-background-color: rgba($white, .85) !default;
@@ -1266,15 +1267,16 @@ $figure-caption-color: $gray-600 !default;
 // Breadcrumbs
 
 $breadcrumb-font-size: null !default;
-$breadcrumb-padding-y: $spacer / 2 !default;
-$breadcrumb-padding-x: $spacer !default;
+$breadcrumb-padding-y:              0 !default;
+$breadcrumb-padding-x:              0 !default;
 $breadcrumb-item-padding-x: .5rem !default;
 $breadcrumb-margin-bottom: 1rem !default;
-$breadcrumb-bg: $gray-200 !default;
+$breadcrumb-bg:                     null !default;
 $breadcrumb-divider-color: $gray-600 !default;
 $breadcrumb-active-color: $gray-600 !default;
 $breadcrumb-divider: quote("/") !default;
-$breadcrumb-border-radius: $border-radius !default;
+$breadcrumb-divider-flipped:        $breadcrumb-divider !default;
+$breadcrumb-border-radius:          null !default;
 
 // Carousel