Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the typeface used on istio.io, but a little less #16010

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/sass/base/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ ol {

h1, h2, h3, h4, h5, h6 {
border: 0;
line-height: 1.2;
line-height: 1.4;
color: $textColor;
}

Expand Down Expand Up @@ -556,6 +556,8 @@ iframe {
}

.article-container {
line-height: 1.75rem;

h2 {
word-wrap: break-word;
}
Expand Down
13 changes: 9 additions & 4 deletions src/sass/misc/_code-blocks.scss
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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;
Expand All @@ -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;
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/sass/themes/_light-theme.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
html {
--backgroundColor: #ffffff;

--textCodeColor: #7dc6f2;
--primaryColor: #293655; //dark-grey-blue
--secondaryColor: #516ba9; //dull-blue
--accentColor: #7dc6f2; //light-blue
--secondaryAccentColor: #3d5080; //denim
--paleGray: #f8f9fa;

--inputBorderColor: #566ca5;
--textColor: #293655;
--textCodeColor: #d14;
--textColor: #111;
--textCodeColor: #111;
--textCodeBackgroundColor: rgba(129, 139, 152, .12);
--disabledTextColor: #{lighten(#535f61, 50%)};
--textGray: #8a8a8c;

Expand All @@ -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};
Expand Down Expand Up @@ -108,7 +108,7 @@ html {
--semiBoldWeight: 600;
--boldWeight: 700;

--textWeight: 500;
--textWeight: 400;
--linkWeight: 400;
--h1Weight: var(--boldWeight);
--h2Weight: var(--boldWeight);
Expand All @@ -117,7 +117,7 @@ html {
--h5Weight: 500;
--h6Weight: 500;
--tableHeaderWeight: 400;
--boldTextWeight: 600;
--boldTextWeight: 700;
--blogAttributeWeight: 600;
--sectionIndexLinkWeight: 400;
--buttonWeight: 500;
Expand Down
1 change: 1 addition & 0 deletions src/sass/themes/_vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ $secondaryAccentColor: var(--secondaryAccentColor);

$textColor: var(--textColor);
$textCodeColor: var(--textCodeColor);
$textCodeBackgroundColor: var(--textCodeBackgroundColor);
$disabledTextColor: var(--disabledTextColor);

$inputBorderColor: var(--inputBorderColor);
Expand Down