From ec43a737f175f0cae3e7e9a24142f653dba0b579 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 3 Nov 2021 13:48:30 -0600 Subject: [PATCH] versioned old icomoon font --- assets/styles/layouts/_api-overrides.scss | 16 ++++++++-------- assets/styles/layouts/_error-page.scss | 2 +- assets/styles/layouts/_global.scss | 2 +- assets/styles/layouts/_inline-icons.scss | 2 +- assets/styles/layouts/_sidebar-toggle.scss | 2 +- assets/styles/layouts/_sidebar.scss | 4 ++-- assets/styles/layouts/_top-nav.scss | 6 +++--- assets/styles/layouts/_url-selector.scss | 2 +- assets/styles/layouts/article/_buttons.scss | 4 ++-- assets/styles/layouts/article/_children.scss | 2 +- assets/styles/layouts/article/_code.scss | 2 +- assets/styles/layouts/article/_feedback.scss | 4 ++-- .../layouts/article/_html-diagrams.scss | 2 +- .../layouts/article/_pagination-btns.scss | 4 ++-- assets/styles/layouts/article/_svgs.scss | 18 ------------------ assets/styles/styles-default.scss | 2 +- assets/styles/themes/_theme-light.scss | 2 +- .../tools/{_icomoon.scss => _icomoon-v2.scss} | 14 +++++++------- assets/styles/tools/_tooltips.scss | 3 --- layouts/partials/header/google-fonts.html | 4 +++- static/fonts/{icomoon.eot => icomoon-v2.eot} | Bin static/fonts/{icomoon.svg => icomoon-v2.svg} | 0 static/fonts/{icomoon.ttf => icomoon-v2.ttf} | Bin .../fonts/{icomoon.woff => icomoon-v2.woff} | Bin 24 files changed, 39 insertions(+), 58 deletions(-) rename assets/styles/tools/{_icomoon.scss => _icomoon-v2.scss} (91%) rename static/fonts/{icomoon.eot => icomoon-v2.eot} (100%) rename static/fonts/{icomoon.svg => icomoon-v2.svg} (100%) rename static/fonts/{icomoon.ttf => icomoon-v2.ttf} (100%) rename static/fonts/{icomoon.woff => icomoon-v2.woff} (100%) diff --git a/assets/styles/layouts/_api-overrides.scss b/assets/styles/layouts/_api-overrides.scss index e9a65eb0a..ac99fc5d4 100644 --- a/assets/styles/layouts/_api-overrides.scss +++ b/assets/styles/layouts/_api-overrides.scss @@ -1,9 +1,9 @@ @import "tools/color-palette"; -@import "tools/icomoon"; +@import "tools/icomoon-v2"; // Fonts $rubik: 'Rubik', sans-serif; -$roboto-mono: 'Roboto Mono', monospace; +$code: 'IBM Plex Mono', monospace;; // Font weights $medium: 500; @@ -60,7 +60,7 @@ $bold: 700; } &:before { content: "\e919"; - font-family: 'icomoon'; + font-family: 'icomoon-v2'; margin-right: .65rem; } } @@ -77,7 +77,7 @@ $bold: 700; display: inline-block; font-size: .95rem; margin-right: .5rem; - font-family: 'icomoon'; + font-family: 'icomoon-v2'; } &:hover { color: $g20-white; @@ -156,14 +156,14 @@ $bold: 700; } .redoc-json { - font-family: $roboto-mono !important; + font-family: $code !important; } // Inline Code .flfxUM code, .gDsWLk code, .kTVySD { - font-family: $roboto-mono !important; + font-family: $code !important; color: $cp-marguerite; background: $cp-titan; border-color: $cp-titan; @@ -275,7 +275,7 @@ $bold: 700; background-color: $g2-kevlar; font-family: $rubik; } -.iENVAs { font-family: $roboto-mono; } +.iENVAs { font-family: $code; } .dpMbau { font-family: $rubik; } // Code controls @@ -285,7 +285,7 @@ $bold: 700; } // Code blocks -.kZHJcC { font-family: $roboto-mono; } +.kZHJcC { font-family: $code; } .jCgylq { .token.string { color: $gr-honeydew; diff --git a/assets/styles/layouts/_error-page.scss b/assets/styles/layouts/_error-page.scss index 0743af4d8..6b86c8932 100644 --- a/assets/styles/layouts/_error-page.scss +++ b/assets/styles/layouts/_error-page.scss @@ -72,7 +72,7 @@ &.back:before { content: "\e90a"; - font-family: "icomoon"; + font-family: "icomoon-v2"; margin-right: .35rem; vertical-align: text-top; } diff --git a/assets/styles/layouts/_global.scss b/assets/styles/layouts/_global.scss index 895aa26da..786a5adb9 100644 --- a/assets/styles/layouts/_global.scss +++ b/assets/styles/layouts/_global.scss @@ -1,5 +1,5 @@ $rubik: 'Rubik', sans-serif; -$roboto-mono: 'Roboto Mono', monospace; +$code: 'IBM Plex Mono', monospace;; // Font weights $medium: 500; diff --git a/assets/styles/layouts/_inline-icons.scss b/assets/styles/layouts/_inline-icons.scss index e4b45a293..d89a473fc 100644 --- a/assets/styles/layouts/_inline-icons.scss +++ b/assets/styles/layouts/_inline-icons.scss @@ -9,7 +9,7 @@ &.large:before { font-size: 1.1rem; } &.add-btn-round { - font-family: "icomoon"; + font-family: "icomoon-v2"; color:#fff; background: linear-gradient(45deg,#5c10a0,#8e1fc3); border-radius:50%; diff --git a/assets/styles/layouts/_sidebar-toggle.scss b/assets/styles/layouts/_sidebar-toggle.scss index cac354039..d10372715 100644 --- a/assets/styles/layouts/_sidebar-toggle.scss +++ b/assets/styles/layouts/_sidebar-toggle.scss @@ -28,7 +28,7 @@ $vertical-offset: -14px; } & > a { - font-family: "icomoon"; + font-family: "icomoon-v2"; color: rgba($article-text, .5); text-decoration: none; } diff --git a/assets/styles/layouts/_sidebar.scss b/assets/styles/layouts/_sidebar.scss index f328b8a64..d49ad08c8 100644 --- a/assets/styles/layouts/_sidebar.scss +++ b/assets/styles/layouts/_sidebar.scss @@ -11,7 +11,7 @@ &:after { content: "\e905"; display: block; - font-family: 'icomoon'; + font-family: 'icomoon-v2'; position: absolute; top: .15rem; right: .25rem; @@ -287,7 +287,7 @@ &.platform, &.flux { &:after { content: "\e911"; - font-family: "icomoon"; + font-family: "icomoon-v2"; font-style: normal; font-size: 1rem; opacity: .4; diff --git a/assets/styles/layouts/_top-nav.scss b/assets/styles/layouts/_top-nav.scss index 0f5c99cdf..a0bade01c 100644 --- a/assets/styles/layouts/_top-nav.scss +++ b/assets/styles/layouts/_top-nav.scss @@ -7,7 +7,7 @@ z-index: 1; .influx-home { - font-family: 'icomoon'; + font-family: 'icomoon-v2'; font-size: 1.9rem; color: $topnav-link; text-decoration: none; @@ -76,7 +76,7 @@ &:after { content: "\e918"; - font-family: 'icomoon'; + font-family: 'icomoon-v2'; position: absolute; top: .45rem; right: .4rem; @@ -137,7 +137,7 @@ position: relative; &:after { content: "\e911"; - font-family: "icomoon"; + font-family: "icomoon-v2"; position: absolute; opacity: .4; margin-left: .25rem; diff --git a/assets/styles/layouts/_url-selector.scss b/assets/styles/layouts/_url-selector.scss index 67ba6b738..fcbd9e83e 100644 --- a/assets/styles/layouts/_url-selector.scss +++ b/assets/styles/layouts/_url-selector.scss @@ -332,7 +332,7 @@ label:after { content: "\e924"; display: inline-block; margin-right: .35rem; - font-family: "icomoon"; + font-family: "icomoon-v2"; font-style: normal; font-size: .8rem; } diff --git a/assets/styles/layouts/article/_buttons.scss b/assets/styles/layouts/article/_buttons.scss index 39bdedfce..44fc28e95 100644 --- a/assets/styles/layouts/article/_buttons.scss +++ b/assets/styles/layouts/article/_buttons.scss @@ -36,14 +36,14 @@ a.btn { &.download:before { content: "\e91d"; - font-family: "icomoon"; + font-family: "icomoon-v2"; margin-right: .5rem; font-size: 1.1rem; } &.github:before { content: "\eab0"; - font-family: "icomoon"; + font-family: "icomoon-v2"; margin-right: .5rem; font-size: 1.1rem; } diff --git a/assets/styles/layouts/article/_children.scss b/assets/styles/layouts/article/_children.scss index 092e22001..3d9a6f960 100644 --- a/assets/styles/layouts/article/_children.scss +++ b/assets/styles/layouts/article/_children.scss @@ -6,7 +6,7 @@ a a:after { content: "\e91a"; - font-family: "icomoon"; + font-family: "icomoon-v2"; color: rgba($article-heading, .35); vertical-align: bottom; transition: color .2s; diff --git a/assets/styles/layouts/article/_code.scss b/assets/styles/layouts/article/_code.scss index 11b5f6e57..b88fe081e 100644 --- a/assets/styles/layouts/article/_code.scss +++ b/assets/styles/layouts/article/_code.scss @@ -2,7 +2,7 @@ code,pre { background: $article-code-bg; - font-family: $roboto-mono; + font-family: $code; color: $article-code; } diff --git a/assets/styles/layouts/article/_feedback.scss b/assets/styles/layouts/article/_feedback.scss index 792c32c98..95327f1d6 100644 --- a/assets/styles/layouts/article/_feedback.scss +++ b/assets/styles/layouts/article/_feedback.scss @@ -33,7 +33,7 @@ color: $article-heading-alt; margin: 0 .25rem 0 -.25rem; font-size: 1.65rem; - font-family: 'icomoon'; + font-family: 'icomoon-v2'; vertical-align: middle; } &.slack:before { @@ -70,7 +70,7 @@ &:before { display: inline-block; margin-right: .5rem; - font-family: 'icomoon'; + font-family: 'icomoon-v2'; } &.edit:before { diff --git a/assets/styles/layouts/article/_html-diagrams.scss b/assets/styles/layouts/article/_html-diagrams.scss index aeebd4464..c467e1f7f 100644 --- a/assets/styles/layouts/article/_html-diagrams.scss +++ b/assets/styles/layouts/article/_html-diagrams.scss @@ -4,7 +4,7 @@ display: inline-block; margin: 1rem 0 2rem; padding: 1.5rem 2.5rem 1.5rem 1.5rem; - font-family: $roboto-mono; + font-family: $code; border-radius: $radius; box-shadow: 1px 3px 10px $article-shadow; & > ul { padding: 0; margin: 0; diff --git a/assets/styles/layouts/article/_pagination-btns.scss b/assets/styles/layouts/article/_pagination-btns.scss index 4e623f2a6..7f44860f7 100644 --- a/assets/styles/layouts/article/_pagination-btns.scss +++ b/assets/styles/layouts/article/_pagination-btns.scss @@ -17,7 +17,7 @@ &:before { content: "\e90a"; display: inline-block; - font-family: "icomoon"; + font-family: "icomoon-v2"; margin-right: .5rem; vertical-align: middle; } @@ -29,7 +29,7 @@ &:before { content: "\e90c"; display: inline-block; - font-family: "icomoon"; + font-family: "icomoon-v2"; margin-left: .5rem; vertical-align: middle; } diff --git a/assets/styles/layouts/article/_svgs.scss b/assets/styles/layouts/article/_svgs.scss index 0eda1c274..2f8d0d316 100644 --- a/assets/styles/layouts/article/_svgs.scss +++ b/assets/styles/layouts/article/_svgs.scss @@ -1,23 +1,5 @@ svg { - &#join-vs-union { - max-width: 525px; - width: 100%; - margin-bottom: 2rem; - - .st0{fill: $svg-table-code-bg;} - .st1{fill: $svg-table-header;} - .st2{fill: $svg-table-row-alt1;} - .st3{fill:none;stroke: $svg-table-stroke;stroke-width:2;stroke-miterlimit:10;} - .st4{fill:none;stroke: $svg-table-stroke;stroke-width:4;stroke-miterlimit:10;} - .st5{fill: $svg-table-row-alt2;} - .st6{fill: $svg-table-code;} - .st7{font-family:'Roboto Mono';} - .st8{font-size:14.2px;} - .st9{fill: $svg-table-code-operator;} - .st10{fill: $svg-table-code-string;} - } - &[id^='geo-s2-cells-'] { max-width: 250px; .geo-cell{fill:rgba($svg-geo-s2-cell, 0.25);stroke:$svg-geo-s2-cell;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:10;} diff --git a/assets/styles/styles-default.scss b/assets/styles/styles-default.scss index 36e7f6798..bd6bacdb6 100644 --- a/assets/styles/styles-default.scss +++ b/assets/styles/styles-default.scss @@ -1,7 +1,7 @@ // InfluxData Docs Default Theme (Light) // Import Tools -@import "tools/icomoon", +@import "tools/icomoon-v2", "tools/media-queries.scss", "tools/mixins.scss", "tools/tooltips", diff --git a/assets/styles/themes/_theme-light.scss b/assets/styles/themes/_theme-light.scss index 3f9e651f1..2dfd032e5 100644 --- a/assets/styles/themes/_theme-light.scss +++ b/assets/styles/themes/_theme-light.scss @@ -15,7 +15,7 @@ // -------------------------------------------------- $body-bg: $g18-cloud !default; -$radius: 3px !default; +$radius: 2px !default; // TopNav Colors $topnav-link: $g8-storm !default; diff --git a/assets/styles/tools/_icomoon.scss b/assets/styles/tools/_icomoon-v2.scss similarity index 91% rename from assets/styles/tools/_icomoon.scss rename to assets/styles/tools/_icomoon-v2.scss index c871239ff..d81cd1c1e 100644 --- a/assets/styles/tools/_icomoon.scss +++ b/assets/styles/tools/_icomoon-v2.scss @@ -1,10 +1,10 @@ @font-face { - font-family: 'icomoon'; - src: url('fonts/icomoon.eot?itn2ph'); - src: url('fonts/icomoon.eot?itn2ph#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?itn2ph') format('truetype'), - url('fonts/icomoon.woff?itn2ph') format('woff'), - url('fonts/icomoon.svg?itn2ph#icomoon') format('svg'); + font-family: 'icomoon-v2'; + src: url('fonts/icomoon-v2.eot?itn2ph'); + src: url('fonts/icomoon-v2.eot?itn2ph#iefix') format('embedded-opentype'), + url('fonts/icomoon-v2.ttf?itn2ph') format('truetype'), + url('fonts/icomoon-v2.woff?itn2ph') format('woff'), + url('fonts/icomoon-v2.svg?itn2ph#icomoon-v2') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -12,7 +12,7 @@ [class^="icon-"], [class*=" icon-"] { /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'icomoon' !important; + font-family: 'icomoon-v2' !important; speak: never; font-style: normal; font-weight: normal; diff --git a/assets/styles/tools/_tooltips.scss b/assets/styles/tools/_tooltips.scss index 72673ff6a..ff7e691f0 100644 --- a/assets/styles/tools/_tooltips.scss +++ b/assets/styles/tools/_tooltips.scss @@ -4,9 +4,6 @@ $medium: 500; $bold: 700; -// Border radius -$radius: 3px; - ////////////////////////////////// Tool Tips ////////////////////////////////// .tooltip { diff --git a/layouts/partials/header/google-fonts.html b/layouts/partials/header/google-fonts.html index 550b505c8..ad6667343 100644 --- a/layouts/partials/header/google-fonts.html +++ b/layouts/partials/header/google-fonts.html @@ -1 +1,3 @@ - + + + \ No newline at end of file diff --git a/static/fonts/icomoon.eot b/static/fonts/icomoon-v2.eot similarity index 100% rename from static/fonts/icomoon.eot rename to static/fonts/icomoon-v2.eot diff --git a/static/fonts/icomoon.svg b/static/fonts/icomoon-v2.svg similarity index 100% rename from static/fonts/icomoon.svg rename to static/fonts/icomoon-v2.svg diff --git a/static/fonts/icomoon.ttf b/static/fonts/icomoon-v2.ttf similarity index 100% rename from static/fonts/icomoon.ttf rename to static/fonts/icomoon-v2.ttf diff --git a/static/fonts/icomoon.woff b/static/fonts/icomoon-v2.woff similarity index 100% rename from static/fonts/icomoon.woff rename to static/fonts/icomoon-v2.woff