diff --git a/wiki/public/scss/edit_wiki.scss b/wiki/public/scss/edit_wiki.scss index cff26d8e..8d865568 100644 --- a/wiki/public/scss/edit_wiki.scss +++ b/wiki/public/scss/edit_wiki.scss @@ -10,7 +10,7 @@ body.dark { --editor-line-no-bg-color: var(--gray-800); --control-bg-on-gray: var(--gray-700); - .draft-wiki-page{ + .draft-wiki-page { background: var(--gray-700); color: var(--gray-50); } @@ -107,17 +107,17 @@ $font-sizes-mobile: ( } } - li > ul, - li > ol { + li>ul, + li>ol { padding-left: 1.5rem; } - ul > li:first-child { + ul>li:first-child { margin-top: 3px !important; } - ul > * + *, - ol > * + * { + ul>*+*, + ol>*+* { margin-top: 2px !important; } @@ -170,13 +170,13 @@ $font-sizes-mobile: ( } // for byline - & + p { + &+p { margin-top: 1.5rem !important; line-height: 1.4; } } - & > p { + &>p { margin-top: 1.5rem !important; } @@ -227,8 +227,8 @@ $font-sizes-mobile: ( margin-top: 1rem !important; } - tr > td, - tr > th { + tr>td, + tr>th { font-size: $font-size-sm; padding: 0.5rem; } @@ -243,14 +243,14 @@ $font-sizes-mobile: ( margin-top: 0.5rem !important; } - .screenshot + em { + .screenshot+em { text-align: center; display: block; margin-top: 0.5rem !important; margin-bottom: 2rem !important; } - p > code:not(.hljs) { + p>code:not(.hljs) { padding: 0 0.25rem; background-color: var(--code-bg-color); color: var(--code-text-color); @@ -275,7 +275,7 @@ $font-sizes-mobile: ( position: relative; >* { - margin-bottom: 0; + margin-bottom: 0; } } @@ -361,13 +361,17 @@ $font-sizes-mobile: ( background: none !important; del { - &.diffmod, &.diffdel { + + &.diffmod, + &.diffdel { background-color: #8B0000; } } ins { - &.diffmod, &.diffins { + + &.diffmod, + &.diffins { background-color: #006400; } } @@ -387,6 +391,7 @@ $font-sizes-mobile: ( h1 { margin-top: 0.75rem; } + button:not(.btn-primary) { all: unset; cursor: pointer; @@ -465,7 +470,7 @@ $font-sizes-mobile: ( margin-left: auto; display: inline-flex; - > * { + >* { margin: 0.5rem 0.25rem; } } @@ -479,7 +484,7 @@ $font-sizes-mobile: ( max-width: calc(100vw - 3rem); } - div > p:first-child { + div>p:first-child { margin-top: 1.5rem !important; line-height: 1.4; } @@ -503,8 +508,8 @@ $font-sizes-mobile: ( .btn.btn-primary:hover { color: #fff; - background-color: #0b5ed7; - border-color: #0a58ca; + background-color: #383838; + border-color: #383838; } // tiptap task-list @@ -513,38 +518,38 @@ ul[data-type="taskList"] { padding: 0; p { - margin: 0; + margin: 0; } li { - display: flex; - - > label { - flex: 0 0 auto; - margin-right: 0.25rem; - margin-bottom: 0; - user-select: none; - } - - > div { - flex: 1 1 auto; - } - - ul li, - ol li { - display: list-item; - } - - ul[data-type="taskList"] > li { - display: flex; - } - - input { - color: #000; - margin: .1rem; - margin-top: 0.4rem; - border: 1.25px solid black; - accent-color: black; - } - } - } \ No newline at end of file + display: flex; + + >label { + flex: 0 0 auto; + margin-right: 0.25rem; + margin-bottom: 0; + user-select: none; + } + + >div { + flex: 1 1 auto; + } + + ul li, + ol li { + display: list-item; + } + + ul[data-type="taskList"]>li { + display: flex; + } + + input { + color: #000; + margin: .1rem; + margin-top: 0.4rem; + border: 1.25px solid black; + accent-color: black; + } + } +} \ No newline at end of file diff --git a/wiki/public/scss/wiki.scss b/wiki/public/scss/wiki.scss index a78dcc77..ff1b7d0f 100644 --- a/wiki/public/scss/wiki.scss +++ b/wiki/public/scss/wiki.scss @@ -37,7 +37,7 @@ body { --editor-button-text-color: var(--gray-700); --editor-hover-button-color: var(--gray-100); -// ------------------------------------------ + // ------------------------------------------ font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", @@ -150,6 +150,7 @@ body.dark { .revision-message { display: inline; + @include media-breakpoint-down(sm) { display: block; } @@ -167,10 +168,10 @@ body.dark { } .web-sidebar { - .list-unstyled:first-child > * { + .list-unstyled:first-child>* { padding: 0.75rem 0; - &::before{ + &::before { content: ''; position: relative; top: -0.75rem; @@ -216,7 +217,7 @@ body.dark { } } - > ul { + >ul { padding-left: 0; margin-bottom: 0; } @@ -236,6 +237,7 @@ body.dark { div { cursor: pointer; + .h6 { font-size: $font-size-sm; margin-bottom: 0; @@ -371,7 +373,7 @@ body.dark { } .dropdown-menu { - position: sticky; + position: sticky; border: 1px solid var(--border-color); .dropdown-item { @@ -438,7 +440,7 @@ body.dark { } #searchModal { - > div:first-child { + >div:first-child { margin-top: 5rem; } @@ -501,7 +503,8 @@ body.dark { background-color: unset; } - &:focus, &:hover { + &:focus, + &:hover { background-color: var(--active-item-color); } @@ -521,7 +524,8 @@ body.dark { } .wiki-navbar-container { - padding: 1.2rem 0 1rem;; + padding: 1.2rem 0 1rem; + ; margin-left: 1rem; background-color: var(--background-color); box-shadow: 20px 5px 14px 8px var(--background-color); @@ -612,7 +616,8 @@ body.dark { .dropdown-item { color: var(--text-color); - &:active, &:hover { + &:active, + &:hover { background-color: var(--sidebar-hover-color); color: var(--text-color); } @@ -631,7 +636,7 @@ body.dark { } } -.wiki-content .from-markdown > :first-child { +.wiki-content .from-markdown> :first-child { margin-top: 0; } @@ -656,6 +661,7 @@ body.dark { margin-top: 0; } } + @include media-breakpoint-down(md) { width: auto; margin: unset; @@ -668,7 +674,13 @@ body.dark { // TODO: clear this when website related css is removed .wiki-page-content .from-markdown { - h1, h2, h3, h4, h5, h6{ + + h1, + h2, + h3, + h4, + h5, + h6 { &::before { height: 0; margin-top: 0; @@ -707,7 +719,7 @@ h6:hover .feather-link { #wikiOptionsButton::after { display: none; - } + } .dropdown-menu { min-width: 7.5rem; @@ -719,7 +731,7 @@ h6:hover .feather-link { border-radius: 5px; } -.dark .wiki-options:hover{ +.dark .wiki-options:hover { background-color: var(--gray-700); } @@ -777,6 +789,7 @@ h6:hover .feather-link { color: var(--sidebar-text-color); transform: translateX(-1px); } + a:hover:not(.active) { color: var(--toc-hover-text-color); } @@ -803,7 +816,8 @@ navbar .navbar-expand-lg { width: 100%; position: fixed; - top: 0; /*ensure navbar stays affixes to the top*/ + top: 0; + /*ensure navbar stays affixes to the top*/ left: 0; right: 0; } @@ -853,11 +867,12 @@ navbar padding-top: 0; } - .web-sidebar > a { + .web-sidebar>a { display: none; } .wiki-footer { + .btn.left, .btn.right { width: 100%; @@ -873,6 +888,7 @@ navbar width: 140%; } } + .search-nav-item { height: 2.2rem; } @@ -931,19 +947,19 @@ navbar .count { font-size: var(--text-xs); - background-color: var(--gray-500); - border-radius: var(--border-radius-sm); - color: var(--gray-50); - padding: 0 var(--padding-xs); + background-color: var(--gray-500); + border-radius: var(--border-radius-sm); + color: var(--gray-50); + padding: 0 var(--padding-xs); float: right; margin-top: 2px; } -img::after{ +img::after { content: ''; } -img[alt]::after{ +img[alt]::after { width: unset; height: unset; } @@ -1004,6 +1020,7 @@ h4 { @include media-breakpoint-up(sm) { margin-top: 2.5rem; } + a { color: $body-color; } @@ -1051,7 +1068,8 @@ p { line-height: 1.25rem; } - input, textarea { + input, + textarea { background-color: var(--searchbar-color); color: var(--text-color); } @@ -1091,7 +1109,7 @@ p { .modal-body { padding: 1rem; - .wiki-content{ + .wiki-content { min-height: unset; } } @@ -1110,7 +1128,9 @@ p { } del { - &.diffmod, &.diffdel { + + &.diffmod, + &.diffdel { * { border: 4px var(--htmldiff-del-color) solid !important; border-radius: 5px; @@ -1121,7 +1141,9 @@ del { } ins { - &.diffmod, &.diffins { + + &.diffmod, + &.diffins { * { border: 4px var(--htmldiff-ins-color) solid !important; border-radius: 5px; @@ -1129,4 +1151,4 @@ ins { all: unset; } -} +} \ No newline at end of file