sync notes(auto)
Some checks are pending
Build and Test / build-and-test (macos-latest) (push) Waiting to run
Build and Test / build-and-test (ubuntu-latest) (push) Waiting to run
Build and Test / build-and-test (windows-latest) (push) Waiting to run
Build and Test / publish-tag (push) Waiting to run
/ test (push) Waiting to run
Deploy Quartz site to GitHub Pages / build (push) Waiting to run
Deploy Quartz site to GitHub Pages / deploy (push) Blocked by required conditions
Some checks are pending
Build and Test / build-and-test (macos-latest) (push) Waiting to run
Build and Test / build-and-test (ubuntu-latest) (push) Waiting to run
Build and Test / build-and-test (windows-latest) (push) Waiting to run
Build and Test / publish-tag (push) Waiting to run
/ test (push) Waiting to run
Deploy Quartz site to GitHub Pages / build (push) Waiting to run
Deploy Quartz site to GitHub Pages / deploy (push) Blocked by required conditions
This commit is contained in:
parent
68d6eb58d0
commit
7390615c3e
3 changed files with 33 additions and 170 deletions
|
@ -24,6 +24,7 @@ section {
|
|||
padding: 0 0.1rem;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
::selection {
|
||||
background: color-mix(in srgb, var(--tertiary) 60%, rgba(255, 255, 255, 0));
|
||||
color: var(--darkgray);
|
||||
|
@ -90,6 +91,7 @@ a {
|
|||
border-radius: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
&.tag-link {
|
||||
&::before {
|
||||
content: "#";
|
||||
|
@ -109,58 +111,27 @@ a {
|
|||
|
||||
.desktop-only {
|
||||
display: initial;
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> parent of fd6c0cb (tweak)
|
||||
=======
|
||||
>>>>>>> parent of fd6c0cb (tweak)
|
||||
@media all and ($mobile) {
|
||||
=======
|
||||
@media all and (max-width: $fullPageWidth) {
|
||||
>>>>>>> parent of b41a266 (merge upstream)
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.mobile-only {
|
||||
display: none;
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> parent of fd6c0cb (tweak)
|
||||
=======
|
||||
>>>>>>> parent of fd6c0cb (tweak)
|
||||
@media all and ($mobile) {
|
||||
=======
|
||||
@media all and (max-width: $fullPageWidth) {
|
||||
>>>>>>> parent of b41a266 (merge upstream)
|
||||
display: initial;
|
||||
}
|
||||
}
|
||||
|
||||
.page {
|
||||
<<<<<<< HEAD
|
||||
max-width: calc(#{map-get($breakpoints, desktop)} + 300px);
|
||||
margin: 0 auto;
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
@media all and (max-width: $fullPageWidth) {
|
||||
margin: 0 auto;
|
||||
padding: 0 1rem;
|
||||
max-width: $pageWidth;
|
||||
}
|
||||
>>>>>>> parent of b41a266 (merge upstream)
|
||||
|
||||
=======
|
||||
>>>>>>> parent of fd6c0cb (tweak)
|
||||
=======
|
||||
>>>>>>> parent of fd6c0cb (tweak)
|
||||
& article {
|
||||
&>h1 {
|
||||
font-size: 2rem;
|
||||
|
@ -187,49 +158,12 @@ a {
|
|||
}
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
&>#quartz-body {
|
||||
=======
|
||||
& > #quartz-body {
|
||||
>>>>>>> parent of fd6c0cb (tweak)
|
||||
=======
|
||||
& > #quartz-body {
|
||||
>>>>>>> parent of fd6c0cb (tweak)
|
||||
display: grid;
|
||||
grid-template-columns: #{map-get($desktopGrid, templateColumns)};
|
||||
grid-template-rows: #{map-get($desktopGrid, templateRows)};
|
||||
column-gap: #{map-get($desktopGrid, columnGap)};
|
||||
row-gap: #{map-get($desktopGrid, rowGap)};
|
||||
grid-template-areas: #{map-get($desktopGrid, templateAreas)};
|
||||
@media all and ($tablet) {
|
||||
grid-template-columns: #{map-get($tabletGrid, templateColumns)};
|
||||
grid-template-rows: #{map-get($tabletGrid, templateRows)};
|
||||
column-gap: #{map-get($tabletGrid, columnGap)};
|
||||
row-gap: #{map-get($tabletGrid, rowGap)};
|
||||
grid-template-areas: #{map-get($tabletGrid, templateAreas)};
|
||||
}
|
||||
@media all and ($mobile) {
|
||||
grid-template-columns: #{map-get($mobileGrid, templateColumns)};
|
||||
grid-template-rows: #{map-get($mobileGrid, templateRows)};
|
||||
column-gap: #{map-get($mobileGrid, columnGap)};
|
||||
row-gap: #{map-get($mobileGrid, rowGap)};
|
||||
grid-template-areas: #{map-get($mobileGrid, templateAreas)};
|
||||
}
|
||||
|
||||
@media all and not ($desktop) {
|
||||
padding: 0 1rem;
|
||||
}
|
||||
@media all and ($mobile) {
|
||||
margin: 0 auto;
|
||||
=======
|
||||
&>#quartz-body {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
|
||||
@media all and (max-width: $fullPageWidth) {
|
||||
flex-direction: column;
|
||||
>>>>>>> parent of b41a266 (merge upstream)
|
||||
}
|
||||
|
||||
& .sidebar {
|
||||
|
@ -243,6 +177,7 @@ a {
|
|||
box-sizing: border-box;
|
||||
padding: 0 4rem;
|
||||
position: fixed;
|
||||
|
||||
@media all and (max-width: $fullPageWidth) {
|
||||
position: initial;
|
||||
flex-direction: row;
|
||||
|
@ -253,62 +188,18 @@ a {
|
|||
}
|
||||
|
||||
& .sidebar.left {
|
||||
<<<<<<< HEAD
|
||||
z-index: 1;
|
||||
grid-area: grid-sidebar-left;
|
||||
flex-direction: column;
|
||||
@media all and ($mobile) {
|
||||
=======
|
||||
left: calc(calc(100vw - $pageWidth) / 2 - $sidePanelWidth);
|
||||
|
||||
@media all and (max-width: $fullPageWidth) {
|
||||
>>>>>>> parent of b41a266 (merge upstream)
|
||||
gap: 0;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
& .sidebar.right {
|
||||
<<<<<<< HEAD
|
||||
grid-area: grid-sidebar-right;
|
||||
margin-right: 0;
|
||||
flex-direction: column;
|
||||
@media all and ($mobile) {
|
||||
margin-left: inherit;
|
||||
margin-right: inherit;
|
||||
}
|
||||
@media all and not ($desktop) {
|
||||
position: initial;
|
||||
height: unset;
|
||||
width: 100%;
|
||||
flex-direction: row;
|
||||
padding: 0;
|
||||
& > * {
|
||||
flex: 1;
|
||||
}
|
||||
& > .toc {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
& .page-header,
|
||||
& .page-footer {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
|
||||
& .page-header {
|
||||
grid-area: grid-header;
|
||||
margin: $topSpacing 0 0 0;
|
||||
@media all and ($mobile) {
|
||||
margin-top: 0;
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
|
||||
& .center > article {
|
||||
grid-area: grid-center;
|
||||
=======
|
||||
right: calc(calc(100vw - $pageWidth) / 2 - $sidePanelWidth);
|
||||
flex-wrap: wrap;
|
||||
|
||||
&>* {
|
||||
@media all and (max-width: $fullPageWidth) {
|
||||
flex: 1;
|
||||
|
@ -325,42 +216,25 @@ a {
|
|||
|
||||
@media all and (max-width: $fullPageWidth) {
|
||||
width: initial;
|
||||
>>>>>>> parent of b41a266 (merge upstream)
|
||||
}
|
||||
}
|
||||
|
||||
& .page-header {
|
||||
margin: $topSpacing auto 0 auto;
|
||||
|
||||
@media all and (max-width: $fullPageWidth) {
|
||||
margin-top: 2rem;
|
||||
}
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
& .center,
|
||||
& footer {
|
||||
max-width: 100%;
|
||||
min-width: 100%;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
@media all and ($tablet) {
|
||||
margin-right: 0;
|
||||
}
|
||||
@media all and ($mobile) {
|
||||
margin-right: 0;
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
& footer {
|
||||
=======
|
||||
& .center,
|
||||
& footer {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
width: $pageWidth;
|
||||
|
||||
@media all and (max-width: $fullPageWidth) {
|
||||
width: initial;
|
||||
>>>>>>> parent of b41a266 (merge upstream)
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
|
@ -602,6 +476,7 @@ td {
|
|||
|
||||
tr {
|
||||
border-bottom: 1px solid var(--lightgray);
|
||||
|
||||
&:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
@ -652,18 +527,8 @@ ol.overflow {
|
|||
&>li:last-of-type {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
>>>>>>> parent of fd6c0cb (tweak)
|
||||
=======
|
||||
>>>>>>> parent of fd6c0cb (tweak)
|
||||
/*&:after {
|
||||
=======
|
||||
&:after {
|
||||
>>>>>>> parent of b41a266 (merge upstream)
|
||||
pointer-events: none;
|
||||
content: "";
|
||||
width: 100%;
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
/*
|
||||
@use "./base.scss";
|
||||
|
||||
$root-font-size: 18px;
|
||||
|
@ -144,4 +143,3 @@ code {
|
|||
font-family: $pre-font-family !important;
|
||||
line-height: 1rem !important;
|
||||
}
|
||||
*/
|
Loading…
Reference in a new issue