IGNITE-11098 Web Console: Set font in a single place. Use inherited font everywhere.
diff --git a/frontend/app/browserUpdate/style.scss b/frontend/app/browserUpdate/style.scss
index 5842f5f..060fb20 100644
--- a/frontend/app/browserUpdate/style.scss
+++ b/frontend/app/browserUpdate/style.scss
@@ -20,7 +20,7 @@
#buorg.buorg {
background-color: $brand-warning;
line-height: 16px;
- font-family: Roboto, sans-serif;
+ font-family: inherit;
a {
@extend .btn-ignite;
diff --git a/frontend/app/components/breadcrumbs/style.scss b/frontend/app/components/breadcrumbs/style.scss
index b9b08b7..f0a98ee 100644
--- a/frontend/app/components/breadcrumbs/style.scss
+++ b/frontend/app/components/breadcrumbs/style.scss
@@ -27,7 +27,6 @@
height: 26px;
border-radius: 4px;
background-color: rgba(197, 197, 197, 0.1);
- font-family: Roboto, sans-serif;
font-size: 12px;
line-height: 1.08;
text-align: left;
diff --git a/frontend/app/components/bs-select-menu/style.scss b/frontend/app/components/bs-select-menu/style.scss
index ac3f7aa..4997a6d 100644
--- a/frontend/app/components/bs-select-menu/style.scss
+++ b/frontend/app/components/bs-select-menu/style.scss
@@ -26,7 +26,6 @@
margin: 0;
list-style: none;
position: absolute;
- font-family: Roboto;
outline: none !important;
overflow-y: auto;
overflow-x: hidden;
diff --git a/frontend/app/components/cluster-selector/style.scss b/frontend/app/components/cluster-selector/style.scss
index 069dd64..a143d91 100644
--- a/frontend/app/components/cluster-selector/style.scss
+++ b/frontend/app/components/cluster-selector/style.scss
@@ -49,7 +49,6 @@
div {
margin: 0 10px 0 20px;
- font-family: Roboto;
font-size: 12px;
}
diff --git a/frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss b/frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss
index 73306ca..7274e2b 100644
--- a/frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss
+++ b/frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss
@@ -17,5 +17,4 @@
list-editable-add-item-button {
font-style: italic;
- font-family: Roboto;
}
\ No newline at end of file
diff --git a/frontend/app/components/page-landing/style.scss b/frontend/app/components/page-landing/style.scss
index 90f3dda..d7f8831 100644
--- a/frontend/app/components/page-landing/style.scss
+++ b/frontend/app/components/page-landing/style.scss
@@ -35,7 +35,6 @@
}
page-landing {
- font-family: Roboto;
display: block;
margin: 0 calc(var(--page-side-padding) * -1) calc(var(--page-side-padding) * -1);
diff --git a/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.scss b/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.scss
index 1992e13..12bf087 100644
--- a/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.scss
+++ b/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.scss
@@ -30,8 +30,6 @@
margin: 20px 0;
padding: 10px 10px 0 30px;
- font-family: Roboto;
-
> h3 {
margin-bottom: 10px;
}
diff --git a/frontend/app/components/panel-collapsible/style.scss b/frontend/app/components/panel-collapsible/style.scss
index f421862..748b99b 100644
--- a/frontend/app/components/panel-collapsible/style.scss
+++ b/frontend/app/components/panel-collapsible/style.scss
@@ -18,7 +18,6 @@
panel-collapsible {
display: flex;
flex-direction: column;
- font-family: Roboto;
border-radius: 0 0 4px 4px;
background-color: #ffffff;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2);
diff --git a/frontend/app/components/permanent-notifications/template.pug b/frontend/app/components/permanent-notifications/template.pug
index 6abe611..27bb297 100644
--- a/frontend/app/components/permanent-notifications/template.pug
+++ b/frontend/app/components/permanent-notifications/template.pug
@@ -20,4 +20,4 @@
| You are currently viewing user #[strong {{$ctrl.$rootScope.user.firstName}} {{$ctrl.$rootScope.user.lastName}}] as administrator. #[a(ng-click='$ctrl.$rootScope.revertIdentity()') Revert to your identity?]
.wch-notification.wch-notification--demo(ng-if='$ctrl.$rootScope.IgniteDemoMode')
- | You are now in #[b Demo Mode]. #[a(ng-click='$ctrl.closeDemo()') Close Demo?]
+ | You are now in Demo Mode. #[a(ng-click='$ctrl.closeDemo()') Close Demo?]
diff --git a/frontend/app/components/ui-grid/style.scss b/frontend/app/components/ui-grid/style.scss
index da31f67..d3b8c05 100644
--- a/frontend/app/components/ui-grid/style.scss
+++ b/frontend/app/components/ui-grid/style.scss
@@ -140,7 +140,6 @@
box-shadow: none;
}
- font-family: Roboto;
outline: none;
overflow: visible;
diff --git a/frontend/app/components/web-console-header/style.scss b/frontend/app/components/web-console-header/style.scss
index e343284..44baea4 100644
--- a/frontend/app/components/web-console-header/style.scss
+++ b/frontend/app/components/web-console-header/style.scss
@@ -25,7 +25,6 @@
flex-direction: row;
align-items: center;
height: 62px;
- font-family: Roboto;
font-size: 16px;
border-bottom: $bottom-border-width solid red;
background: white;
diff --git a/frontend/app/configuration/components/modal-preview-project/style.scss b/frontend/app/configuration/components/modal-preview-project/style.scss
index 390e624..07a87a2 100644
--- a/frontend/app/configuration/components/modal-preview-project/style.scss
+++ b/frontend/app/configuration/components/modal-preview-project/style.scss
@@ -43,6 +43,7 @@
}
treecontrol {
white-space: nowrap;
+ font-family: inherit;
font-size: 12px;
color: #393939;
diff --git a/frontend/app/configuration/components/page-configure-advanced/style.scss b/frontend/app/configuration/components/page-configure-advanced/style.scss
index 1b9c2ff..9519682 100644
--- a/frontend/app/configuration/components/page-configure-advanced/style.scss
+++ b/frontend/app/configuration/components/page-configure-advanced/style.scss
@@ -72,7 +72,7 @@
}
}
- .pca-panel, panel-collapsible {
+ panel-collapsible {
margin-bottom: 20px;
}
@@ -94,39 +94,3 @@
margin-top: -10px;
}
}
-
-.pca-panel {
- border-radius: 0 0 4px 4px;
- background-color: #ffffff;
- box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2);
-
- &#{&}__disabled {
- opacity: 0.5;
- }
-
- .pca-panel-heading {
- padding: 30px 20px 30px;
- color: #393939;
- display: flex;
- flex-direction: row;
- align-items: baseline;
- user-select: none;
- cursor: pointer;
-
- .pca-panel-heading-title {
- font-size: 16px;
- margin-right: 8px;
- white-space: nowrap;
- }
-
- .pca-panel-heading-description {
- font-size: 12px;
- color: #757575;
- }
- }
-
- .pca-panel-body {
- border-top: 1px solid #dddddd;
- padding: 15px 20px;
- }
-}
\ No newline at end of file
diff --git a/frontend/app/primitives/badge/index.scss b/frontend/app/primitives/badge/index.scss
index 96d6b54..59f28cc 100644
--- a/frontend/app/primitives/badge/index.scss
+++ b/frontend/app/primitives/badge/index.scss
@@ -27,7 +27,6 @@
border-radius: 9px;
color: white;
- font-family: Roboto;
font-size: 12px;
font-weight: 500;
text-align: center;
diff --git a/frontend/app/primitives/btn/index.scss b/frontend/app/primitives/btn/index.scss
index 4401a81..ba97896 100644
--- a/frontend/app/primitives/btn/index.scss
+++ b/frontend/app/primitives/btn/index.scss
@@ -56,7 +56,6 @@
border-radius: $ignite-button-border-radius;
text-align: center;
outline: none;
- font-family: Roboto, sans-serif;
font-size: 14px;
line-height: 16px;
text-decoration: none;
diff --git a/frontend/app/primitives/form-field/index.scss b/frontend/app/primitives/form-field/index.scss
index 63d9841..0ddc194 100644
--- a/frontend/app/primitives/form-field/index.scss
+++ b/frontend/app/primitives/form-field/index.scss
@@ -172,7 +172,6 @@
.form-field {
position: relative;
width: 100%;
- font-family: Roboto;
&__label {
display: flex;
diff --git a/frontend/app/primitives/modal/index.scss b/frontend/app/primitives/modal/index.scss
index eb621e5..8668524 100644
--- a/frontend/app/primitives/modal/index.scss
+++ b/frontend/app/primitives/modal/index.scss
@@ -109,8 +109,6 @@
}
.modal--ignite {
- font-family: Roboto;
-
.close {
position: absolute;
top: 20px;
@@ -158,7 +156,6 @@
color: $text-color;
font-size: 16px;
- font-family: Roboto;
font-weight: 400;
line-height: 36px;
diff --git a/frontend/app/primitives/page/index.scss b/frontend/app/primitives/page/index.scss
index fb749e7..7122835 100644
--- a/frontend/app/primitives/page/index.scss
+++ b/frontend/app/primitives/page/index.scss
@@ -23,7 +23,6 @@
h1 {
color: #393939;
- font-family: Roboto;
font-size: 24px;
font-weight: normal;
font-style: normal;
diff --git a/frontend/app/primitives/panel/index.scss b/frontend/app/primitives/panel/index.scss
index 6afcd5c..9449fdb 100644
--- a/frontend/app/primitives/panel/index.scss
+++ b/frontend/app/primitives/panel/index.scss
@@ -22,8 +22,6 @@
border: none;
border-radius: 0 0 4px 4px;
- font-family: Roboto;
-
background-color: white;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2);
diff --git a/frontend/app/primitives/table/index.scss b/frontend/app/primitives/table/index.scss
index 451e50d..e3f98f8 100644
--- a/frontend/app/primitives/table/index.scss
+++ b/frontend/app/primitives/table/index.scss
@@ -20,7 +20,6 @@
table.table--ignite {
width: 100%;
- font-family: Roboto;
line-height: 46px;
th, td {
diff --git a/frontend/app/primitives/tabs/index.scss b/frontend/app/primitives/tabs/index.scss
index 811d847..f63ae9b 100644
--- a/frontend/app/primitives/tabs/index.scss
+++ b/frontend/app/primitives/tabs/index.scss
@@ -52,7 +52,6 @@
color: $text-color;
font-size: $font-size;
- font-family: Roboto;
text-align: center;
line-height: $height - 2*$offset-vertical;
diff --git a/frontend/app/primitives/tooltip/index.scss b/frontend/app/primitives/tooltip/index.scss
index 71076e2..27f30ed 100644
--- a/frontend/app/primitives/tooltip/index.scss
+++ b/frontend/app/primitives/tooltip/index.scss
@@ -16,8 +16,6 @@
*/
.tooltip {
- font-family: Roboto;
-
& > .tooltip-inner {
padding: 12px;
background-color: #FFF;
diff --git a/frontend/app/primitives/ui-grid-settings/index.scss b/frontend/app/primitives/ui-grid-settings/index.scss
index 0a0d4a3..5b67ff4 100644
--- a/frontend/app/primitives/ui-grid-settings/index.scss
+++ b/frontend/app/primitives/ui-grid-settings/index.scss
@@ -98,7 +98,6 @@
height: 12px;
margin-left: 22px;
- font-family: Roboto;
font-size: 12px;
line-height: 1;
text-align: left;
diff --git a/frontend/app/primitives/ui-grid/index.scss b/frontend/app/primitives/ui-grid/index.scss
index 274e21d..49a16ae 100644
--- a/frontend/app/primitives/ui-grid/index.scss
+++ b/frontend/app/primitives/ui-grid/index.scss
@@ -59,7 +59,6 @@
padding: 13px 20px;
text-align: left;
- font-family: Roboto;
white-space: nowrap;
}
}
diff --git a/frontend/public/stylesheets/_bootstrap-variables.scss b/frontend/public/stylesheets/_bootstrap-variables.scss
index e68dedf..ea3dbf0 100644
--- a/frontend/public/stylesheets/_bootstrap-variables.scss
+++ b/frontend/public/stylesheets/_bootstrap-variables.scss
@@ -60,8 +60,8 @@
//
//## Font, line-height, and color for body text, headings, and more.
-$font-family-sans-serif: Roboto, sans-serif !default;
-$font-family-serif: Roboto_slab, serif !default;
+$font-family-sans-serif: var(--sans-serif-font), sans-serif !default;
+$font-family-serif: var(--serif-font), serif !default;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
$font-family-base: $font-family-sans-serif !default;
diff --git a/frontend/public/stylesheets/style.scss b/frontend/public/stylesheets/style.scss
index 15cdb65..a8b9a10 100644
--- a/frontend/public/stylesheets/style.scss
+++ b/frontend/public/stylesheets/style.scss
@@ -22,6 +22,11 @@
@import "./blocks/error";
@import "./form-field";
+:root {
+ --sans-serif-font: Roboto;
+ --serif-font: Roboto_slab;
+}
+
body {
overflow-y: scroll !important;
}
@@ -1157,7 +1162,6 @@
}
.popover.validation-error {
- font-family: Roboto;
white-space: pre-wrap;
width: auto !important;
max-width: 400px !important;
@@ -2071,7 +2075,6 @@
margin: 0;
margin-right: 8px;
- font-family: Roboto, sans-serif;
font-size: 24px;
line-height: 36px;
}
@@ -2101,7 +2104,6 @@
ul.dropdown-menu {
min-width: 100%;
- font-family: Roboto;
}
}
}
diff --git a/frontend/views/index.pug b/frontend/views/index.pug
index 449a1eb..6029993 100644
--- a/frontend/views/index.pug
+++ b/frontend/views/index.pug
@@ -29,8 +29,6 @@
meta(name='fragment' content='!')
- link(rel='preload' as='font' href='assets/fonts/roboto-bold-webfont.woff' type='font/woff' crossorigin='anonymous')
-
body.theme-line.body-overlap(ng-class='{ "demo-mode": IgniteDemoMode }')
.splash.splash-max-foreground(hide-on-state-change)
