From e62f1624e5964411a717c8dd1f09f50cab4058e8 Mon Sep 17 00:00:00 2001 From: Paul Laros Date: Fri, 28 Aug 2020 16:11:17 +0200 Subject: [PATCH 01/29] Upgrade to BS5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 489c8d6..71449b5 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "dependencies": { "@babel/polyfill": "7.10.4", "@fortawesome/fontawesome-free": "5.14.0", - "bootstrap": "4.5.0", + "bootstrap": "^5.0.0-alpha1", "chart.js": "2.9.3", "feather-icons": "4.28.0", "jquery": "3.5.1", From 31eda0a1fdd5cd5e5c0678ce0935b3a9ca8cf493 Mon Sep 17 00:00:00 2001 From: Paul Laros Date: Fri, 28 Aug 2020 16:11:26 +0200 Subject: [PATCH 02/29] Update scss --- src/scss/1-variables/_variables.scss | 46 ++++++++++++++++++++++------ src/scss/3-components/_navbar.scss | 2 +- src/scss/3-components/_tables.scss | 6 ++++ 3 files changed, 44 insertions(+), 10 deletions(-) diff --git a/src/scss/1-variables/_variables.scss b/src/scss/1-variables/_variables.scss index ca442ab..1a6efb6 100644 --- a/src/scss/1-variables/_variables.scss +++ b/src/scss/1-variables/_variables.scss @@ -6,7 +6,7 @@ $font-weight-bold: 600 !default; $font-size-base: .875rem !default; $font-size-lg: .925rem !default; $font-size-sm: .75rem !default; -$headings-font-weight: 400 !default; +$small-font-size: 80% !default; // Spacer $spacer: 1rem !default; @@ -43,12 +43,18 @@ $container-max-widths: ( xl: 1200px ) !default; +$container-padding-x: .75rem !default; + // Options $enable-validation-icons: false !default; // Transitions $transition-base: all .35s ease-in-out !default; +// Options +$enable-rfs: false !default; +$enable-negative-margins: true !default; + // Theme colors $blue: #3B7DDD !default; $indigo: #6610f2 !default; @@ -112,6 +118,10 @@ $social-colors: ( $body-bg: #F7F7FC !default; $body-color: $gray-700 !default; +// Links +$link-decoration: none !default; +$link-hover-decoration: underline !default; + // Common $border-width: 1px !default; @@ -128,6 +138,17 @@ $h4-font-size: $font-size-base * 1.25 !default; $h5-font-size: $font-size-base !default; $h6-font-size: $font-size-base !default; $headings-color: $black !default; +$headings-font-weight: 400 !default; + +// Displays +$display-font-sizes: ( + 1: 6rem, + 2: 5.5rem, + 3: 4.5rem, + 4: 3.5rem, + 5: 3rem, + 6: 2.5rem + ) !default; // Progress $progress-height: 1rem !default; @@ -169,6 +190,10 @@ $alert-padding-y: .95rem !default; $alert-padding-x: .95rem !default; $alert-border-width: 0 !default; +// List group +$list-group-item-padding-y: .75rem !default; +$list-group-item-padding-x: 1.25rem !default; + // Forms $input-bg: $white !default; $input-disabled-bg: $gray-200 !default; @@ -191,11 +216,6 @@ $input-height-sm: calc(#{$input-height-inner-sm} + #{$input-height-border}) !def $input-height-inner-lg: ($font-size-lg * $input-btn-line-height-lg) + ($input-btn-padding-y-lg * 2) !default; $input-height-lg: calc(#{$input-height-inner-lg} + #{$input-height-border}) !default; -// Custom controls -$custom-control-indicator-bg: $white !default; -$custom-control-indicator-border-color: $gray-400 !default; -$custom-control-indicator-disabled-bg: $gray-200 !default; - // Dropdowns $dropdown-link-color: $gray-700 !default; $dropdown-link-hover-bg: $gray-100 !default; @@ -210,11 +230,17 @@ $card-border-color: transparent !default; $card-cap-bg: $white !default; $card-shadow: 0 0 .875rem 0 rgba($dark, 0.05) !default; $card-title-font-weight: $font-weight-normal !default; -$card-spacer-y: 1rem !default; +$card-spacer-y: 1.25rem !default; +$card-spacer-x: 1.25rem !default; +$card-cap-padding-y: 0.75rem !default; +$card-cap-padding-x: $card-spacer-x !default; // Tables -$table-accent-bg: $gray-100 !default; -$table-hover-bg: rgba($black, .0375) !default; +$table-cell-padding-y: .75rem !default; +$table-cell-padding-x: .75rem !default; +$table-cell-padding-y-sm: .3rem !default; +$table-cell-padding-x-sm: .3rem !default; +$table-striped-bg: $gray-100 !default; // Sidebar general $sidebar-width: 260px !default; @@ -307,6 +333,8 @@ $badge-pill-padding-x: .65em !default; // Breadcrumbs $breadcrumb-bg: $gray-200 !default; +$breadcrumb-border-radius: $border-radius !default; +$breadcrumb-color: $gray-300 !default; // Pagination $pagination-padding-y: .3rem !default; diff --git a/src/scss/3-components/_navbar.scss b/src/scss/3-components/_navbar.scss index ca3e444..b2f8301 100644 --- a/src/scss/3-components/_navbar.scss +++ b/src/scss/3-components/_navbar.scss @@ -100,7 +100,7 @@ } } -@include media-breakpoint-down(xs) { +@include media-breakpoint-down(sm) { .navbar { padding: 0.75rem; } diff --git a/src/scss/3-components/_tables.scss b/src/scss/3-components/_tables.scss index 89a4795..283828d 100644 --- a/src/scss/3-components/_tables.scss +++ b/src/scss/3-components/_tables.scss @@ -1,3 +1,9 @@ +.table { + thead, tbody, tfoot, tr, td, th { + border-color: $table-border-color; + } +} + .card { > .dataTables_wrapper .table.dataTable, > .table, From 64f9a6602636c852fd1552fc8141caf85b571043 Mon Sep 17 00:00:00 2001 From: Paul Laros Date: Fri, 28 Aug 2020 16:11:50 +0200 Subject: [PATCH 03/29] Update views --- examples/charts-chartjs.html | 30 ++++--- examples/forms-basic-inputs.html | 120 +++++++------------------- examples/forms-layouts.html | 140 ++++++++++++++++--------------- examples/icons-feather.html | 30 ++++--- examples/index.html | 54 ++++++------ examples/maps-google.html | 30 ++++--- examples/pages-blank.html | 30 ++++--- examples/pages-invoice.html | 30 ++++--- examples/pages-profile.html | 50 ++++++----- examples/pages-settings.html | 56 ++++++------- examples/tables-bootstrap.html | 30 ++++--- examples/ui-alerts.html | 30 ++++--- examples/ui-buttons.html | 30 ++++--- examples/ui-cards.html | 30 ++++--- examples/ui-general.html | 54 ++++++------ examples/ui-grid.html | 30 ++++--- examples/ui-modals.html | 30 ++++--- examples/ui-typography.html | 30 ++++--- 18 files changed, 372 insertions(+), 462 deletions(-) diff --git a/examples/charts-chartjs.html b/examples/charts-chartjs.html index 6ed10d2..89f64e1 100644 --- a/examples/charts-chartjs.html +++ b/examples/charts-chartjs.html @@ -63,7 +63,7 @@ Tools & Components
  • -