diff --git a/app/frontend/src/stylesheets/application.scss b/app/frontend/src/stylesheets/application.scss index 132d0b81e..37ba6b614 100644 --- a/app/frontend/src/stylesheets/application.scss +++ b/app/frontend/src/stylesheets/application.scss @@ -1,5 +1,6 @@ @import "variables/colors"; @import "variables/typography"; +@import "variables/decoration"; @import "app.functions"; @import "bootstrap_and_overrides"; diff --git a/app/frontend/src/stylesheets/bootstrap_and_overrides.scss b/app/frontend/src/stylesheets/bootstrap_and_overrides.scss index 6784a7b1a..ea2c8cae9 100644 --- a/app/frontend/src/stylesheets/bootstrap_and_overrides.scss +++ b/app/frontend/src/stylesheets/bootstrap_and_overrides.scss @@ -95,7 +95,8 @@ $link-hover-decoration: underline; // Semibold = 600, Bold = 700, ExtraB = 800 -$font-family-sans-serif: "proxima-nova", "Open Sans", Helvetica, Arial, sans-serif !default; +//$font-family-sans-serif: "proxima-nova", "Open Sans", Helvetica, Arial, sans-serif !default; +$font-family-sans-serif: var(--font-text) !default; $font-proxima-condensed: "proxima-nova-condensed", "Open Sans Condensed", Helvetica, Arial, sans-serif !default; $font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-felt: "felt-tip-roman", "Loved by the King", cursive, sans-serif; diff --git a/app/frontend/src/stylesheets/modules/base/fab-text-editor.scss b/app/frontend/src/stylesheets/modules/base/fab-text-editor.scss index dc2068a69..cdcbaa7d0 100644 --- a/app/frontend/src/stylesheets/modules/base/fab-text-editor.scss +++ b/app/frontend/src/stylesheets/modules/base/fab-text-editor.scss @@ -4,10 +4,10 @@ padding-bottom: 1.6rem; background-color: var(--gray-soft-lightest); border: 1px solid var(--gray-soft-dark); - // TODO: border radius from variable - border-radius: 8px; + border-radius: var(--border-radius); &-label { + @include text-sm; display: block; margin-bottom: 0.8rem; } @@ -71,9 +71,8 @@ padding: 1.2rem; background-color: var(--gray-soft-lightest); border: 1px solid var(--gray-soft-darkest); - border-radius: 8px; - // TODO: shadow from variable - box-shadow: 0 0 10px rgba(39, 32, 32, 0.25); + border-radius: var(--border-radius); + box-shadow: var(--shadow); opacity: 0; pointer-events: none; transition: opacity 0.25s ease-out; @@ -95,7 +94,7 @@ padding: 0.4rem 0.8rem; background-color: var(--gray-soft-light); border: 1px solid var(--secondary); - border-radius: 8px; + border-radius: var(--border-radius); font-size: var(--text-base); text-overflow: ellipsis; white-space: nowrap; @@ -157,9 +156,8 @@ color: var(--main-dark); background-color: var(--main-lightest); border: 1px solid var(--main-light); - border-radius: 8px; - // TODO: shadow from variable - box-shadow: 0 0 10px rgba(39, 32, 32, 0.25); + border-radius: var(--border-radius); + box-shadow: var(--shadow); svg { flex-shrink: 0; diff --git a/app/frontend/src/stylesheets/modules/base/rhf-input.scss b/app/frontend/src/stylesheets/modules/base/rhf-input.scss index 8d9a19a2a..3efe1ab21 100644 --- a/app/frontend/src/stylesheets/modules/base/rhf-input.scss +++ b/app/frontend/src/stylesheets/modules/base/rhf-input.scss @@ -8,7 +8,10 @@ justify-content: space-between; align-items: flex-start; margin-bottom: 0.8rem; - p { margin: 0; } + p { + @include text-sm; + margin: 0; + } } &.is-required &-header p::after { content: "*"; @@ -22,7 +25,7 @@ grid-template-areas: "icon input addon"; grid-template-columns: min-content 1fr min-content; border: 1px solid var(--gray-soft-dark); - border-radius: 4px; + border-radius: var(--border-radius); overflow: hidden; transition: border-color ease-in-out 0.15s; @@ -42,6 +45,7 @@ input { grid-area: input; border: none; + border-radius: var(--border-radius); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .08); padding: 0 0.8rem; color: var(--gray-hard-darkest); diff --git a/app/frontend/src/stylesheets/variables/decoration.scss b/app/frontend/src/stylesheets/variables/decoration.scss new file mode 100644 index 000000000..29a009f81 --- /dev/null +++ b/app/frontend/src/stylesheets/variables/decoration.scss @@ -0,0 +1,4 @@ +:root { + --border-radius: 8px; + --shadow: 0 0 10px rgba(39, 32, 32, 0.25); +} \ No newline at end of file