From 1a09820022e56428242f5b03dbf2a96111726878 Mon Sep 17 00:00:00 2001 From: Becky Siegel Date: Fri, 8 Sep 2017 13:12:41 -0700 Subject: [PATCH] Update bold fonts to Roboto Medium Bold fonts were inconsistent across platforms and new design specs use Roboto Medium instead, so switching all currently bold fonts to use that. Change-Id: Ibfc5ffc3fc33517acb85acc0194215b4d7864cae --- .../elements/admin/gr-group-members/gr-group-members.html | 2 +- .../gr-change-list-item/gr-change-list-item.html | 2 +- .../change/gr-change-metadata/gr-change-metadata.html | 2 +- .../app/elements/change/gr-change-view/gr-change-view.html | 2 +- .../elements/change/gr-comment-list/gr-comment-list.html | 2 +- .../app/elements/change/gr-file-list/gr-file-list.html | 2 +- .../app/elements/change/gr-message/gr-message.html | 4 ++-- .../gr-related-changes-list/gr-related-changes-list.html | 2 +- .../elements/change/gr-reply-dialog/gr-reply-dialog.html | 2 +- .../gr-keyboard-shortcuts-dialog.html | 4 ++-- .../app/elements/core/gr-main-header/gr-main-header.html | 2 +- .../app/elements/diff/gr-diff-comment/gr-diff-comment.html | 2 +- .../diff/gr-diff-preferences/gr-diff-preferences.html | 4 ++-- .../app/elements/diff/gr-diff-view/gr-diff-view.html | 4 ++-- .../gr-registration-dialog/gr-registration-dialog.html | 2 +- polygerrit-ui/app/elements/shared/gr-alert/gr-alert.html | 2 +- polygerrit-ui/app/elements/shared/gr-button/gr-button.html | 2 +- .../shared/gr-confirm-dialog/gr-confirm-dialog.html | 2 +- .../shared/gr-download-commands/gr-download-commands.html | 4 ++-- .../app/elements/shared/gr-dropdown/gr-dropdown.html | 4 ++-- polygerrit-ui/app/styles/app-theme.html | 1 + polygerrit-ui/app/styles/gr-change-list-styles.html | 2 +- polygerrit-ui/app/styles/gr-form-styles.html | 2 +- polygerrit-ui/app/styles/gr-page-nav-styles.html | 4 ++-- polygerrit-ui/app/styles/gr-table-styles.html | 2 +- polygerrit-ui/app/styles/shared-styles.html | 6 +++--- 26 files changed, 35 insertions(+), 34 deletions(-) diff --git a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html index bfced55d14..9371b17fae 100644 --- a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html +++ b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html @@ -64,7 +64,7 @@ limitations under the License. } th { border-bottom: 1px solid #eee; - font-weight: bold; + font-family: var(--font-family-bold); text-align: left; } diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html index 70275b3281..4ff10cb956 100644 --- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html +++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html @@ -39,7 +39,7 @@ limitations under the License. background-color: #ebf5fb; } :host([needs-review]) { - font-weight: bold; + font-family: var(--font-family-bold); } :host([assigned]) { background-color: #fcfad6; diff --git a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.html b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.html index 5a834b761c..388a3f71c0 100644 --- a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.html +++ b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata.html @@ -43,7 +43,7 @@ limitations under the License. } .title { color: #666; - font-weight: bold; + font-family: var(--font-family-bold); max-width: 20em; word-break: break-word; } diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html index d6ad5aec86..e01f6f74c8 100644 --- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html +++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html @@ -78,7 +78,7 @@ limitations under the License. .header-title { flex: 1; font-size: 1.2em; - font-weight: bold; + font-family: var(--font-family-bold); } .prefsButton { float: right; diff --git a/polygerrit-ui/app/elements/change/gr-comment-list/gr-comment-list.html b/polygerrit-ui/app/elements/change/gr-comment-list/gr-comment-list.html index 2b7b0fdd87..705cf5212f 100644 --- a/polygerrit-ui/app/elements/change/gr-comment-list/gr-comment-list.html +++ b/polygerrit-ui/app/elements/change/gr-comment-list/gr-comment-list.html @@ -36,7 +36,7 @@ limitations under the License. } .file { border-top: 1px solid #ddd; - font-weight: bold; + font-family: var(--font-family-bold); margin: 10px 0 3px; padding: 10px 0 5px; } diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html index a2a64c8c7d..95bfc70812 100644 --- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html +++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html @@ -104,7 +104,7 @@ limitations under the License. } .drafts { color: #C62828; - font-weight: bold; + font-family: var(--font-family-bold); } .show-hide { margin-left: .4em; diff --git a/polygerrit-ui/app/elements/change/gr-message/gr-message.html b/polygerrit-ui/app/elements/change/gr-message/gr-message.html index ae43edf1bb..c0e55ef86b 100644 --- a/polygerrit-ui/app/elements/change/gr-message/gr-message.html +++ b/polygerrit-ui/app/elements/change/gr-message/gr-message.html @@ -76,7 +76,7 @@ limitations under the License. width: 2.5em; } .name { - font-weight: bold; + font-family: var(--font-family-bold); } .message { --gr-formatted-text-prose-max-width: 80ch; @@ -136,7 +136,7 @@ limitations under the License. } gr-account-label { --gr-account-label-text-style: { - font-weight: bold; + font-family: var(--font-family-bold); }; } diff --git a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.html b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.html index 8c02e65cbb..2ebf7c71fb 100644 --- a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.html +++ b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list.html @@ -68,7 +68,7 @@ limitations under the License. } .status { color: #666; - font-weight: bold; + font-family: var(--font-family-bold); margin-left: .25em; } .notCurrent { diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.html b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.html index 04a1b16189..68c7fd7751 100644 --- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.html +++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.html @@ -87,7 +87,7 @@ limitations under the License. margin-top: 1em; } .groupName { - font-weight: bold; + font-family: var(--font-family-bold); } .groupSize { font-style: italic; diff --git a/polygerrit-ui/app/elements/core/gr-keyboard-shortcuts-dialog/gr-keyboard-shortcuts-dialog.html b/polygerrit-ui/app/elements/core/gr-keyboard-shortcuts-dialog/gr-keyboard-shortcuts-dialog.html index 3f3350ecf8..2318657550 100644 --- a/polygerrit-ui/app/elements/core/gr-keyboard-shortcuts-dialog/gr-keyboard-shortcuts-dialog.html +++ b/polygerrit-ui/app/elements/core/gr-keyboard-shortcuts-dialog/gr-keyboard-shortcuts-dialog.html @@ -48,12 +48,12 @@ limitations under the License. text-align: right; } .header { - font-weight: bold; + font-family: var(--font-family-bold); padding-top: 1em; } .key { display: inline-block; - font-weight: bold; + font-family: var(--font-family-bold); border-radius: 3px; background-color: #f1f2f3; padding: .1em .5em; diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html index 55230324af..09f3029e9b 100644 --- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html +++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html @@ -120,7 +120,7 @@ limitations under the License. @media screen and (max-width: 50em) { .bigTitle { font-size: 14px; - font-weight: bold; + font-family: var(--font-family-bold); } gr-search-bar, .browse, diff --git a/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.html b/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.html index 9ad0bf9225..ca22942075 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.html +++ b/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.html @@ -69,7 +69,7 @@ limitations under the License. .authorName, .draftLabel, .draftTooltip { - font-weight: bold; + font-family: var(--font-family-bold); } .draftLabel, .draftTooltip { diff --git a/polygerrit-ui/app/elements/diff/gr-diff-preferences/gr-diff-preferences.html b/polygerrit-ui/app/elements/diff/gr-diff-preferences/gr-diff-preferences.html index 99a70544ae..f9ca92e664 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-preferences/gr-diff-preferences.html +++ b/polygerrit-ui/app/elements/diff/gr-diff-preferences/gr-diff-preferences.html @@ -45,7 +45,7 @@ limitations under the License. } .header { border-bottom: 1px solid #ddd; - font-weight: bold; + font-family: var(--font-family-bold); } .mainContainer { padding: 1em 0; @@ -69,7 +69,7 @@ limitations under the License. justify-content: space-between; } .beta { - font-weight: bold; + font-family: var(--font-family-bold); color: #888; } diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html index b5da3a06f4..10d30e4487 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html +++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html @@ -113,7 +113,7 @@ limitations under the License. } .dropdown-content a[selected] { color: #000; - font-weight: bold; + font-family: var(--font-family-bold); pointer-events: none; text-decoration: none; } @@ -194,7 +194,7 @@ limitations under the License. .mobileNavLink { color: #000; font-size: 1.5em; - font-weight: bold; + font-family: var(--font-family-bold); text-decoration: none; } .mobileNavLink:not([href]) { diff --git a/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog.html b/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog.html index 34f0b162c6..1bd345e3bc 100644 --- a/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog.html +++ b/polygerrit-ui/app/elements/settings/gr-registration-dialog/gr-registration-dialog.html @@ -36,7 +36,7 @@ limitations under the License. } header { border-bottom: 1px solid #ddd; - font-weight: bold; + font-family: var(--font-family-bold); } header, main, diff --git a/polygerrit-ui/app/elements/shared/gr-alert/gr-alert.html b/polygerrit-ui/app/elements/shared/gr-alert/gr-alert.html index bf5e4e0dfe..51fa6161dc 100644 --- a/polygerrit-ui/app/elements/shared/gr-alert/gr-alert.html +++ b/polygerrit-ui/app/elements/shared/gr-alert/gr-alert.html @@ -53,7 +53,7 @@ limitations under the License. } .action { color: #a1c2fa; - font-weight: bold; + font-family: var(--font-family-bold); margin-left: 1em; text-decoration: none; } diff --git a/polygerrit-ui/app/elements/shared/gr-button/gr-button.html b/polygerrit-ui/app/elements/shared/gr-button/gr-button.html index 1fecbe71ec..2cbcfa2e51 100644 --- a/polygerrit-ui/app/elements/shared/gr-button/gr-button.html +++ b/polygerrit-ui/app/elements/shared/gr-button/gr-button.html @@ -32,7 +32,7 @@ limitations under the License. display: inline-block; font-family: var(--font-family); font-size: 12px; - font-weight: bold; + font-family: var(--font-family-bold); outline-width: 0; padding: .4em .85em; position: relative; diff --git a/polygerrit-ui/app/elements/shared/gr-confirm-dialog/gr-confirm-dialog.html b/polygerrit-ui/app/elements/shared/gr-confirm-dialog/gr-confirm-dialog.html index d4a98e4bd0..27c03550ee 100644 --- a/polygerrit-ui/app/elements/shared/gr-confirm-dialog/gr-confirm-dialog.html +++ b/polygerrit-ui/app/elements/shared/gr-confirm-dialog/gr-confirm-dialog.html @@ -33,7 +33,7 @@ limitations under the License. header { border-bottom: 1px solid #ddd; flex-shrink: 0; - font-weight: bold; + font-family: var(--font-family-bold); } main { display: flex; diff --git a/polygerrit-ui/app/elements/shared/gr-download-commands/gr-download-commands.html b/polygerrit-ui/app/elements/shared/gr-download-commands/gr-download-commands.html index 05075bd589..68c384817c 100644 --- a/polygerrit-ui/app/elements/shared/gr-download-commands/gr-download-commands.html +++ b/polygerrit-ui/app/elements/shared/gr-download-commands/gr-download-commands.html @@ -40,11 +40,11 @@ limitations under the License. display: block; } label { - font-weight: bold; + font-family: var(--font-family-bold); } li[selected] gr-button { color: #000; - font-weight: bold; + font-family: var(--font-family-bold); text-decoration: none; } .schemes { diff --git a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html index 8f2994d068..f4813fa383 100644 --- a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html +++ b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html @@ -61,7 +61,7 @@ limitations under the License. list-style: none; } ul .accountName { - font-weight: bold; + font-family: var(--font-family-bold); } li .accountInfo, li .itemAction { @@ -92,7 +92,7 @@ limitations under the License. padding: .85em 1em; } .bold-text { - font-weight: bold; + font-family: var(--font-family-bold); } :host:not([down-arrow]) .downArrow { display: none; } :host([down-arrow]) .downArrow { diff --git a/polygerrit-ui/app/styles/app-theme.html b/polygerrit-ui/app/styles/app-theme.html index db83b0c6b7..4318757223 100644 --- a/polygerrit-ui/app/styles/app-theme.html +++ b/polygerrit-ui/app/styles/app-theme.html @@ -30,6 +30,7 @@ limitations under the License. --view-background-color: #fff; --default-horizontal-margin: 1rem; --font-family: 'Roboto', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; + --font-family-bold: 'Roboto Medium', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; --monospace-font-family: 'Roboto Mono', Menlo, 'Lucida Console', Monaco, monospace; --iron-overlay-backdrop: { transition: none; diff --git a/polygerrit-ui/app/styles/gr-change-list-styles.html b/polygerrit-ui/app/styles/gr-change-list-styles.html index d283aac7a8..00ea613c92 100644 --- a/polygerrit-ui/app/styles/gr-change-list-styles.html +++ b/polygerrit-ui/app/styles/gr-change-list-styles.html @@ -22,7 +22,7 @@ limitations under the License. .topHeader, .groupHeader { border-bottom: 1px solid #eee; - font-weight: bold; + font-family: var(--font-family-bold); padding: .3em .5em; } .topHeader { diff --git a/polygerrit-ui/app/styles/gr-form-styles.html b/polygerrit-ui/app/styles/gr-form-styles.html index 7e0bf5a55d..603f610261 100644 --- a/polygerrit-ui/app/styles/gr-form-styles.html +++ b/polygerrit-ui/app/styles/gr-form-styles.html @@ -39,7 +39,7 @@ limitations under the License. } .gr-form-styles .title { color: #666; - font-weight: bold; + font-family: var(--font-family-bold); padding-right: .5em; width: 15em; } diff --git a/polygerrit-ui/app/styles/gr-page-nav-styles.html b/polygerrit-ui/app/styles/gr-page-nav-styles.html index e6e9c960e8..0c4d20fb38 100644 --- a/polygerrit-ui/app/styles/gr-page-nav-styles.html +++ b/polygerrit-ui/app/styles/gr-page-nav-styles.html @@ -44,14 +44,14 @@ limitations under the License. margin-top: 1em; } .navStyles .title { - font-weight: bold; + font-family: var(--font-family-bold); margin: .4em 0; } .navStyles .selected { background-color: #fff; border-bottom: 1px dotted #808080; border-top: 1px dotted #808080; - font-weight: bold; + font-family: var(--font-family-bold); } .navStyles a { color: black; diff --git a/polygerrit-ui/app/styles/gr-table-styles.html b/polygerrit-ui/app/styles/gr-table-styles.html index d296530f84..6b8c88d0d7 100644 --- a/polygerrit-ui/app/styles/gr-table-styles.html +++ b/polygerrit-ui/app/styles/gr-table-styles.html @@ -34,7 +34,7 @@ limitations under the License. .genericList th { background-color: #ddd; border-bottom: 1px solid #eee; - font-weight: bold; + font-family: var(--font-family-bold); padding: .3em .5em; text-align: left; } diff --git a/polygerrit-ui/app/styles/shared-styles.html b/polygerrit-ui/app/styles/shared-styles.html index 97252519dd..5c11d60aec 100644 --- a/polygerrit-ui/app/styles/shared-styles.html +++ b/polygerrit-ui/app/styles/shared-styles.html @@ -65,15 +65,15 @@ limitations under the License. /* Other Shared Styles*/ h1 { font-size: 2em; - font-weight: bold; + font-family: var(--font-family-bold); } h2 { font-size: 1.5em; - font-weight: bold; + font-family: var(--font-family-bold); } h3 { font-size: 1.17em; - font-weight: bold; + font-family: var(--font-family-bold); } /* Stopgap solution until we remove hidden$ attributes. */ [hidden] {