diff --git a/src/sass/base/_base.scss b/src/sass/base/_base.scss index 5ee1ad11f65a1..3fc9a93f0dbc2 100644 --- a/src/sass/base/_base.scss +++ b/src/sass/base/_base.scss @@ -210,7 +210,7 @@ ol { h1, h2, h3, h4, h5, h6 { border: 0; - line-height: 1.2; + line-height: 1.4; color: $textColor; } @@ -556,6 +556,8 @@ iframe { } .article-container { + line-height: 1.75rem; + h2 { word-wrap: break-word; } diff --git a/src/sass/misc/_code-blocks.scss b/src/sass/misc/_code-blocks.scss index db92c40ea6685..75b55bb688acc 100644 --- a/src/sass/misc/_code-blocks.scss +++ b/src/sass/misc/_code-blocks.scss @@ -1,9 +1,11 @@ code { color: $textCodeColor; - font-size: 87.5%; + font-size: 85%; font-weight: $textCodeWeight; - font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; word-break: break-word; + background: $textCodeBackgroundColor; + padding: .2em .4em; } pre { @@ -14,7 +16,7 @@ pre { min-width: 12em; max-height: 31em; border-left: 4px solid $preBlockBorderColor; - font-size: 87.5%; + font-size: 85%; text-align: left; white-space: pre; word-spacing: normal; @@ -29,9 +31,12 @@ pre { display: block; padding: .5em; color: $textColor; + font-size: 100%; + line-height: 1.3rem; + background: $preBlockBackgroundColor; a { - font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; font-weight: $textCodeWeight; } } diff --git a/src/sass/themes/_light-theme.scss b/src/sass/themes/_light-theme.scss index 15ab34a5ba463..a51ad64b5153b 100644 --- a/src/sass/themes/_light-theme.scss +++ b/src/sass/themes/_light-theme.scss @@ -1,7 +1,6 @@ html { --backgroundColor: #ffffff; - --textCodeColor: #7dc6f2; --primaryColor: #293655; //dark-grey-blue --secondaryColor: #516ba9; //dull-blue --accentColor: #7dc6f2; //light-blue @@ -9,8 +8,9 @@ html { --paleGray: #f8f9fa; --inputBorderColor: #566ca5; - --textColor: #293655; - --textCodeColor: #d14; + --textColor: #111; + --textCodeColor: #111; + --textCodeBackgroundColor: rgba(129, 139, 152, .12); --disabledTextColor: #{lighten(#535f61, 50%)}; --textGray: #8a8a8c; @@ -19,9 +19,9 @@ html { --linkDisabledColor: #cccccc; --linkActiveColor: #516baa; - --h1Color: var(--textColor); - --h2Color: var(--textColor); - --h3Color: var(--textColor); + --h1Color: var(--primaryColor); + --h2Color: var(--primaryColor); + --h3Color: var(--primaryColor); --h4Color: #{$dark-gray}; --h5Color: #{$dark-gray}; --h6Color: #{$dark-gray}; @@ -108,7 +108,7 @@ html { --semiBoldWeight: 600; --boldWeight: 700; - --textWeight: 500; + --textWeight: 400; --linkWeight: 400; --h1Weight: var(--boldWeight); --h2Weight: var(--boldWeight); @@ -117,7 +117,7 @@ html { --h5Weight: 500; --h6Weight: 500; --tableHeaderWeight: 400; - --boldTextWeight: 600; + --boldTextWeight: 700; --blogAttributeWeight: 600; --sectionIndexLinkWeight: 400; --buttonWeight: 500; diff --git a/src/sass/themes/_vars.scss b/src/sass/themes/_vars.scss index 35eb5069e2c1a..8f58df95e82f3 100644 --- a/src/sass/themes/_vars.scss +++ b/src/sass/themes/_vars.scss @@ -8,6 +8,7 @@ $secondaryAccentColor: var(--secondaryAccentColor); $textColor: var(--textColor); $textCodeColor: var(--textCodeColor); +$textCodeBackgroundColor: var(--textCodeBackgroundColor); $disabledTextColor: var(--disabledTextColor); $inputBorderColor: var(--inputBorderColor);