diff --git a/src/app/styles/base.styl b/src/app/styles/base.styl index 3d1069dd52..2a8e4013a9 100644 --- a/src/app/styles/base.styl +++ b/src/app/styles/base.styl @@ -5,7 +5,6 @@ body { margin: 0; - font-family: Arial, "Helvetica Neue", Helvetica, sans-serif; font-size: 13px; color: #222222; text-align: left; diff --git a/src/app/styles/global-font.styl b/src/app/styles/global-font.styl index 4f3a5b41bb..d01533cc81 100644 --- a/src/app/styles/global-font.styl +++ b/src/app/styles/global-font.styl @@ -18,13 +18,6 @@ .v-align-b{ vertical-align: bottom; } -.font-alibaba-sans { - font-family: 'Alibaba Sans'; -} - -.font-roboto { - font-family: 'Roboto, Helvetica Neue'; -} .font-size-large { font-size: $font-size-large; @@ -64,7 +57,6 @@ } .main-text-outstanding { - font-family: 'Roboto, Helvetica Neue'; font-size: $font-size-base; font-weight: $font-weight-normal; color: $black-2; @@ -77,14 +69,12 @@ } .main-text-normal { - font-family: 'Roboto, Helvetica Neue'; font-size: $font-size-base; font-weight: $font-weight-normal; color: $black-3; } .main-text-normal-with-hover { - font-family: 'Roboto, Helvetica Neue'; font-size: $font-size-base; font-weight: $font-weight-normal; color: $black-3; @@ -97,21 +87,18 @@ } .unit-text { - font-family: 'Roboto, Helvetica Neue'; font-size: $font-size-base; font-weight: $font-weight-normal; color: $black-4; } .disabled-text { - font-family: 'Roboto, Helvetica Neue'; font-size: $font-size-base; font-weight: $font-weight-normal; color: $black-5; } .white-text { - font-family: 'Roboto, Helvetica Neue'; font-size: $font-size-base; font-weight: $font-weight-normal; color: $white @@ -119,7 +106,6 @@ } .link-text { - font-family: 'Roboto, Helvetica Neue'; font-size: $font-size-base; font-weight: $font-weight-normal; color: $blue-2; @@ -134,21 +120,18 @@ } .popover-message { - font-family: 'Roboto, Helvetica Neue'; font-size: $font-size-small; font-weight: $font-weight-middle; color: $black-2; } .tooltip-message { - font-family: 'Roboto, Helvetica Neue'; font-size: $font-size-small; font-weight: $font-weight-normal; color: $black-3; } .additional-message { - font-family: 'Roboto, Helvetica Neue'; font-size: $font-size-small; font-weight: $font-weight-normal; color: $black-4; diff --git a/src/app/styles/global-heading.styl b/src/app/styles/global-heading.styl index 3880e5d4d3..6e3220ffd4 100644 --- a/src/app/styles/global-heading.styl +++ b/src/app/styles/global-heading.styl @@ -1,7 +1,6 @@ @import "global-var"; .highlight-heading { - font-family: 'Alibaba Sans, Roboto'; font-size: $font-size-large; font-weight: $font-weight-bold; color: $black-2; @@ -9,7 +8,6 @@ } .highlight-heading-unselect-with-hover { - font-family: 'Alibaba Sans, Roboto'; font-size: $font-size-large; font-weight: $font-weight-normal; color: $black-4; @@ -21,21 +19,18 @@ } .highlight-heading-unselect { - font-family: 'Alibaba Sans, Roboto'; font-size: $font-size-large; font-weight: $font-weight-normal; color: $black-4; } .heading-1 { - font-family: 'Roboto'; font-size: $font-size-large; font-weight: $font-weight-middle; color: $black-2; } .heading-2 { - font-family: 'Roboto'; font-size: $font-size-big; font-weight: $font-weight-bold; color: $black-2; @@ -45,7 +40,6 @@ font-size: $font-size-big; font-weight $font-weight-normal; color: $black-4; - font-family: 'Roboto'; &:hover { color: $black-2; } @@ -55,20 +49,17 @@ font-size: $font-size-big; font-weight $font-weight-normal; color: $black-4; - font-family: 'Roboto'; } .heading-3 { font-size: $font-size-middle; font-weight: $font-weight-bold; color: $black-3; - font-family: 'Roboto'; } .heading-3-normal-with-hover { font-size: $font-size-middle; font-weight: $font-weight-middle; - font-family: 'Roboto'; color: $black-3; &:hover { color: $blue-2; @@ -78,6 +69,5 @@ .heading-3-normal { font-size: $font-size-middle; font-weight: $font-weight-normal; - font-family: 'Roboto'; color: $black-3; } diff --git a/src/app/styles/scaffolding.styl b/src/app/styles/scaffolding.styl index 3a559a3091..76f4517347 100644 --- a/src/app/styles/scaffolding.styl +++ b/src/app/styles/scaffolding.styl @@ -27,7 +27,6 @@ html { } body { - font-family: $font-family-base; font-size: $font-size-base; line-height: $line-height-base-computed; color: $text-color; @@ -39,7 +38,6 @@ input, button, select, textarea { - font-family: inherit; font-size: inherit; line-height: inherit; } diff --git a/src/app/styles/typography.styl b/src/app/styles/typography.styl index 32787eaa3c..0f97a8e6ec 100644 --- a/src/app/styles/typography.styl +++ b/src/app/styles/typography.styl @@ -7,24 +7,6 @@ // Fontface // ------------------------- -// Interstate-ExtraLight -@font-face { - font-family: Interstate-ExtraLight; - font-style: normal; - font-weight: normal; - src: url(../resources/fonts/Interstate-ExtraLight-webfont.eot); - src: url(../resources/fonts/Interstate-ExtraLight-webfont.eot?#iefix) format("embedded-opentype"), url(../resources/fonts/Interstate-ExtraLight-webfont.woff) format("woff"), url(../resources/fonts/Interstate-ExtraLight-webfont.ttf) format("truetype"), url(../resources/fonts/Interstate-ExtraLight-webfont.svg#InterstateExtraLight) format("svg"); -} - -// Interstate-Light -@font-face { - font-family: Interstate-Light; - font-style: normal; - font-weight: normal; - src: url(../resources/fonts/Interstate-Light-webfont.eot); - src: url(../resources/fonts/Interstate-Light-webfont.eot?#iefix) format("embedded-opentype"), url(../resources/fonts/Interstate-Light-webfont.woff) format("woff"), url(../resources/fonts/Interstate-Light-webfont.ttf) format("truetype"), url(../resources/fonts/Interstate-Light-webfont.svg#InterstateLight) format("svg"); -} - // Headings // ------------------------- h1, h2, h3, h4, h5, h6, @@ -40,13 +22,6 @@ h1, h2, h3, h4, h5, h6, color: $headings-small-color; } } -h1, .h1 { - font-family: $headings-font-family-h1; -} -h2, h3, h4, h5, h6, -.h2, .h3, .h4, .h5, .h6 { - font-family: $headings-font-family; -} h1, .h1, h2, .h2, diff --git a/src/app/styles/xterm.styl b/src/app/styles/xterm.styl index 36ecd356ca..f04d067f5a 100644 --- a/src/app/styles/xterm.styl +++ b/src/app/styles/xterm.styl @@ -3,7 +3,7 @@ // @stylint on .terminal { - font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif; + font-family Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif; background-color: #000; color: #FFF; } diff --git a/src/app/ui/App.styl b/src/app/ui/App.styl index 823d6682ba..f81cf8919b 100644 --- a/src/app/ui/App.styl +++ b/src/app/ui/App.styl @@ -1,6 +1,5 @@ @import "variables"; - .main { background-color: $content-background-color; min-width: $content-min-width; diff --git a/src/app/ui/SVGEditor/PrintableArea.js b/src/app/ui/SVGEditor/PrintableArea.js index 8a5b023e6e..f705b96b8e 100644 --- a/src/app/ui/SVGEditor/PrintableArea.js +++ b/src/app/ui/SVGEditor/PrintableArea.js @@ -217,7 +217,6 @@ class PrintableArea { y: i + 1.2, id: uuid(), 'font-size': textSize, - 'font-family': 'roboto', fill: colorTextFill, 'text-anchor': 'middle', 'xml:space': 'preserve', @@ -255,7 +254,6 @@ class PrintableArea { y: i + 1.2, id: uuid(), 'font-size': textSize, - 'font-family': 'roboto', fill: colorTextFill, 'text-anchor': 'middle', 'xml:space': 'preserve', @@ -293,7 +291,6 @@ class PrintableArea { y: y + (coordinateModeName.indexOf('top') !== -1 ? -3 : 6), id: uuid(), 'font-size': textSize, - 'font-family': 'roboto', fill: colorTextFill, 'text-anchor': 'middle', 'xml:space': 'preserve', @@ -332,7 +329,6 @@ class PrintableArea { y: y + (coordinateModeName.indexOf('top') !== -1 ? -3 : 6), id: uuid(), 'font-size': textSize, - 'font-family': 'roboto', fill: colorTextFill, 'text-anchor': 'middle', 'xml:space': 'preserve', @@ -443,7 +439,6 @@ class PrintableArea { y: 30, id: uuid(), 'font-size': 24, - 'font-family': 'roboto', fill: '#ff7f00', 'text-anchor': 'middle', 'xml:space': 'preserve', diff --git a/src/app/ui/components/Buttons/styles.styl b/src/app/ui/components/Buttons/styles.styl index ac2378467b..2518daf255 100644 --- a/src/app/ui/components/Buttons/styles.styl +++ b/src/app/ui/components/Buttons/styles.styl @@ -1,7 +1,6 @@ @import "../../../styles/global-var"; button.button-lb { - font-family: 'Roboto Regular'; font-weight: normal; border-radius: $px-grade-4; padding-left: $px-grade-4; diff --git a/src/app/ui/components/Tabs/styles.styl b/src/app/ui/components/Tabs/styles.styl index c0f1193dba..7bd09bc04c 100644 --- a/src/app/ui/components/Tabs/styles.styl +++ b/src/app/ui/components/Tabs/styles.styl @@ -14,7 +14,6 @@ :global(.ant-tabs-tab-btn) { margin: 0 auto; padding: 0 8px; - font-family: 'Rotobo'; font-size: 18px; } } diff --git a/src/app/ui/components/Widget/index.styl b/src/app/ui/components/Widget/index.styl index 7eded8ac14..7574601e04 100644 --- a/src/app/ui/components/Widget/index.styl +++ b/src/app/ui/components/Widget/index.styl @@ -170,7 +170,6 @@ $widget-background-color = #fafafa; float: left; position: relative; font-size: 14px; - font-family: Arial, Helvetica, sans-serif; border-left: 1px solid rgba(0, 0, 0, .09); margin: 0; text-align: center; diff --git a/src/app/ui/widgets/CncLaserTopRight/styles.styl b/src/app/ui/widgets/CncLaserTopRight/styles.styl index 995f7abb2e..a719c1e01c 100644 --- a/src/app/ui/widgets/CncLaserTopRight/styles.styl +++ b/src/app/ui/widgets/CncLaserTopRight/styles.styl @@ -37,7 +37,6 @@ $z-index-float = 500 margin-left: 16px height: 16px; font-size: 14px; - font-family: Roboto-Medium, Roboto; font-weight: 500; color: #282828; line-height: 16px; @@ -48,7 +47,6 @@ $z-index-float = 500 margin-left: 16px height: 14px; font-size: 14px; - font-family: Roboto-Regular, Roboto; font-weight: 400 color: #282828; line-height: 16px diff --git a/src/app/ui/widgets/WorkspaceVisualizer/index.styl b/src/app/ui/widgets/WorkspaceVisualizer/index.styl index 51884de0a4..6c8b69246b 100644 --- a/src/app/ui/widgets/WorkspaceVisualizer/index.styl +++ b/src/app/ui/widgets/WorkspaceVisualizer/index.styl @@ -37,7 +37,6 @@ &-title font-size: 28px font-weight: bold - font-family: "Open sans", Helvetica, Arial margin: 20px 0 20px 10px &__refresh