diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 8ff7ba95c..20f07835d 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,11 +1,13 @@ // All classes should be scoped within the .sul-embed-container -@import "palette"; @import "sul_variables"; @import "modules/buttons"; @import "modules/popup_panels"; @import "modules/shadows"; @import "modules/utility"; +$color-pantone-401: #b6b1a9; +$sul-link-border-color: $color-pantone-401; + body { margin: 0; padding: 0; @@ -13,9 +15,9 @@ body { .sul-embed-container { background: $white-color; - border: 1px solid $color-pantone-405; + border: 1px solid $sul-border-color; box-sizing: border-box; - color: $sul-font-color; + color: black; display: flex; flex-direction: column; font-family: "Source Sans Pro", "Arial Unicode MS", Helvetica, sans-serif; @@ -101,7 +103,7 @@ body { } .sul-embed-download-count { - background-color: $btn-default-bg; + background-color: white; border-radius: 16px; color: $color-pantone-405; display: inline-block; diff --git a/app/assets/stylesheets/file.scss b/app/assets/stylesheets/file.scss index 364dc8cf9..b66dc43d9 100644 --- a/app/assets/stylesheets/file.scss +++ b/app/assets/stylesheets/file.scss @@ -1,4 +1,5 @@ @import "common"; +$color-beige-10: #f2f1eb; body { overflow-y: hidden; diff --git a/app/assets/stylesheets/modules/buttons.scss b/app/assets/stylesheets/modules/buttons.scss index 68537cde7..0898af3dd 100644 --- a/app/assets/stylesheets/modules/buttons.scss +++ b/app/assets/stylesheets/modules/buttons.scss @@ -99,8 +99,8 @@ } .btn-toolbar { - --bs-btn-color: #{$sul-button-color}; - --bs-btn-bg: #{$sul-button-bg}; + --bs-btn-color: white; + --bs-btn-bg: #{$sul-border-color}; --bs-btn-border-color: transparent; --bs-btn-hover-bg: #433e38; --bs-btn-hover-border-color: transparent; diff --git a/app/assets/stylesheets/modules/utility.scss b/app/assets/stylesheets/modules/utility.scss index 22ed9f4c6..0094e54b2 100644 --- a/app/assets/stylesheets/modules/utility.scss +++ b/app/assets/stylesheets/modules/utility.scss @@ -17,31 +17,25 @@ // https://github.com/twbs/bootstrap-sass/blob/d5625c907168b6311be122b99d89614e02448475/assets/stylesheets/bootstrap/_close.scss .sul-embed-close { + background: transparent; + border: 0; + color: black; + cursor: pointer; float: right; font-size: ($font-size-base * 1.5); - font-weight: $close-font-weight; + font-weight: bold; line-height: 1; - color: $close-color; - text-shadow: $close-text-shadow; + text-shadow: 0 1px 0 #fff; opacity: 0.2; + padding: 0; + -webkit-appearance: none; &:hover, &:focus { - color: $close-color; text-decoration: none; cursor: pointer; opacity: 0.5; } - - // [converter] extracted button& to button.close -} - -button.sul-embed-close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; } // https://github.com/twbs/bootstrap-sass/blob/d5625c907168b6311be122b99d89614e02448475/assets/stylesheets/bootstrap/_scaffolding.scss diff --git a/app/assets/stylesheets/palette.scss b/app/assets/stylesheets/palette.scss deleted file mode 100644 index 6aafa20f4..000000000 --- a/app/assets/stylesheets/palette.scss +++ /dev/null @@ -1,20 +0,0 @@ -// Extracted from: -// https://github.com/sul-dlss/sul_styles/blob/master/app/assets/stylesheets/sul-styles/su_web_colors.scss -// https://github.com/sul-dlss/sul_styles/blob/master/app/assets/stylesheets/sul-styles/su_primary_colors.scss -$color-cardinal-red: #8c1515; -$color-fog-light: #f4f4f4; -// $color-dark-red: #820000; -// $color-gray: #3f3c30; -// $color-black: #000; -/* $color-blackish: #2e2d29; */ -// $color-beige-40: #d5d0c0; -$color-beige-30: #e3dfd5; -// $color-beige-20: #e9e6df; -$color-beige-10: #f2f1eb; -$color-beige-05: #fbfbf9; -// $color-pantone-334: #009b76; -$color-pantone-401: #b6b1a9; -$color-pantone-405: #5f574f; -// $color-pantone-144: #e98300; -// $color-pantone-124: #eaab00; -// $color-pantone-403: #928b81; diff --git a/app/assets/stylesheets/sul_variables.scss b/app/assets/stylesheets/sul_variables.scss index 86a970c6d..1ab20135f 100644 --- a/app/assets/stylesheets/sul_variables.scss +++ b/app/assets/stylesheets/sul_variables.scss @@ -1,23 +1,19 @@ // Colors +$color-cardinal-red: #8c1515; +$color-fog-light: #f4f4f4; +$color-beige-05: #fbfbf9; +$color-pantone-405: #5f574f; $gray-80-percent: #ccc; $gray-54-percent: #737373; $white-color: #fff; -// Bootstrap needed (for mixins) -$btn-default-bg: #fff; -$close-color: #000; -$close-font-weight: bold; -$close-text-shadow: 0 1px 0 #fff; $font-size-base: 14px; $sul-border-color: $color-pantone-405; $sul-button-bg: $sul-border-color; -$sul-button-color: white; -$sul-font-color: black; $sul-input-border: $gray-80-percent; $sul-title-size: floor(($font-size-base * 1.29)); $sul-header-weight: 300; -$sul-link-border-color: $color-pantone-401; $sul-link-color: #006cb8; $sul-link-hover-color: #00548f; $sul-metadata-bg: $color-beige-05; diff --git a/app/assets/stylesheets/was_seed.scss b/app/assets/stylesheets/was_seed.scss index e9f6c8fc3..e8e570284 100644 --- a/app/assets/stylesheets/was_seed.scss +++ b/app/assets/stylesheets/was_seed.scss @@ -1,5 +1,5 @@ -// @import 'sul_variables'; @import "common"; +$color-beige-30: #e3dfd5; .sul-embed-was-seed-content { padding: 10px;