diff --git a/label_studio/core/static/css/main.css b/label_studio/core/static/css/main.css index 8348a5cbf91c..4457d0a6a40f 100644 --- a/label_studio/core/static/css/main.css +++ b/label_studio/core/static/css/main.css @@ -3,7 +3,8 @@ html { } body { - font-family: 'Figtree', sans-serif !important; + --font-sans: 'Figtree', sans-serif !important; + --font-mono: Monaco, monospace; --sand_900: #12110D; --sand_800: #262522; diff --git a/web/apps/labelstudio/src/app/App.scss b/web/apps/labelstudio/src/app/App.scss index 0893664c7dee..84891ac0dd22 100644 --- a/web/apps/labelstudio/src/app/App.scss +++ b/web/apps/labelstudio/src/app/App.scss @@ -8,7 +8,6 @@ body { --menu-sidebar-width: 240px; margin: 0; - font-family: Figtree, sans-serif; } .app-wrapper { diff --git a/web/apps/labelstudio/src/components/Button/Button.scss b/web/apps/labelstudio/src/components/Button/Button.scss index 00179ad8afd0..a42e59dda10a 100644 --- a/web/apps/labelstudio/src/components/Button/Button.scss +++ b/web/apps/labelstudio/src/components/Button/Button.scss @@ -29,7 +29,7 @@ box-sizing: border-box; color: var(--button-color) !important; font-size: var(--button-font-size); - font-family: var(--font-family); + font-family: var(--font-sans); font-weight: var(--font-weight-500); line-height: var(--font-line-height-medium); width: var(--button-width); diff --git a/web/apps/labelstudio/src/components/Error/Error.scss b/web/apps/labelstudio/src/components/Error/Error.scss index 16a4888b871c..26442f680f2b 100644 --- a/web/apps/labelstudio/src/components/Error/Error.scss +++ b/web/apps/labelstudio/src/components/Error/Error.scss @@ -34,7 +34,7 @@ margin: 15px 0; } - &__stracktrace { + &__stacktrace { margin: 16px 0; padding: 16px; overflow: auto; @@ -43,7 +43,7 @@ white-space: pre; border-radius: 5px; background-color: var(--sand_100); - font-family: Monaco, monospace; + font-family: var(--font-mono); } &__version { diff --git a/web/apps/labelstudio/src/components/Form/Elements/Select/Select.scss b/web/apps/labelstudio/src/components/Form/Elements/Select/Select.scss index f45d2a2532fb..075251e0ace3 100644 --- a/web/apps/labelstudio/src/components/Form/Elements/Select/Select.scss +++ b/web/apps/labelstudio/src/components/Form/Elements/Select/Select.scss @@ -1,6 +1,5 @@ .select-ls { position: relative; - font-family: Figtree, sans-serif; &__list { top: 0; @@ -35,6 +34,5 @@ select:disabled { background: var(--sand_200); color: var(--sand_500); - font-family: Figtree, sans-serif; opacity: 1; } diff --git a/web/apps/labelstudio/src/pages/CreateProject/Config/Config.scss b/web/apps/labelstudio/src/pages/CreateProject/Config/Config.scss index db6125fca1be..57e5a1d18d4f 100644 --- a/web/apps/labelstudio/src/pages/CreateProject/Config/Config.scss +++ b/web/apps/labelstudio/src/pages/CreateProject/Config/Config.scss @@ -269,7 +269,7 @@ $scroll-width: 5px; textarea, :global(.react-codemirror2) { flex: 1; - font-family: monospace; + font-family: var(--font-mono); :global(.CodeMirror) { height: 100%; diff --git a/web/apps/labelstudio/src/pages/CreateProject/Config/codemirror.css b/web/apps/labelstudio/src/pages/CreateProject/Config/codemirror.css index ea6d8cf048e9..48823929a3b2 100644 --- a/web/apps/labelstudio/src/pages/CreateProject/Config/codemirror.css +++ b/web/apps/labelstudio/src/pages/CreateProject/Config/codemirror.css @@ -1,6 +1,7 @@ .CodeMirror-hints { z-index: 3000; } + .CodeMirror-hint-tag { white-space: normal; line-height: 1.4em; @@ -9,19 +10,22 @@ overflow: hidden; text-overflow: ellipsis; } + .CodeMirror-hint-name { - font-family: monospace; font-weight: 500; color: darkgoldenrod; + font-family: var(--font-mono); } + .CodeMirror-hint-active .CodeMirror-hint-name { color: blanchedalmond; } + .CodeMirror-hint-type { font-style: italic; color: #aaa; } + .CodeMirror-hint-active .CodeMirror-hint-type { color: #ddd; } -.CodeMirror-hint-description {} diff --git a/web/apps/labelstudio/src/pages/DataManager/DataManager.scss b/web/apps/labelstudio/src/pages/DataManager/DataManager.scss index de83f55c10c0..1697c3ec4174 100644 --- a/web/apps/labelstudio/src/pages/DataManager/DataManager.scss +++ b/web/apps/labelstudio/src/pages/DataManager/DataManager.scss @@ -4,4 +4,8 @@ #label-studio-dm [class*="Annotations_annotation_selected"] { background: var(--grape_0); } -} \ No newline at end of file +} + +.datamanager * { + font-family: var(--font-sans) !important; +} diff --git a/web/apps/labelstudio/src/themes/default/typography.scss b/web/apps/labelstudio/src/themes/default/typography.scss index 6ce061af8fd7..a88a62d1c3dc 100644 --- a/web/apps/labelstudio/src/themes/default/typography.scss +++ b/web/apps/labelstudio/src/themes/default/typography.scss @@ -16,7 +16,8 @@ } body { - --font-family: 'Figtree', sans-serif !important; + --font-sans: 'Figtree', sans-serif !important; + --font-mono: monaco, monospace !important; --font-weight-400: 400; --font-weight-500: 500; --font-weight-600: 600; @@ -25,4 +26,6 @@ body { --font-size-400: 16px; --font-line-height-small: 18px; --font-line-height-medium: 20px; + + font-family: var(--font-sans) !important; } diff --git a/web/libs/datamanager/public/index.html b/web/libs/datamanager/public/index.html index d0b9dc010629..f30a765bb0e4 100644 --- a/web/libs/datamanager/public/index.html +++ b/web/libs/datamanager/public/index.html @@ -32,7 +32,7 @@