From 708d5c1fbc80428f01cb5c8a627fc157ec4ca561 Mon Sep 17 00:00:00 2001
From: alexanderdavide <alexeble1998@gmail.com>
Date: Sun, 20 Feb 2022 14:47:52 +0000
Subject: [PATCH] style: move themed below base declarations; add whitespace
---
assets/scss/partials/_hugo.scss | 6 ++
assets/scss/partials/components/_pagination.scss | 7 ++-
assets/scss/modules/_config.scss | 1
assets/scss/partials/components/_alert.scss | 16 ++++---
assets/scss/partials/components/_footer.scss | 1
assets/scss/partials/_base.scss | 1
assets/scss/partials/components/_category.scss | 13 ++++--
assets/scss/partials/components/_navbarburger.scss | 8 ++-
assets/scss/partials/components/_post.scss | 17 +++++---
assets/scss/partials/components/_wrapper.scss | 1
assets/scss/partials/components/_info.scss | 3 +
11 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/assets/scss/modules/_config.scss b/assets/scss/modules/_config.scss
index 146870f..92435d3 100644
--- a/assets/scss/modules/_config.scss
+++ b/assets/scss/modules/_config.scss
@@ -20,6 +20,7 @@
@include desktop {
@content;
}
+
@include print {
@content;
}
diff --git a/assets/scss/partials/_base.scss b/assets/scss/partials/_base.scss
index 9ed255d..1d74670 100644
--- a/assets/scss/partials/_base.scss
+++ b/assets/scss/partials/_base.scss
@@ -5,6 +5,7 @@
font-family: 'PingHei', 'PingFang SC', 'Helvetica Neue', 'Work Sans', 'Hiragino Sans GB', sans-serif;
font-size: 1.6rem;
}
+
@include rtl {
font-family: 'Tajawal', sans-serif;
font-size: 1.5rem;
diff --git a/assets/scss/partials/_hugo.scss b/assets/scss/partials/_hugo.scss
index c49f927..d46923d 100644
--- a/assets/scss/partials/_hugo.scss
+++ b/assets/scss/partials/_hugo.scss
@@ -1,5 +1,6 @@
a {
text-decoration: none;
+
@include themed() {
color: t('primary');
}
@@ -12,16 +13,19 @@
}
blockquote {
+ padding: 0 1em;
+
@include themed() {
color: t('primary');
+
@include ltr {
border-left: t('border');
}
+
@include rtl {
border-right: t('border');
}
}
- padding: 0 1em;
}
p {
diff --git a/assets/scss/partials/components/_alert.scss b/assets/scss/partials/components/_alert.scss
index b09f66f..5612969 100644
--- a/assets/scss/partials/components/_alert.scss
+++ b/assets/scss/partials/components/_alert.scss
@@ -1,18 +1,15 @@
.alert {
- @include themed() {
- border-color: t('alert');
- }
padding: 1rem;
border-style: solid;
border-radius: 0.25rem;
border-width: 2px;
margin-top: 1rem;
+ @include themed() {
+ border-color: t('alert');
+ }
+
&__indicator {
- @include themed() {
- color: t('accent');
- background-color: t('alert');
- }
display: inline-block;
border-radius: 9999px;
padding: 0.5rem;
@@ -21,5 +18,10 @@
text-align: center;
font-weight: 800;
margin-right: 0.75rem;
+
+ @include themed() {
+ color: t('accent');
+ background-color: t('alert');
+ }
}
}
diff --git a/assets/scss/partials/components/_category.scss b/assets/scss/partials/components/_category.scss
index d31f9d4..ba0283a 100644
--- a/assets/scss/partials/components/_category.scss
+++ b/assets/scss/partials/components/_category.scss
@@ -1,17 +1,20 @@
.category {
- @include themed() {
- border: t('border');
- background-color: t('primary-lighter');
- color: t('primary') !important;
- }
padding: 4px 6px;
border-radius: 3px;
display: inline-block;
font-size: 1.5rem;
line-height: 1;
+
+ @include themed() {
+ border: t('border');
+ background-color: t('primary-lighter');
+ color: t('primary') !important;
+ }
+
@include ltr {
margin: 5px 8px 5px 0;
}
+
@include rtl {
margin: 5px 0 5px 8px;
}
diff --git a/assets/scss/partials/components/_footer.scss b/assets/scss/partials/components/_footer.scss
index 8768b7c..b394b53 100644
--- a/assets/scss/partials/components/_footer.scss
+++ b/assets/scss/partials/components/_footer.scss
@@ -23,6 +23,7 @@
&__sidebar {
display: none;
+
@include desktop_and_print {
display: inline-block;
}
diff --git a/assets/scss/partials/components/_info.scss b/assets/scss/partials/components/_info.scss
index 46ba34e..08ec95f 100644
--- a/assets/scss/partials/components/_info.scss
+++ b/assets/scss/partials/components/_info.scss
@@ -3,9 +3,11 @@
&__icon {
opacity: 0.5;
+
@include ltr {
margin-right: 4px;
}
+
@include rtl {
margin-left: 4px;
}
@@ -16,6 +18,7 @@
@include ltr {
margin-right: 4px;
}
+
@include rtl {
margin-left: 4px;
}
diff --git a/assets/scss/partials/components/_navbarburger.scss b/assets/scss/partials/components/_navbarburger.scss
index ab3e7c1..9708482 100644
--- a/assets/scss/partials/components/_navbarburger.scss
+++ b/assets/scss/partials/components/_navbarburger.scss
@@ -7,9 +7,6 @@
margin-left: auto;
&__line {
- @include themed() {
- background-color: t('primary');
- }
display: block;
height: 1px;
left: calc(50% - 8px);
@@ -20,6 +17,10 @@
transition-timing-function: ease-out;
width: 16px;
+ @include themed() {
+ background-color: t('primary');
+ }
+
&:nth-child(1) {
top: calc(50% - 6px);
}
@@ -32,6 +33,7 @@
top: calc(50% + 4px);
}
}
+
@include desktop {
display: none;
}
diff --git a/assets/scss/partials/components/_pagination.scss b/assets/scss/partials/components/_pagination.scss
index 4372d86..5419002 100644
--- a/assets/scss/partials/components/_pagination.scss
+++ b/assets/scss/partials/components/_pagination.scss
@@ -9,13 +9,14 @@
padding: 0;
height: 13px;
&-item {
- @include themed() {
- color: t('primary');
- }
margin: 0 2px 0 2px;
display: inline;
line-height: 1;
text-decoration: none;
+
+ @include themed() {
+ color: t('primary');
+ }
}
}
}
diff --git a/assets/scss/partials/components/_post.scss b/assets/scss/partials/components/_post.scss
index 4bb41a9..c16feee 100644
--- a/assets/scss/partials/components/_post.scss
+++ b/assets/scss/partials/components/_post.scss
@@ -1,8 +1,9 @@
.post {
+ margin: 30px;
+
@include themed() {
background-color: t('accent');
}
- margin: 30px;
&__more {
font-size: 1.4rem;
@@ -15,14 +16,15 @@
display: block;
&-wrapper {
- @include themed() {
- box-shadow: t('shadow');
- }
border-radius: 0.5em;
width: 100%;
margin-bottom: 1em;
overflow: hidden;
transition: box-shadow 0.3s ease;
+
+ @include themed() {
+ box-shadow: t('shadow');
+ }
}
}
@@ -121,6 +123,7 @@
&.right {
@include desktop {
max-width: 50%;
+
@include ltr {
float: right;
margin-left: 1.5em;
@@ -136,6 +139,7 @@
&.left {
@include desktop {
max-width: 50%;
+
@include ltr {
float: left;
margin-right: 1.5em;
@@ -151,11 +155,12 @@
}
&__footer {
+ font-size: 1.2rem;
+ padding: 12px 0;
+
@include themed() {
border-bottom: t('border');
}
- font-size: 1.2rem;
- padding: 12px 0;
&-date {
@include ltr {
diff --git a/assets/scss/partials/components/_wrapper.scss b/assets/scss/partials/components/_wrapper.scss
index 8a7089b..77a92bf 100644
--- a/assets/scss/partials/components/_wrapper.scss
+++ b/assets/scss/partials/components/_wrapper.scss
@@ -16,6 +16,7 @@
@include desktop_and_print {
width: $content-width;
}
+
@include widescreen {
width: calc(#{$content-ratio} * 80%);
}
--
Gitblit v1.10.0