diff --git a/frontend/amundsen_application/static/css/_bootstrap-custom.scss b/frontend/amundsen_application/static/css/_bootstrap-custom.scss index 0e128c14a5..dcbdc362b2 100644 --- a/frontend/amundsen_application/static/css/_bootstrap-custom.scss +++ b/frontend/amundsen_application/static/css/_bootstrap-custom.scss @@ -12,7 +12,6 @@ $icon-font-path: '/static/fonts/bootstrap/'; // Core CSS @import '~bootstrap-sass/assets/stylesheets/bootstrap/scaffolding'; -@import '~bootstrap-sass/assets/stylesheets/bootstrap/type'; @import '~bootstrap-sass/assets/stylesheets/bootstrap/code'; @import '~bootstrap-sass/assets/stylesheets/bootstrap/grid'; @import '~bootstrap-sass/assets/stylesheets/bootstrap/tables'; diff --git a/frontend/amundsen_application/static/css/_buttons-default.scss b/frontend/amundsen_application/static/css/_buttons-default.scss index 21a3fabd85..bfd30be8db 100644 --- a/frontend/amundsen_application/static/css/_buttons-default.scss +++ b/frontend/amundsen_application/static/css/_buttons-default.scss @@ -3,8 +3,7 @@ &.btn-primary, &.btn-default { - font-family: $font-family-sans-serif-bold; - font-weight: $font-weight-sans-serif-bold; + font-weight: $font-weight-body-bold; height: 32px; padding: 6px 16px; diff --git a/frontend/amundsen_application/static/css/_fonts-default.scss b/frontend/amundsen_application/static/css/_fonts-default.scss index e0f381392a..3b24db2a6e 100644 --- a/frontend/amundsen_application/static/css/_fonts-default.scss +++ b/frontend/amundsen_application/static/css/_fonts-default.scss @@ -1 +1,36 @@ -// TODO - Import Open Sans or other default font +@import 'variables'; + +// Roboto +@font-face { + font-family: 'Roboto'; + src: url('/static/fonts/Roboto-Medium.ttf') format('truetype'); + font-weight: $font-weight-header-regular; + font-style: normal; +} +@font-face { + font-family: 'Roboto'; + src: url('/static/fonts/Roboto-Bold.ttf') format('truetype'); + font-weight: $font-weight-header-bold; + font-style: normal; +} + + +// Open Sans +@font-face { + font-family: 'Open Sans'; + src: url('/static/fonts/OpenSans-Regular.ttf') format('truetype'); + font-weight: $font-weight-body-regular; + font-style: normal; +} +@font-face { + font-family: 'Open Sans'; + src: url('/static/fonts/OpenSans-SemiBold.ttf') format('truetype'); + font-weight: $font-weight-body-semi-bold; + font-style: normal; +} +@font-face { + font-family: 'Open Sans'; + src: url('/static/fonts/OpenSans-Bold.ttf') format('truetype'); + font-weight: $font-weight-body-bold; + font-style: normal; +} diff --git a/frontend/amundsen_application/static/css/_popovers.scss b/frontend/amundsen_application/static/css/_popovers.scss index ec6d727c4d..f6fc7535f9 100644 --- a/frontend/amundsen_application/static/css/_popovers.scss +++ b/frontend/amundsen_application/static/css/_popovers.scss @@ -45,8 +45,7 @@ border: none; background-color: $gray-base; color: $body-bg; - font-family: $font-family-sans-serif-bold; - font-weight: $font-weight-sans-serif-bold; + font-weight: $font-weight-body-bold; outline: none; } .tooltip-inner button:hover { diff --git a/frontend/amundsen_application/static/css/_typography-custom.scss b/frontend/amundsen_application/static/css/_typography-custom.scss new file mode 100644 index 0000000000..69c93db165 --- /dev/null +++ b/frontend/amundsen_application/static/css/_typography-custom.scss @@ -0,0 +1 @@ +// This file is intentionally left blank and should be overwritten by in the build process. diff --git a/frontend/amundsen_application/static/css/_typography-default.scss b/frontend/amundsen_application/static/css/_typography-default.scss new file mode 100644 index 0000000000..c982c5696e --- /dev/null +++ b/frontend/amundsen_application/static/css/_typography-default.scss @@ -0,0 +1,122 @@ +@import 'variables'; + +.text-center { text-align: center; } +.text-left { text-align: left; } +.text-right { text-align: right; } + +h1, h2, h3, +.h1, .h2, .h3 { + color: $text-dark; + font-family: $font-family-header; + margin: 0; +} + +h1, +.h1 { + font-size: 36px; + font-weight: $font-weight-header-regular; +} + +h2, +.h2 { + font-size: 26px; + font-weight: $font-weight-header-bold; +} + +h3, +.h3 { + font-size: 20px; + font-weight: $font-weight-header-bold; +} + +body { + color: $text-dark; + font-size: 14px; + font-family: $font-family-body; + font-weight: $font-weight-body-regular; +} + +.title-1, .title-2, .title-3, +.subtitle-1, .subtitle-2, .subtitle-3, +.body-1, .body-2, .body-3, +.body-secondary-3, .body-link, .caption { + font-family: $font-family-body; +} + +.title-1 { + font-size: 20px; + font-weight: $font-weight-body-bold; + line-height: 24px; +} + +.title-2 { + font-size: 16px; + font-weight: $font-weight-body-bold; +} + +.title-3 { + color: $text-medium; + font-size: 14px; + font-weight: $font-weight-body-bold; +} + +.subtitle-1 { + font-size: 20px; + font-weight: $font-weight-body-semi-bold; + line-height: 20px; +} + +.subtitle-2 { + font-size: 16px; + font-weight: $font-weight-body-semi-bold; +} + +.subtitle-3 { + font-size: 14px; + font-weight: $font-weight-body-semi-bold; +} + +.body-1 { + font-size: 20px; + font-weight: $font-weight-body-regular; + line-height: 24px; +} + +.body-2 { + font-size: 16px; + font-weight: $font-weight-body-regular; +} + +.body-3 { + font-size: 14px; + font-weight: $font-weight-body-regular; +} + +.body-secondary-3 { + color: $text-medium; + font-size: 14px; + font-weight: $font-weight-body-regular; +} + +.body-link { + color: $brand-color-4; + font-size: 14px; +} + +.caption { + color: $text-medium; + font-size: 13px; + font-weight: $font-weight-body-bold; +} + +.column-type { + color: $brand-color-3; + font-size: 13px; + font-family: $font-family-monospace; +} + +.helper-text { + color: $text-light; + font-size: 12px; + font-family: $font-family-body; +} diff --git a/frontend/amundsen_application/static/css/_typography.scss b/frontend/amundsen_application/static/css/_typography.scss new file mode 100644 index 0000000000..0b9f44ee0d --- /dev/null +++ b/frontend/amundsen_application/static/css/_typography.scss @@ -0,0 +1,4 @@ +// Amundsen Default Typography +@import 'typography-default'; +// Per-Client Custom Typography +@import 'typography-custom'; diff --git a/frontend/amundsen_application/static/css/_variables-default.scss b/frontend/amundsen_application/static/css/_variables-default.scss index 0df50ffc39..54eaf61452 100644 --- a/frontend/amundsen_application/static/css/_variables-default.scss +++ b/frontend/amundsen_application/static/css/_variables-default.scss @@ -4,7 +4,8 @@ $brand-color-1, $brand-color-2, $brand-color-3, $brand-color-4, $brand-color-5 - $font-family-sans-serif-bold, $font-weight-sans-serif-bold + $font-family-header, $font-weight-header-regular, $font-weight-header-bold + $font-family-body, $font-weight-body-regular, $font-weight-body-semi-bold, $font-weight-body-bold $text-dark, $text-medium, $text-light @@ -42,17 +43,19 @@ $text-light: $gray-light !default; // Typography -$font-family-sans-serif: "Lucida Sans Unicode", "Lucida Grande", sans-serif !default; -$font-family-sans-serif-bold: $font-family-sans-serif !default; -$font-weight-sans-serif-bold: 600 !default; -$font-family-serif: Georgia, "Times New Roman", Times, serif !default; -$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default; +$font-family-body: "Open Sans", sans-serif !default; +$font-weight-body-regular: 400 !default; +$font-weight-body-semi-bold: 600 !default; +$font-weight-body-bold: 700 !default; -$font-family-base: $font-family-sans-serif !default; -$headings-font-family: $font-family-sans-serif-bold !default; +$font-family-header: "Roboto", sans-serif !default; +$font-weight-header-regular: 500 !default; +$font-weight-header-bold: 700 !default; -$font-size-small: 12px !default; +$font-family-monospace: 'Menlo-Bold', Menlo, monospace !default; +$font-family-serif: Georgia, "Times New Roman", Times, serif !default; +$font-size-small: 12px !default; $font-size-base: 14px !default; $font-size-large: 16px !default; $line-height-small: 1.5 !default; diff --git a/frontend/amundsen_application/static/css/styles.scss b/frontend/amundsen_application/static/css/styles.scss index 06cc931092..4a0c44489a 100644 --- a/frontend/amundsen_application/static/css/styles.scss +++ b/frontend/amundsen_application/static/css/styles.scss @@ -5,6 +5,7 @@ @import 'icons'; @import 'list-group-item'; @import 'popovers'; +@import 'typography'; // TODO - Move to separate files // Layout diff --git a/frontend/amundsen_application/static/fonts/OpenSans-Bold.ttf b/frontend/amundsen_application/static/fonts/OpenSans-Bold.ttf new file mode 100755 index 0000000000..96fabd865d Binary files /dev/null and b/frontend/amundsen_application/static/fonts/OpenSans-Bold.ttf differ diff --git a/frontend/amundsen_application/static/fonts/OpenSans-Regular.ttf b/frontend/amundsen_application/static/fonts/OpenSans-Regular.ttf new file mode 100755 index 0000000000..2d4da3a6e2 Binary files /dev/null and b/frontend/amundsen_application/static/fonts/OpenSans-Regular.ttf differ diff --git a/frontend/amundsen_application/static/fonts/OpenSans-SemiBold.ttf b/frontend/amundsen_application/static/fonts/OpenSans-SemiBold.ttf new file mode 100755 index 0000000000..fd71fe9da8 Binary files /dev/null and b/frontend/amundsen_application/static/fonts/OpenSans-SemiBold.ttf differ diff --git a/frontend/amundsen_application/static/fonts/Roboto-Bold.ttf b/frontend/amundsen_application/static/fonts/Roboto-Bold.ttf new file mode 100755 index 0000000000..e612852d25 Binary files /dev/null and b/frontend/amundsen_application/static/fonts/Roboto-Bold.ttf differ diff --git a/frontend/amundsen_application/static/fonts/Roboto-Medium.ttf b/frontend/amundsen_application/static/fonts/Roboto-Medium.ttf new file mode 100755 index 0000000000..86d1c52ed5 Binary files /dev/null and b/frontend/amundsen_application/static/fonts/Roboto-Medium.ttf differ diff --git a/frontend/amundsen_application/static/js/components/AnnouncementPage/index.tsx b/frontend/amundsen_application/static/js/components/AnnouncementPage/index.tsx index c12a4e6006..72d737a839 100644 --- a/frontend/amundsen_application/static/js/components/AnnouncementPage/index.tsx +++ b/frontend/amundsen_application/static/js/components/AnnouncementPage/index.tsx @@ -37,8 +37,8 @@ export class AnnouncementPage extends React.Component { return (
-
{post.title}
-
{post.date}
+
{post.title}
+
{post.date}
@@ -59,9 +59,7 @@ export class AnnouncementPage extends React.Component {
-
- Announcements -
+

Announcements


{this.createPosts()} diff --git a/frontend/amundsen_application/static/js/components/AnnouncementPage/styles.scss b/frontend/amundsen_application/static/js/components/AnnouncementPage/styles.scss index 46cb63cb28..8f570fcc05 100644 --- a/frontend/amundsen_application/static/js/components/AnnouncementPage/styles.scss +++ b/frontend/amundsen_application/static/js/components/AnnouncementPage/styles.scss @@ -3,34 +3,22 @@ .announcement-container hr { border: 2px solid $brand-color-4; } -.announcement-header { - font-size: 20px; - font-family: $font-family-sans-serif-bold; - font-weight: $font-weight-sans-serif-bold; -} .post-container { display: flex; flex-direction: row; margin-bottom: 32px; -} -.post-header { - padding-right: 16px; - border-right: 1px solid $gray-lighter -} -.post-title { - font-size: 16px; - font-family: $font-family-sans-serif-bold; - font-weight: $font-weight-sans-serif-bold; - width: 150px; -} -.post-date { - font-size: 14px; - color: $text-medium; -} -.post-content { - padding-left: 16px; -} -.post-content > p:not(:last-child) { - margin: 0 0 20px; + + .post-header { + padding-right: 16px; + border-right: 1px solid $gray-lighter; + + .post-title { + width: 150px; + } + } + + .post-content { + padding-left: 16px; + } } diff --git a/frontend/amundsen_application/static/js/components/BrowsePage/index.tsx b/frontend/amundsen_application/static/js/components/BrowsePage/index.tsx index edf8d07d1f..8f8affa824 100644 --- a/frontend/amundsen_application/static/js/components/BrowsePage/index.tsx +++ b/frontend/amundsen_application/static/js/components/BrowsePage/index.tsx @@ -79,7 +79,7 @@ export class BrowsePage extends React.Component
-

Browse Tags

+

Browse Tags


{this.generateTagInfo(this.state.curatedTags)} diff --git a/frontend/amundsen_application/static/js/components/BrowsePage/styles.scss b/frontend/amundsen_application/static/js/components/BrowsePage/styles.scss index 9441043a16..b2173e3138 100644 --- a/frontend/amundsen_application/static/js/components/BrowsePage/styles.scss +++ b/frontend/amundsen_application/static/js/components/BrowsePage/styles.scss @@ -1,15 +1,5 @@ @import 'variables'; -.container { - margin-top: 64px; -} - -h3.header { - font-size: 20px; - font-family: $font-family-sans-serif-bold; - font-weight: $font-weight-sans-serif-bold; -} - hr.header-hr { border: 2px solid $brand-color-4; } diff --git a/frontend/amundsen_application/static/js/components/Feedback/FeedbackForm/styles.scss b/frontend/amundsen_application/static/js/components/Feedback/FeedbackForm/styles.scss index 622d0932a5..7bb39f7d92 100644 --- a/frontend/amundsen_application/static/js/components/Feedback/FeedbackForm/styles.scss +++ b/frontend/amundsen_application/static/js/components/Feedback/FeedbackForm/styles.scss @@ -28,15 +28,15 @@ } .nps-label { - font-family: $font-family-sans-serif-bold; - font-weight: $font-weight-sans-serif-bold; + font-family: $font-family-header; + font-weight: $font-weight-header-regular; margin-bottom: 15px; - width: 60px; + width: 65px; } .status-message { - font-family: $font-family-sans-serif-bold; - font-weight: $font-weight-sans-serif-bold; + font-family: $font-family-header; + font-weight: $font-weight-header-regular; text-align: center; position: absolute; font-size: 20px; diff --git a/frontend/amundsen_application/static/js/components/Feedback/styles.scss b/frontend/amundsen_application/static/js/components/Feedback/styles.scss index 50d746fe65..58935fa284 100644 --- a/frontend/amundsen_application/static/js/components/Feedback/styles.scss +++ b/frontend/amundsen_application/static/js/components/Feedback/styles.scss @@ -38,8 +38,8 @@ color: $text-medium; flex-grow: 1; font-size: 12px; - font-family: $font-family-sans-serif-bold; - font-weight: $font-weight-sans-serif-bold; + font-family: $font-family-header; + font-weight: $font-weight-header-regular; height: 24px; line-height: 32px; } diff --git a/frontend/amundsen_application/static/js/components/NavBar/index.tsx b/frontend/amundsen_application/static/js/components/NavBar/index.tsx index 9c715a0a29..48d54bab45 100644 --- a/frontend/amundsen_application/static/js/components/NavBar/index.tsx +++ b/frontend/amundsen_application/static/js/components/NavBar/index.tsx @@ -36,9 +36,11 @@ export class NavBar extends React.Component { generateNavLinks(navLinks: LinkConfig[]) { return navLinks.map((link, index) => { if (link.use_router) { - return {link.label} + return {link.label} } - return {link.label} + return {link.label} }); } @@ -52,7 +54,7 @@ export class NavBar extends React.Component { AppConfig.logoPath && } - + AMUNDSEN
diff --git a/frontend/amundsen_application/static/js/components/NavBar/styles.scss b/frontend/amundsen_application/static/js/components/NavBar/styles.scss index a26cfd958e..64cf70f16d 100644 --- a/frontend/amundsen_application/static/js/components/NavBar/styles.scss +++ b/frontend/amundsen_application/static/js/components/NavBar/styles.scss @@ -4,10 +4,7 @@ height: 48px; box-shadow: 0 2px 0 -1px $gray-lightest; padding: 8px 32px 8px 32px; - font-family: $font-family-sans-serif-bold; - font-weight: $font-weight-sans-serif-bold; color: $text-medium; - font-size: 14px; display: flex; flex-direction: row; align-items: center; diff --git a/frontend/amundsen_application/static/js/components/NavBar/tests/index.spec.tsx b/frontend/amundsen_application/static/js/components/NavBar/tests/index.spec.tsx index efa786f098..943150bbd6 100644 --- a/frontend/amundsen_application/static/js/components/NavBar/tests/index.spec.tsx +++ b/frontend/amundsen_application/static/js/components/NavBar/tests/index.spec.tsx @@ -61,7 +61,10 @@ describe('NavBar', () => { }); it('returns a NavLink w/ correct props if user_router is true', () => { - const expectedContent = JSON.stringify(Announcements); + const expectedContent = JSON.stringify( + Announcements + ); expect(JSON.stringify(content[0])).toEqual(expectedContent); }); diff --git a/frontend/amundsen_application/static/js/components/SearchPage/SearchBar/index.tsx b/frontend/amundsen_application/static/js/components/SearchPage/SearchBar/index.tsx index cc0e12bcb3..0b5abee3b2 100644 --- a/frontend/amundsen_application/static/js/components/SearchPage/SearchBar/index.tsx +++ b/frontend/amundsen_application/static/js/components/SearchPage/SearchBar/index.tsx @@ -86,13 +86,13 @@ class SearchBar extends React.Component { }; render() { - const subTextClass = `subtext ${this.state.subTextClassName}`; + const subTextClass = `subtext body-secondary-3 ${this.state.subTextClassName}`; return (