diff options
author | Jimmy Cai <github@jimmycai.com> | 2022-10-29 18:14:19 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-29 18:14:19 +0300 |
commit | b03390d237427a2b9cfee55949cb1da62f1a6856 (patch) | |
tree | fd7da57cfcebc07d16483f3e9c3d71aee3562138 /assets/scss/partials | |
parent | 8a597a5c9c861d2bce22a5e06c7667cd9c8e263a (diff) |
Revert "Merge branch 'canary' into master" (#712)
Revert "Merge branch 'canary' into master (#711)"
This reverts commit 8a597a5c9c861d2bce22a5e06c7667cd9c8e263a.
Diffstat (limited to 'assets/scss/partials')
-rw-r--r-- | assets/scss/partials/article.scss | 1 | ||||
-rw-r--r-- | assets/scss/partials/highlight/dark.scss | 2 | ||||
-rw-r--r-- | assets/scss/partials/layout/article.scss | 48 | ||||
-rw-r--r-- | assets/scss/partials/layout/search.scss | 4 | ||||
-rw-r--r-- | assets/scss/partials/sidebar.scss | 6 |
5 files changed, 25 insertions, 36 deletions
diff --git a/assets/scss/partials/article.scss b/assets/scss/partials/article.scss index a041e9b..f085ff0 100644 --- a/assets/scss/partials/article.scss +++ b/assets/scss/partials/article.scss @@ -192,6 +192,7 @@ .article-preview { font-size: 1.4rem; color: var(--card-text-color-tertiary); + margin-top: 10px; line-height: 1.5; } } diff --git a/assets/scss/partials/highlight/dark.scss b/assets/scss/partials/highlight/dark.scss index 3ea6c56..0d3f330 100644 --- a/assets/scss/partials/highlight/dark.scss +++ b/assets/scss/partials/highlight/dark.scss @@ -11,4 +11,4 @@ $text-color: $color; $name-color: #a6e22e; $literal-color: #e6db74; -@import "common.scss";
\ No newline at end of file +@import "common.scss"; diff --git a/assets/scss/partials/layout/article.scss b/assets/scss/partials/layout/article.scss index ba06c11..97c7e77 100644 --- a/assets/scss/partials/layout/article.scss +++ b/assets/scss/partials/layout/article.scss @@ -286,12 +286,10 @@ line-height: 1.428571429; word-break: break-all; padding: var(--card-padding); - // keep Codeblocks LTR [dir="rtl"] & { direction: ltr; } - code { color: unset; border: none; @@ -305,11 +303,15 @@ padding: var(--card-padding); position: relative; + &:hover { + .copyCodeButton { + opacity: 1; + } + } // keep Codeblocks LTR [dir="rtl"] & { direction: ltr; } - pre { margin: initial; padding: 0; @@ -318,30 +320,20 @@ } } - .codeblock { - header { - background-color: var(--card-background-selected); - padding: 5px var(--card-padding); - display: flex; - justify-content: space-between; - box-shadow: var(--shadow-l1); - - span { - text-transform: uppercase; - font-weight: bold; - color: var(--card-text-color-secondary); - } - } - - .codeblock-copy { - cursor: pointer; - background-color: transparent; - border: none; - padding: 8px 16px; - color: var(--card-text-color-secondary); - font-size: 14px; - font-weight: bold; - } + .copyCodeButton { + position: absolute; + top: calc(var(--card-padding)); + right: calc(var(--card-padding)); + background: var(--card-background); + border: none; + box-shadow: var(--shadow-l2); + border-radius: var(--tag-border-radius); + padding: 8px 16px; + color: var(--card-text-color-main); + cursor: pointer; + font-size: 14px; + opacity: 0; + transition: opacity 0.3s ease; } .table-wrapper { @@ -410,7 +402,7 @@ /// Negative margins blockquote, figure, - .codeblock, + .highlight, pre, .gallery, .video-wrapper, diff --git a/assets/scss/partials/layout/search.scss b/assets/scss/partials/layout/search.scss index cbf15b7..89cdcef 100644 --- a/assets/scss/partials/layout/search.scss +++ b/assets/scss/partials/layout/search.scss @@ -31,7 +31,6 @@ input { padding: 40px 20px 20px; - padding-inline-end: var(--button-size); border-radius: var(--card-border-radius); background-color: var(--card-background); box-shadow: var(--shadow-l1); @@ -79,4 +78,5 @@ height: 20px; } } -} + +}
\ No newline at end of file diff --git a/assets/scss/partials/sidebar.scss b/assets/scss/partials/sidebar.scss index 75332a7..95310ca 100644 --- a/assets/scss/partials/sidebar.scss +++ b/assets/scss/partials/sidebar.scss @@ -11,6 +11,7 @@ flex-direction: column; flex-shrink: 0; align-self: stretch; + gap: var(--sidebar-element-separation); max-width: none; width: 100%; position: relative; @@ -64,11 +65,6 @@ } } } - - .social-menu, - .menu { - margin-top: var(--sidebar-element-separation); - } } .right-sidebar { |