Skip to content

Make CSS simpler using macro #738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevenjoezhang merged 6 commits into from
Mar 28, 2019
Merged

Make CSS simpler using macro #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83f495b
Merge pull request #1 from theme-next/master
stevenjoezhang Mar 23, 2019
110810d
css
stevenjoezhang Mar 26, 2019
3757b79
update
stevenjoezhang Mar 25, 2019
6f4229f
Merge branch 'master' into css
stevenjoezhang Mar 26, 2019
c6a02f7
back
stevenjoezhang Mar 27, 2019
4329bcb
Merge branch 'css' of https://github.com/stevenjoezhang/hexo-theme-ne…
stevenjoezhang Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/css/_common/components/buttons.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
}

.btn-bar {
display: block;
show();
width: 22px;
height: 2px;
background: $text-color;
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/header/menu.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}

a, span.exturl {
display: block;
show();
font-size: 13px;
line-height: inherit;
border-bottom: 1px solid $menu-link-border;
Expand Down
6 changes: 3 additions & 3 deletions source/css/_common/components/header/site-nav.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.site-nav-toggle {
display: none;
hide();
position: absolute;
top: 10px;
left: 10px;
+mobile() {
display: block;
show();
}

button {
Expand All @@ -17,7 +17,7 @@

.site-nav {
+mobile() {
display: none;
hide();
margin: 0 -10px;
padding: 0 10px;
clear: both;
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/pages/schedule.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
color: #bbb;
}
span.event-details {
display: block;
show();
color: #bbb;
margin-left: 56px;
padding-top: 3px;
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/post/post-collapse.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
margin: 0 20px;

.post-title, .post-meta {
display: block;
show();
width: auto;
text-align: left;
}
Expand Down
4 changes: 2 additions & 2 deletions source/css/_common/components/post/post-eof.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.posts-expand {
.post-eof {
display: block;
show();
margin: $post-eof-margin-top auto $post-eof-margin-bottom;
width: 8%;
height: 1px;
Expand All @@ -11,6 +11,6 @@

.post:last-child {
.post-eof.post-eof.post-eof {
display: none;
hide();
}
}
4 changes: 2 additions & 2 deletions source/css/_common/components/post/post-meta.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@

.post-meta-item-text {
+tablet() {
display: none;
hide();
}
+mobile() {
display: none;
hide();
}
}
2 changes: 1 addition & 1 deletion source/css/_common/components/post/post-nav.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

a {
position: relative;
display: block;
show();
line-height: 25px;
font-size: 14px;
color: $link-color;
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/post/post-reading_progress.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
top: 0;
left: 0;
z-index: 9999;
display: block;
show();
width: 0;
height: unquote(hexo-config('reading_progress.height'));
background: unquote(hexo-config('reading_progress.color'));
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/post/post-type.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.post-type-quote {
.post-header,
.post-tags {
display: none;
hide();
}

blockquote {
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/rainbow.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ body {
z-index: 2147483647;
position: fixed;
content: "";
display: block;
show();
transform: translateY(-99.99px);
background: linear-gradient(124deg,
#FF0000,
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/sidebar/sidebar-author-links.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
content: " ";
width: 4px;
height: 4px;
border-radius: 50%;
circle();
background: rgb(random-color(0, 255) - 50%, random-color(0, 255) - 50%, random-color(0, 255) - 50%);
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/sidebar/sidebar-author.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.site-author-image {
display: block;
show();
margin: 0 auto;
padding: $site-author-image-padding;
max-width: $site-author-image-width;
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/sidebar/sidebar-dimmer.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

#sidebar-dimmer {
display: block;
show();
position: fixed;
top: 0;
left: 100%;
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/sidebar/sidebar-toc.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
.post-toc .nav .active > .nav-child { display: block; }

.post-toc .nav .active-current > .nav-child {
display: block;
show();
& > .nav-item { display: block; }
}

Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/sidebar/site-state.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

.site-state-item-count {
display: block;
show();
text-align: center;
color: $site-state-item-count-color;
font-weight: $font-weight-bold;
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/tags/blockquote-center.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
&::before, &::after {
position: absolute;
content: ' ';
display: block;
show();
width: 100%;
height: 24px;
opacity: 0.2;
Expand Down
6 changes: 3 additions & 3 deletions source/css/_common/components/tags/tabs.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.post-body .tabs {
position: relative;
display: block;
show();
margin-bottom: 20px;
padding-top: 10px;

Expand All @@ -14,7 +14,7 @@
margin-bottom: -1px;

+mobile-smallest() {
display: block;
show();
margin-bottom: 5px;
}

Expand Down Expand Up @@ -42,7 +42,7 @@
& a {
outline: 0;
border-bottom: initial;
display: block;
show();
line-height: 1.8em;
padding: .25em .75em;
& i { width: (18em / 14); }
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/third-party/algolia-search.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
z-index: 2080
background-color: rgba(0, 0, 0, 0.3)
+mobile()
display: none;
hide();

.algolia-popup
overflow: hidden
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/third-party/gitment.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@

if hexo-config('gitment.cleanly') {
a.gitment-editor-footer-tip, .gitment-container.gitment-footer-container {
display: none;
hide();
}
}
2 changes: 1 addition & 1 deletion source/css/_common/components/third-party/related-posts.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
margin-bottom: 10px;
font-size: $font-size-headings-base;
border-bottom: 1px solid $gainsboro;
display: block;
show();
}

ul.popular-posts {
Expand Down
4 changes: 2 additions & 2 deletions source/css/_common/scaffolding/base.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ a, span.exturl {

video {
max-width: 100%;
display: block;
show();
margin-left: auto;
margin-right: auto;
}

img {
display: block;
show();
margin: auto;
max-width: 100%;
height: auto;
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/scaffolding/helpers.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

// Center-align a block level element.
.center-block {
display: block;
show();
margin-left: auto;
margin-right: auto;
}
Expand Down
6 changes: 3 additions & 3 deletions source/css/_schemes/Mist/_header.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
justify-content: center;

+mobile() {
display: block;
show();
width: auto;
padding: 10px;
}
Expand Down Expand Up @@ -43,7 +43,7 @@

.logo-line-before,
.logo-line-after {
display: block;
show();
overflow: hidden;
margin: 0 auto;
width: 75%;
Expand All @@ -52,7 +52,7 @@

i {
position: relative;
display: block;
show();
height: 2px;
background: $black-deep;
+mobile() { height: 3px; }
Expand Down
4 changes: 2 additions & 2 deletions source/css/_schemes/Mist/_menu.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
.menu-item {
margin: 0;
+mobile() {
display: block;
show();
margin-top: 5px;
}

Expand Down Expand Up @@ -75,7 +75,7 @@
}

a::before {
display: none;
hide();
+mobile() { display: block; }
}

Expand Down
2 changes: 1 addition & 1 deletion source/css/_schemes/Mist/_search.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Search
// --------------------------------------------------
.site-search form {
display: none;
hide();
}
2 changes: 1 addition & 1 deletion source/css/_schemes/Muse/_layout.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

// embed tag
embed {
display: block;
show();
margin: 0px auto 25px auto;
}
2 changes: 1 addition & 1 deletion source/css/_schemes/Muse/_menu.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

.menu .menu-item {
+mobile() {
display: block;
show();
margin: 0 10px;
vertical-align: top;
}
Expand Down
2 changes: 1 addition & 1 deletion source/css/_schemes/Muse/_search.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Search
// --------------------------------------------------
.site-search form {
display: none;
hide();
}
4 changes: 2 additions & 2 deletions source/css/_schemes/Pisces/_brand.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
.custom-logo-image {
margin-top: 20px;
+tablet-mobile() {
display: none;
hide();
}
}

.site-search form {
display: none;
hide();
}
2 changes: 1 addition & 1 deletion source/css/_schemes/Pisces/_layout.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
box-shadow: none;

+tablet-mobile() {
display: none;
hide();
}
}

Expand Down
6 changes: 3 additions & 3 deletions source/css/_schemes/Pisces/_menu.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
right: 15px;
width: 6px;
height: 6px;
border-radius: 50%;
background-color: $grey;
circle();
}
}
}

.menu .menu-item {
display: block;
show();
margin: 0;

a, span.exturl {
Expand Down Expand Up @@ -82,6 +82,6 @@
transform: translateY(-50%);

+tablet() {
display: block;
show();
}
}
4 changes: 2 additions & 2 deletions source/css/_schemes/Pisces/_sidebar.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
border-bottom: 1px dotted $grey-light;
text-align: center;
a {
display: block;
show();
color: $orange;
border: none !important;

Expand Down Expand Up @@ -89,7 +89,7 @@
}

a, span.exturl {
display: block;
show();
text-decoration: none;

&:hover {
Expand Down