kazbo/public_notes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Revert "tweak"

Browse source 
This reverts commit fd6c0cb28e.
This commit is contained in:
Kaz Saita(raspi5) 2024-10-24 17:57:12 +09:00
parent b36adb2819
commit 68d6eb58d0
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
quartz/styles/base.scss
View file

@ -111,7 +111,10 @@ a {
display: initial;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> parent of fd6c0cb (tweak)
=======
>>>>>>> parent of fd6c0cb (tweak)
@media all and ($mobile) {
@ -126,7 +129,10 @@ a {
display: none;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> parent of fd6c0cb (tweak)
=======
>>>>>>> parent of fd6c0cb (tweak)
@media all and ($mobile) {
@ -142,6 +148,7 @@ a {
max-width: calc(#{map-get($breakpoints, desktop)} + 300px);
margin: 0 auto;
<<<<<<< HEAD
<<<<<<< HEAD
=======
@media all and (max-width: $fullPageWidth) {
margin: 0 auto;
@ -150,6 +157,8 @@ a {
}
>>>>>>> parent of b41a266 (merge upstream)
=======
>>>>>>> parent of fd6c0cb (tweak)
=======
>>>>>>> parent of fd6c0cb (tweak)
& article {
@ -178,9 +187,13 @@ a {
}
}
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
&>#quartz-body {
=======
& > #quartz-body {
>>>>>>> parent of fd6c0cb (tweak)
=======
& > #quartz-body {
>>>>>>> parent of fd6c0cb (tweak)
@ -640,9 +653,12 @@ ol.overflow {
margin-bottom: 30px;
}
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> parent of fd6c0cb (tweak)
=======
>>>>>>> parent of fd6c0cb (tweak)
/*&:after {
=======

3
quartz/styles/variables.scss
View file

@ -43,7 +43,10 @@ $desktopGrid: (
"grid-sidebar-left grid-footer grid-sidebar-right"',
);
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> parent of b41a266 (merge upstream)
=======
>>>>>>> parent of fd6c0cb (tweak)
=======
>>>>>>> parent of fd6c0cb (tweak)