From 83849877749f87b4f0f02ec4f643a76b8356c637 Mon Sep 17 00:00:00 2001 From: nevfy Date: Tue, 6 Aug 2024 20:03:54 +0300 Subject: [PATCH] fix: tabs wrap (#160) fixes #156 Co-authored-by: Inex Code Co-authored-by: def Reviewed-on: https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org/pulls/160 Reviewed-by: Inex Code Co-authored-by: nevfy Co-committed-by: nevfy --- .../assets/scss/shortcodes/tabbed-pane.scss | 4 -- .../docsy/layouts/shortcodes/tabpane.html | 7 +++- .../github.com/twbs/bootstrap/scss/_nav.scss | 14 ++++--- .../twbs/bootstrap/scss/_reboot.scss | 4 +- assets/scss/_variables_project.scss | 6 ++- assets/scss/docsy_overrides.scss | 39 +------------------ 6 files changed, 21 insertions(+), 53 deletions(-) diff --git a/_vendor/github.com/google/docsy/assets/scss/shortcodes/tabbed-pane.scss b/_vendor/github.com/google/docsy/assets/scss/shortcodes/tabbed-pane.scss index c300811..c2cfcd0 100644 --- a/_vendor/github.com/google/docsy/assets/scss/shortcodes/tabbed-pane.scss +++ b/_vendor/github.com/google/docsy/assets/scss/shortcodes/tabbed-pane.scss @@ -11,10 +11,6 @@ max-width: 100%; } margin-top: 0rem; - margin-bottom: 1.5rem; - border-left: 1px solid rgba(0, 0, 0, 0.125); - border-right: 1px solid rgba(0, 0, 0, 0.125); - border-bottom: 1px solid rgba(0, 0, 0, 0.125); } } diff --git a/_vendor/github.com/google/docsy/layouts/shortcodes/tabpane.html b/_vendor/github.com/google/docsy/layouts/shortcodes/tabpane.html index 8b01566..3dca84d 100644 --- a/_vendor/github.com/google/docsy/layouts/shortcodes/tabpane.html +++ b/_vendor/github.com/google/docsy/layouts/shortcodes/tabpane.html @@ -56,8 +56,10 @@ {{ $persistKeyList := slice -}} {{ $tabPaneOrdinal := .Ordinal -}} + +
{{/* Nav tabs */ -}} -
    +
      {{ range $index, $element := $.Scratch.Get "tabs" -}} {{ $enabled := not $element.disabled -}} @@ -108,7 +110,7 @@ {{ $isActive := and $enabled (not $activeSet) -}} -
diff --git a/_vendor/github.com/twbs/bootstrap/scss/_nav.scss b/_vendor/github.com/twbs/bootstrap/scss/_nav.scss index 9efc03b..d836a3b 100644 --- a/_vendor/github.com/twbs/bootstrap/scss/_nav.scss +++ b/_vendor/github.com/twbs/bootstrap/scss/_nav.scss @@ -106,7 +106,7 @@ // scss-docs-start nav-pills-css-vars --#{$prefix}nav-pills-border-radius: #{$nav-pills-border-radius}; --#{$prefix}nav-pills-link-active-color: #{$nav-pills-link-active-color}; - --#{$prefix}nav-pills-link-active-bg: #{$nav-pills-link-active-bg}; + // --#{$prefix}nav-pills-link-active-bg: #{$nav-pills-link-active-bg}; // scss-docs-end nav-pills-css-vars .nav-link { @@ -119,12 +119,13 @@ background-color: transparent; border-color: transparent; } - } - .nav-link.active, - .show > .nav-link { - color: var(--#{$prefix}nav-pills-link-active-color); - @include gradient-bg(var(--#{$prefix}nav-pills-link-active-bg)); + &.active { + color: $dark !important; + font-weight: 500; + background-color: white; + box-shadow: $shadow; + } } } @@ -163,6 +164,7 @@ // Hide tabbable panes to start, show them when `.active` .tab-content { + box-shadow: $shadow; > .tab-pane { display: none; } diff --git a/_vendor/github.com/twbs/bootstrap/scss/_reboot.scss b/_vendor/github.com/twbs/bootstrap/scss/_reboot.scss index 8ac7903..582868f 100644 --- a/_vendor/github.com/twbs/bootstrap/scss/_reboot.scss +++ b/_vendor/github.com/twbs/bootstrap/scss/_reboot.scss @@ -456,7 +456,9 @@ button, @if $enable-button-pointers { &:not(:disabled) { - cursor: pointer; // 3 + &:not(.active) { + cursor: pointer; // 3 + } } } } diff --git a/assets/scss/_variables_project.scss b/assets/scss/_variables_project.scss index 2a1cf93..aa942bb 100644 --- a/assets/scss/_variables_project.scss +++ b/assets/scss/_variables_project.scss @@ -10,7 +10,7 @@ $gray: #616161; $dark: #30312C; $bg-color: whitesmoke; -$shadow: 0 8px 8px rgba(0, 0, 0, 0.25); +$shadow: 0 8px 8px rgba(0, 0, 0, 0.10); $td-enable-google-fonts: false; $google_font_name: "Montserrat"; @@ -23,4 +23,6 @@ $font-weight-bold: 600; $navbar-dark-color: rgba($secondary, 0.8) !default; $navbar-dark-hover-color: rgba($secondary, 1) !default; $navbar-dark-active-color: $secondary !default; -$navbar-dark-disabled-color: rgba($secondary, 0.25) !default; \ No newline at end of file +$navbar-dark-disabled-color: rgba($secondary, 0.25) !default; + +$nav-link-padding-x: 1.5rem; \ No newline at end of file diff --git a/assets/scss/docsy_overrides.scss b/assets/scss/docsy_overrides.scss index 5fc4405..d2e4224 100644 --- a/assets/scss/docsy_overrides.scss +++ b/assets/scss/docsy_overrides.scss @@ -25,10 +25,6 @@ ul.ul-0 li a.tree-root, h5.taxonomy-title { display: none !important; } - -.nav-item { - margin-right: .5rem !important; - } .td-sidebar-nav-active-item { color: $primary !important; @@ -71,7 +67,7 @@ h5.taxonomy-title { .tab-content { .tab-pane { border: 1px solid rgba(0, 0, 0, 0.125) !important; - border-radius: 0px .25rem .25rem .25rem; + border-radius: .25rem; max-width: 100% !important; } ul li, ol li { @@ -81,17 +77,6 @@ h5.taxonomy-title { transition: none; } } - -.nav-tabs { - border: none !important; - a:not(.active).nav-link:hover { - background-color: #0d6efd11; - } -} - -.nav-item { - margin-right: .5rem !important; -} .dropdown-menu { right: 0; @@ -117,28 +102,6 @@ li:has(input[type="checkbox"]) { .tab-content { .tab-pane { border: none !important; - box-shadow: $shadow; - } - div { - transition: none; - } -} - -.nav-tabs { - border: none !important; - - .nav-item { - .nav-link { - border: none !important; - box-shadow: $shadow; - margin-bottom: -4px; - } - .nav-link.active { - border-color: transparent transparent white transparent !important; - } - } - a:not(.active).nav-link:hover { - background-color: #0d6efd11; } }