diff --git a/assets/styles/layouts/_layout-article.scss b/assets/styles/layouts/_layout-article.scss index 232d9455e..7ec68f1d7 100644 --- a/assets/styles/layouts/_layout-article.scss +++ b/assets/styles/layouts/_layout-article.scss @@ -170,7 +170,7 @@ border-spacing: 0; color: $article-text; max-width: 100%; - overflow-x: scroll; + overflow-x: auto; overflow-y: hidden; box-shadow: 1px 3px 10px $article-shadow; border-radius: ($border-radius * 1.5); @@ -520,14 +520,17 @@ } ///////////////////////////////// Scroll Bars ////////////////////////////////// - pre { - @include scrollbar($article-code-bg, $article-code-scrollbar); + + pre { @include scrollbar($article-code-bg, $article-code-scrollbar); } + table { @include scrollbar($article-table-row-alt, $article-code-scrollbar);} + + .note { + pre { @include scrollbar($article-note-code-bg, $article-note-code-scrollbar); } + table { @include scrollbar($article-note-table-row-alt, $article-note-code-scrollbar); } } - .note pre { - @include scrollbar($article-note-code-bg, $article-note-code-scrollbar); - } - .warn pre { - @include scrollbar($article-warn-code-bg, $article-warn-code-scrollbar); + .warn { + pre { @include scrollbar($article-warn-code-bg, $article-warn-code-scrollbar); } + table { @include scrollbar($article-warn-table-row-alt, $article-warn-code-scrollbar); } } } diff --git a/assets/styles/layouts/_layout-topnav.scss b/assets/styles/layouts/_layout-topnav.scss index 88ff001ab..07d866a58 100644 --- a/assets/styles/layouts/_layout-topnav.scss +++ b/assets/styles/layouts/_layout-topnav.scss @@ -94,6 +94,17 @@ } &:last-child { border-radius: 0 0 $border-radius $border-radius; + position: relative; + } + &.legacy { + position: relative; + &:after { + content: "\e911"; + font-family: "icomoon"; + position: absolute; + opacity: .4; + margin-left: .25rem; + } } } } diff --git a/assets/styles/tools/_icomoon.scss b/assets/styles/tools/_icomoon.scss index 973494c65..fb5febeb6 100644 --- a/assets/styles/tools/_icomoon.scss +++ b/assets/styles/tools/_icomoon.scss @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src: url('fonts/icomoon.eot?kl9kq'); - src: url('fonts/icomoon.eot?kl9kq#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?kl9kq') format('truetype'), - url('fonts/icomoon.woff?kl9kq') format('woff'), - url('fonts/icomoon.svg?kl9kq#icomoon') format('svg'); + src: url('fonts/icomoon.eot?ppkm5'); + src: url('fonts/icomoon.eot?ppkm5#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?ppkm5') format('truetype'), + url('fonts/icomoon.woff?ppkm5') format('woff'), + url('fonts/icomoon.svg?ppkm5#icomoon') format('svg'); font-weight: normal; font-style: normal; } @@ -24,6 +24,60 @@ -moz-osx-font-smoothing: grayscale; } +.icon-alert-triangle:before { + content: "\e902"; +} +.icon-arrow-down:before { + content: "\e903"; +} +.icon-arrow-down-circle:before { + content: "\e907"; +} +.icon-arrow-down-left:before { + content: "\e908"; +} +.icon-arrow-down-right:before { + content: "\e909"; +} +.icon-arrow-left:before { + content: "\e90a"; +} +.icon-arrow-left-circle:before { + content: "\e90b"; +} +.icon-arrow-right:before { + content: "\e90c"; +} +.icon-arrow-right-circle:before { + content: "\e90d"; +} +.icon-arrow-up:before { + content: "\e90e"; +} +.icon-arrow-up-circle:before { + content: "\e90f"; +} +.icon-arrow-up-left:before { + content: "\e910"; +} +.icon-arrow-up-right:before { + content: "\e911"; +} +.icon-check:before { + content: "\e912"; +} +.icon-heart1:before { + content: "\e913"; +} +.icon-settings:before { + content: "\e914"; +} +.icon-zoom-in:before { + content: "\e915"; +} +.icon-zoom-out:before { + content: "\e916"; +} .icon-moon1:before { content: "\e904"; } @@ -39,89 +93,23 @@ .icon-influx-logotype:before { content: "\e901"; } -.icon-sun:before { - content: "\e902"; -} -.icon-moon:before { - content: "\e903"; -} -.icon-files-empty:before { - content: "\e925"; -} -.icon-folder-download:before { - content: "\e933"; -} .icon-folder-upload:before { content: "\e934"; } .icon-map2:before { content: "\e94c"; } -.icon-clock:before { - content: "\e94e"; -} .icon-download:before { content: "\e960"; } .icon-upload:before { content: "\e961"; } -.icon-zoom-in:before { - content: "\e987"; -} -.icon-zoom-out:before { - content: "\e988"; -} .icon-cog:before { content: "\e994"; } -.icon-plus:before { - content: "\ea0a"; -} -.icon-minus:before { - content: "\ea0b"; -} -.icon-cancel-circle:before { - content: "\ea0d"; -} -.icon-blocked:before { - content: "\ea0e"; -} -.icon-cross:before { - content: "\ea0f"; -} -.icon-checkmark:before { - content: "\ea10"; -} -.icon-checkmark2:before { - content: "\ea11"; -} -.icon-arrow-up-left2:before { - content: "\ea39"; -} -.icon-arrow-up2:before { - content: "\ea3a"; -} -.icon-arrow-up-right2:before { - content: "\ea3b"; -} -.icon-arrow-right2:before { - content: "\ea3c"; -} -.icon-arrow-down-right2:before { - content: "\ea3d"; -} -.icon-arrow-down2:before { - content: "\ea3e"; -} -.icon-arrow-down-left2:before { - content: "\ea3f"; -} -.icon-arrow-left2:before { - content: "\ea40"; -} -.icon-new-tab:before { - content: "\ea7e"; +.icon-heart:before { + content: "\e9da"; } .icon-tux:before { content: "\eabd"; diff --git a/assets/styles/tools/mixins.scss b/assets/styles/tools/mixins.scss index dc4b75bcb..51e3f07fc 100644 --- a/assets/styles/tools/mixins.scss +++ b/assets/styles/tools/mixins.scss @@ -5,7 +5,7 @@ height: 12px; } &::-webkit-scrollbar-track { - background-color: rgba($bg-color, 0); + background-color: $bg-color; } &::-webkit-scrollbar-thumb { background-color: $thumb-color; diff --git a/layouts/partials/topnav.html b/layouts/partials/topnav.html index c1cf72f87..9ef49c28f 100644 --- a/layouts/partials/topnav.html +++ b/layouts/partials/topnav.html @@ -17,7 +17,7 @@ {{ end }}