Skip to content

Commit

Permalink
Fix: Fix Issue-1179 wrong fonts in some views (#1986)
Browse files Browse the repository at this point in the history
  • Loading branch information
@thmsnhl
thmsnhl authored Feb 22, 2023
1 parent 2e0c179 commit 7a56925
Show file tree
Hide file tree
Showing 13 changed files with 1 addition and 68 deletions.
1 change: 0 additions & 1 deletion src/app/styles/base.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

body {
margin: 0;
font-family: Arial, "Helvetica Neue", Helvetica, sans-serif;
font-size: 13px;
color: #222222;
text-align: left;
Expand Down
17 changes: 0 additions & 17 deletions src/app/styles/global-font.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -97,29 +87,25 @@
}

.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
background-color: $black-1;
}

.link-text {
font-family: 'Roboto, Helvetica Neue';
font-size: $font-size-base;
font-weight: $font-weight-normal;
color: $blue-2;
Expand All @@ -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;
Expand Down
10 changes: 0 additions & 10 deletions src/app/styles/global-heading.styl
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
@import "global-var";

.highlight-heading {
font-family: 'Alibaba Sans, Roboto';
font-size: $font-size-large;
font-weight: $font-weight-bold;
color: $black-2;
cursor pointer;
}

.highlight-heading-unselect-with-hover {
font-family: 'Alibaba Sans, Roboto';
font-size: $font-size-large;
font-weight: $font-weight-normal;
color: $black-4;
Expand All @@ -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;
Expand All @@ -45,7 +40,6 @@
font-size: $font-size-big;
font-weight $font-weight-normal;
color: $black-4;
font-family: 'Roboto';
&:hover {
color: $black-2;
}
Expand All @@ -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;
Expand All @@ -78,6 +69,5 @@
.heading-3-normal {
font-size: $font-size-middle;
font-weight: $font-weight-normal;
font-family: 'Roboto';
color: $black-3;
}
2 changes: 0 additions & 2 deletions src/app/styles/scaffolding.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -39,7 +38,6 @@ input,
button,
select,
textarea {
font-family: inherit;
font-size: inherit;
line-height: inherit;
}
Expand Down
25 changes: 0 additions & 25 deletions src/app/styles/typography.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/app/styles/xterm.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
1 change: 0 additions & 1 deletion src/app/ui/App.styl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import "variables";


.main {
background-color: $content-background-color;
min-width: $content-min-width;
Expand Down
5 changes: 0 additions & 5 deletions src/app/ui/SVGEditor/PrintableArea.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -443,7 +439,6 @@ class PrintableArea {
y: 30,
id: uuid(),
'font-size': 24,
'font-family': 'roboto',
fill: '#ff7f00',
'text-anchor': 'middle',
'xml:space': 'preserve',
Expand Down
1 change: 0 additions & 1 deletion src/app/ui/components/Buttons/styles.styl
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/app/ui/components/Tabs/styles.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
:global(.ant-tabs-tab-btn) {
margin: 0 auto;
padding: 0 8px;
font-family: 'Rotobo';
font-size: 18px;
}
}
Expand Down
1 change: 0 additions & 1 deletion src/app/ui/components/Widget/index.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions src/app/ui/widgets/CncLaserTopRight/styles.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/app/ui/widgets/WorkspaceVisualizer/index.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
&-title
font-size: 28px
font-weight: bold
font-family: "Open sans", Helvetica, Arial
margin: 20px 0 20px 10px

&__refresh
Expand Down

0 comments on commit 7a56925

Please sign in to comment.