From 0a78a15b8772855c1af0198ad12eb47e0dae8b93 Mon Sep 17 00:00:00 2001 From: Bryceson Laing Date: Wed, 9 Oct 2024 21:53:11 +0200 Subject: [PATCH] Revert "2.0.1 (#16)" This reverts commit 1e4cb0a695ae7970a5bbb90827cc4642c05aa258. --- package.json | 2 +- src/stylesheets/doi.scss | 21 ++- src/stylesheets/doi/components/_inputs.scss | 2 +- src/stylesheets/doi/components/_modal.scss | 2 +- .../doi/components/_tabs-navs-pagination.scss | 135 +++++++++--------- .../components/_tooltips-and-popovers.scss | 24 ++-- src/stylesheets/doi/globals/_styles.scss | 3 - src/stylesheets/doi/pages/_search.scss | 1 - yarn.lock | 8 +- 9 files changed, 94 insertions(+), 104 deletions(-) delete mode 100644 src/stylesheets/doi/globals/_styles.scss diff --git a/package.json b/package.json index aa1c5fb..b5e191a 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "repository": "https://github.com/datacite/maltipoo", "license": "MIT", "devDependencies": { - "bootstrap": "^5.3.3", + "bootstrap": "4", "bootstrap-sass": "^3.4.3", "cssnano": "^7.0.1", "postcss": "^8.4.38", diff --git a/src/stylesheets/doi.scss b/src/stylesheets/doi.scss index b044a36..e54ae06 100755 --- a/src/stylesheets/doi.scss +++ b/src/stylesheets/doi.scss @@ -1,21 +1,23 @@ /* -Datacite - Bootstrap 5 theme +Datacite - Bootstrap 4 theme ---------------------------------------------*/ @import "variables.scss"; // Core variables and mixins -@import "../../node_modules/bootstrap/scss/bootstrap"; +@import "../../node_modules/bootstrap/scss/functions"; +@import "../../node_modules/bootstrap/scss/variables"; +@import "../../node_modules/bootstrap/scss/mixins"; // Reset and dependencies // @import "../../node_modules/bootstrap/scss/normalize"; -// @import "../../node_modules/bootstrap/scss/print"; +@import "../../node_modules/bootstrap/scss/print"; // @import "bootstrap/glyphicons"; // Core CSS // @import "../../node_modules/bootstrap/scss/scaffolding"; @import "../../node_modules/bootstrap/scss/type"; -// @import "../../node_modules/bootstrap/scss/code"; +@import "../../node_modules/bootstrap/scss/code"; @import "../../node_modules/bootstrap/scss/grid"; @import "../../node_modules/bootstrap/scss/tables"; @import "../../node_modules/bootstrap/scss/forms"; @@ -25,7 +27,7 @@ Datacite - Bootstrap 5 theme // @import "../../node_modules/bootstrap/scss/component-animations"; @import "../../node_modules/bootstrap/scss/dropdown"; @import "../../node_modules/bootstrap/scss/button-group"; -// @import "../../node_modules/bootstrap/scss/input-group"; +@import "../../node_modules/bootstrap/scss/input-group"; @import "../../node_modules/bootstrap/scss/nav"; @import "../../node_modules/bootstrap/scss/navbar"; @import "../../node_modules/bootstrap/scss/breadcrumb"; @@ -33,11 +35,11 @@ Datacite - Bootstrap 5 theme // @import "../../node_modules/bootstrap/scss/pager"; // @import "../../node_modules/bootstrap/scss/labels"; @import "../../node_modules/bootstrap/scss/badge"; -// @import "../../node_modules/bootstrap/scss/jumbotron"; +@import "../../node_modules/bootstrap/scss/jumbotron"; // @import "../../node_modules/bootstrap/scss/thumbnails"; @import "../../node_modules/bootstrap/scss/alert"; @import "../../node_modules/bootstrap/scss/progress"; -// @import "../../node_modules/bootstrap/scss/media"; +@import "../../node_modules/bootstrap/scss/media"; @import "../../node_modules/bootstrap/scss/list-group"; // @import "../../node_modules/bootstrap/scss/panels"; // @import "../../node_modules/bootstrap/scss/responsive-embed"; @@ -99,7 +101,4 @@ Datacite - Bootstrap 5 theme @import "doi/pages/stats-portal"; @import "doi/pages/metadata"; @import "doi/pages/doi"; -@import "doi/pages/repository-finder"; - -// Styles to fix things broken during the upgrade process -@import "doi/globals/styles"; +@import "doi/pages/repository-finder" diff --git a/src/stylesheets/doi/components/_inputs.scss b/src/stylesheets/doi/components/_inputs.scss index 466b973..a9162d1 100755 --- a/src/stylesheets/doi/components/_inputs.scss +++ b/src/stylesheets/doi/components/_inputs.scss @@ -424,7 +424,7 @@ textarea.form-control { height: 45px; } - .btn-close { + .close { z-index: 2; position: relative; color: $turquoise; diff --git a/src/stylesheets/doi/components/_modal.scss b/src/stylesheets/doi/components/_modal.scss index e80d46f..cf79e49 100755 --- a/src/stylesheets/doi/components/_modal.scss +++ b/src/stylesheets/doi/components/_modal.scss @@ -8,7 +8,7 @@ h4 { margin: 0; } - .btn-close { + .close { padding-left: 10px; font-size: 30px; } diff --git a/src/stylesheets/doi/components/_tabs-navs-pagination.scss b/src/stylesheets/doi/components/_tabs-navs-pagination.scss index f6b1774..830b3fd 100755 --- a/src/stylesheets/doi/components/_tabs-navs-pagination.scss +++ b/src/stylesheets/doi/components/_tabs-navs-pagination.scss @@ -7,32 +7,27 @@ margin-bottom: 3em; margin-left: -10px; - .nav-item button { + .nav-link { padding-left: 0; margin-left: 10px; - // margin-bottom: -2px; - border-left: none; - border-right: none; - border-top: none; } .nav-link.active.doi { cursor: pointer; } - button, button:focus, button:hover, .active { + a, a:focus, a:hover, .active { font-size: $font-size-h3; } - button { + a { color: $darker-gray; font-weight: bold; } - button:hover, .active > button:hover { + a:hover, .active > a:hover { color: $medium-gray; font-weight: bold; } - - button:focus, > li > button:focus, .active > button, .active > button:focus, button.active { + a:focus, > li > a:focus, .active > a, .active > a:focus, a.active { color: $turquoise !important; } } @@ -46,7 +41,7 @@ border-bottom: 1px solid $light-gray; margin-bottom: 30px; - .nav > li > button, .nav-link { + .nav > li > a, .nav-link { padding-bottom: 20px; } } @@ -63,16 +58,16 @@ font-size: $font-size-base; font-weight: $font-weight-bold; > li{ - > button{ + > a{ border: 0 none; color: $other-medium-gray; } - > button:hover{ + > a:hover{ color: $font-color; } } - li.active, button.active { + li.active, a.active { color: $font-color; position: relative; @@ -82,7 +77,7 @@ //height: 50px; } - button.active:before{ + a.active:before{ border-bottom: 11px solid $light-gray; border-left: 11px solid rgba(0, 0, 0, 0); border-right: 11px solid rgba(0, 0, 0, 0); @@ -93,7 +88,7 @@ bottom: 0; } - button.active:after{ + a.active:after{ border-bottom: 11px solid $white-color; border-left: 11px solid rgba(0, 0, 0, 0); border-right: 11px solid rgba(0, 0, 0, 0); @@ -111,7 +106,7 @@ > li + li { margin-left: 0; } - > li > button { + > li > a { border: 2px solid $default-color; border-radius: 0; color: $default-color; @@ -120,9 +115,9 @@ padding: 5px 20px; } - > li.active > button, - > li.active > button:hover, - > li.active > button:focus { + > li.active > a, + > li.active > a:hover, + > li.active > a:focus { background-color: $default-color; color: #FFFFFF; } @@ -131,11 +126,11 @@ background-color: $default-color; border: 1px solid white; } - > li:first-child > button{ + > li:first-child > a{ border-radius: 30px 0 0 30px; margin: 0; } - > li:last-child > button{ + > li:last-child > a{ border-radius: 0 30px 30px 0; } @@ -149,11 +144,11 @@ } } -.pagination > li > button, +.pagination > li > a, .pagination > li > span, -.pagination > li:first-child > button, +.pagination > li:first-child > a, .pagination > li:first-child > span, -.pagination > li:last-child > button, +.pagination > li:last-child > a, .pagination > li:last-child > span, // .page-item, .page-link { @@ -166,14 +161,14 @@ min-width: 36px; padding: 3px 12px; } -.pagination > li > button:hover, -.pagination > li > button:focus, -.pagination > li > button:active, -.pagination > li.active > button, +.pagination > li > a:hover, +.pagination > li > a:focus, +.pagination > li > a:active, +.pagination > li.active > a, .pagination > li.active > span, -.pagination > li.active > button:hover, +.pagination > li.active > a:hover, .pagination > li.active > span:hover, -.pagination > li.active > button:focus, +.pagination > li.active > a:focus, .pagination > li.active > span:focus, // .page-item, .page-link { @@ -182,12 +177,12 @@ color: $white-color; } -.nav-pills-primary > li > button, -.pagination-primary > li > button, +.nav-pills-primary > li > a, +.pagination-primary > li > a, .pagination-primary > li > span, -.pagination-primary > li:first-child > button, +.pagination-primary > li:first-child > a, .pagination-primary > li:first-child > span, -.pagination-primary > li:last-child > button, +.pagination-primary > li:last-child > a, .pagination-primary > li:last-child > span, // .page-item, .page-link { @@ -195,17 +190,17 @@ color: $gray; } -.nav-pills-primary > li.active > button, -.nav-pills-primary > li.active > button:hover, -.nav-pills-primary > li.active > button:focus, -.pagination-primary > li > button:hover, -.pagination-primary > li > button:focus, -.pagination-primary > li > button:active, -.pagination-primary > li.active > button, +.nav-pills-primary > li.active > a, +.nav-pills-primary > li.active > a:hover, +.nav-pills-primary > li.active > a:focus, +.pagination-primary > li > a:hover, +.pagination-primary > li > a:focus, +.pagination-primary > li > a:active, +.pagination-primary > li.active > a, .pagination-primary > li.active > span, -.pagination-primary > li.active > button:hover, +.pagination-primary > li.active > a:hover, .pagination-primary > li.active > span:hover, -.pagination-primary > li.active > button:focus, +.pagination-primary > li.active > a:focus, .pagination-primary > li.active > span:focus, // .page-item, .page-link { @@ -214,12 +209,12 @@ color: $white-color; } -.nav-pills-info > li > button, -.pagination-info > li > button, +.nav-pills-info > li > a, +.pagination-info > li > a, .pagination-info > li > span, -.pagination-info > li:first-child > button, +.pagination-info > li:first-child > a, .pagination-info > li:first-child > span, -.pagination-info > li:last-child > button, +.pagination-info > li:last-child > a, .pagination-info > li:last-child > span, // .page-item, .page-link { @@ -227,17 +222,17 @@ color: $info-color; } -.nav-pills-info > li.active > button, -.nav-pills-info > li.active > button:hover, -.nav-pills-info > li.active > button:focus, -.pagination-info > li > button:hover, -.pagination-info > li > button:focus, -.pagination-info > li > button:active, -.pagination-info > li.active > button, +.nav-pills-info > li.active > a, +.nav-pills-info > li.active > a:hover, +.nav-pills-info > li.active > a:focus, +.pagination-info > li > a:hover, +.pagination-info > li > a:focus, +.pagination-info > li > a:active, +.pagination-info > li.active > a, .pagination-info > li.active > span, -.pagination-info > li.active > button:hover, +.pagination-info > li.active > a:hover, .pagination-info > li.active > span:hover, -.pagination-info > li.active > button:focus, +.pagination-info > li.active > a:focus, .pagination-info > li.active > span:focus, // .page-item, .page-link { @@ -246,12 +241,12 @@ color: $white-color; } -.nav-pills-success > li > button, -.pagination-success > li > button, +.nav-pills-success > li > a, +.pagination-success > li > a, .pagination-success > li > span, -.pagination-success > li:first-child > button, +.pagination-success > li:first-child > a, .pagination-success > li:first-child > span, -.pagination-success > li:last-child > button, +.pagination-success > li:last-child > a, .pagination-success > li:last-child > span, // .page-item, .page-link { @@ -259,17 +254,17 @@ color: $success-color; } -.nav-pills-success > li.active > button, -.nav-pills-success > li.active > button:hover, -.nav-pills-success > li.active > button:focus, -.pagination-success > li > button:hover, -.pagination-success > li > button:focus, -.pagination-success > li > button:active, -.pagination-success > li.active > button, +.nav-pills-success > li.active > a, +.nav-pills-success > li.active > a:hover, +.nav-pills-success > li.active > a:focus, +.pagination-success > li > a:hover, +.pagination-success > li > a:focus, +.pagination-success > li > a:active, +.pagination-success > li.active > a, .pagination-success > li.active > span, -.pagination-success > li.active > button:hover, +.pagination-success > li.active > a:hover, .pagination-success > li.active > span:hover, -.pagination-success > li.active > button:focus, +.pagination-success > li.active > a:focus, .pagination-success > li.active > span:focus, // .page-item, .page-link { diff --git a/src/stylesheets/doi/components/_tooltips-and-popovers.scss b/src/stylesheets/doi/components/_tooltips-and-popovers.scss index 827f526..00600bd 100755 --- a/src/stylesheets/doi/components/_tooltips-and-popovers.scss +++ b/src/stylesheets/doi/components/_tooltips-and-popovers.scss @@ -35,11 +35,11 @@ border-right: 11px solid rgba(0, 0, 0, 0); top: -11px; } - &.start { + &.left{ margin-left: -11px; padding: 0; } - &.start .tooltip-inner:after { + &.left .tooltip-inner:after { border-left: 11px solid $white-color; border-top: 11px solid rgba(0, 0, 0, 0); border-bottom: 11px solid rgba(0, 0, 0, 0); @@ -47,7 +47,7 @@ left: auto; margin-left: 0; } - &.start .tooltip-inner:before { + &.left .tooltip-inner:before { border-left: 11px solid rgba(0, 0, 0, 0.2); border-top: 11px solid rgba(0, 0, 0, 0); border-bottom: 11px solid rgba(0, 0, 0, 0); @@ -55,11 +55,11 @@ left: auto; margin-left: 0; } - &.end { + &.right{ margin-left: 11px; padding: 0; } - &.end .tooltip-inner:after { + &.right .tooltip-inner:after { border-right: 11px solid $white-color; border-top: 11px solid rgba(0, 0, 0, 0); border-bottom: 11px solid rgba(0, 0, 0, 0); @@ -67,7 +67,7 @@ top: 10px; margin-left: 0; } - &.end .tooltip-inner:before { + &.right .tooltip-inner:before { border-right: 11px solid rgba(0, 0, 0, 0.2); border-top: 11px solid rgba(0, 0, 0, 0); border-bottom: 11px solid rgba(0, 0, 0, 0); @@ -137,13 +137,13 @@ color: $bg-danger; } } -.popover .popover-arrow{ +.popover .arrow{ border: 0; } -.popover.top .popover-arrow{ +.popover.top .arrow{ margin-left: 0; } -.popover.bottom .popover-arrow:after{ +.popover.bottom .arrow:after{ border-bottom-color: $darker-gray; } .popover-filter{ @@ -164,13 +164,13 @@ @include opacity(0.2); transition-delay: 0s; } -.popover.start > .popover-arrow::after{ +.popover.left > .arrow::after{ border-left-color: $darker-gray; bottom: -20px; } -.popover.top > .popover-arrow::after{ +.popover.top > .arrow::after{ border-top-color: $darker-gray; } -.popover.end > .popover-arrow::after{ +.popover.right > .arrow::after{ border-right-color: $darker-gray; } diff --git a/src/stylesheets/doi/globals/_styles.scss b/src/stylesheets/doi/globals/_styles.scss deleted file mode 100644 index d9fa70f..0000000 --- a/src/stylesheets/doi/globals/_styles.scss +++ /dev/null @@ -1,3 +0,0 @@ -a { - text-decoration: none -} diff --git a/src/stylesheets/doi/pages/_search.scss b/src/stylesheets/doi/pages/_search.scss index c0ac79c..920c14a 100755 --- a/src/stylesheets/doi/pages/_search.scss +++ b/src/stylesheets/doi/pages/_search.scss @@ -7,7 +7,6 @@ h3.member-results, h3.provider-results, h3.user-results, h3.doi-results, h3.work color: $turquoise; border-bottom: 1px solid $medium-gray; padding: 0; - margin: 0 0 .35em 0; .small { font-size: $font-size-base; } } diff --git a/yarn.lock b/yarn.lock index be1f08a..85317f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -100,10 +100,10 @@ bootstrap-sass@^3.4.3: resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.3.tgz#742cc8f4286303ae9fe8e4c95237321eae73766c" integrity sha512-vPgFnGMp1jWZZupOND65WS6mkR8rxhJxndT/AcMbqcq1hHMdkcH4sMPhznLzzoHOHkSCrd6J9F8pWBriPCKP2Q== -bootstrap@^5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38" - integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg== +bootstrap@4: + version "4.6.2" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479" + integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ== brace-expansion@^2.0.1: version "2.0.1"