Skip to content

Remove redundant styles #728

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 1 commit into from
Mar 23, 2019
Merged

Remove redundant styles #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions source/css/_common/components/header/github-banner.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
}
+tablet-mobile() {
>svg {
> svg {
if (scheme == 'Pisces') || (scheme == 'Gemini') {
fill: #fff !important;
color: bg_color !important;
Expand All @@ -32,7 +32,7 @@
}
}
+mobile() {
>svg {
> svg {
if (scheme == 'Mist') {
top: inherit !important;
margin-top: -50px;
Expand Down
192 changes: 95 additions & 97 deletions source/css/_common/components/pages/schedule.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,114 +3,112 @@
to { opacity: 0; transform: scale(1); }
}

#schedule {
ul#event-list {
padding-left: 30px
hr {
margin: 20px 0 45px 0 !important
background: #222
&:after {
display: inline-block
content: 'NOW'
background: #222
color: #FFF
font-weight:bold
text-align: right
padding: 0 5px
#event-list {
padding-left: 30px;
hr {
margin: 20px 0 45px 0 !important;
background: #222;
&:after {
display: inline-block;
content: 'NOW';
background: #222;
color: #FFF;
font-weight: bold;
text-align: right;
padding: 0 5px;
}
}
li.event {
margin: 20px 0px;
background: #F9F9F9;
padding-left: 10px;
min-height: 40px;
h2.event-summary {
margin: 0;
padding-bottom: 3px;
&:before {
display: inline-block;
font-family: FontAwesome;
font-size: 8px;
content: '\f111';
vertical-align: middle;
margin-right: 25px;
color: #bbb;
}
}
li.event {
margin: 20px 0px
background: #F9F9F9
padding-left: 10px
min-height: 40px
h2.event-summary {
margin: 0
padding-bottom: 3px
&:before {
display: inline-block
font-family: FontAwesome
font-size: 8px
content: '\f111'
vertical-align: middle
margin-right: 25px
color: #bbb
}
span.event-relative-time {
display: inline-block;
font-size: 12px;
font-weight: 400;
padding-left: 12px;
color: #bbb;
}
span.event-details {
display: block;
color: #bbb;
margin-left: 56px;
padding-top: 3px;
padding-bottom: 6px;
text-indent: -24px;
line-height: 18px;
&:before {
text-indent: 0;
display: inline-block;
width: 14px;
font-family: FontAwesome;
text-align: center;
margin-right: 9px;
color: #bbb;
}
span.event-relative-time {
display: inline-block
font-size: 12px
font-weight: 400
padding-left: 12px
color: #bbb
&.event-location:before {
content: '\f041';
}
span.event-details {
display: block
color: #bbb
margin-left: 56px
padding-top: 3px
padding-bottom: 6px
text-indent: -24px
line-height: 18px
&:before {
text-indent: 0
display: inline-block
width: 14px
font-family: FontAwesome
text-align: center
margin-right: 9px
color: #bbb
}
&.event-location:before {
content: '\f041'
}
&.event-duration:before {
content: '\f017'
}
&.event-duration:before {
content: '\f017';
}
}
li.event-past {
background: #FCFCFC
padding: 15px 0 15px 10px
& > * {
opacity: .9
}
h2.event-summary {
color: #bbb
&:before {
color: #DFDFDF
}
}
}
li.event-past {
background: #FCFCFC;
padding: 15px 0 15px 10px;
& > * {
opacity: .9;
}
li.event-now {
background: #222
color: #FFF
padding: 15px 0 15px 10px
h2.event-summary {
&:before {
transform: scale(1.2)
color: #FFF
animation: dot-flash 1s alternate infinite ease-in-out;
}
}
* {
color: #FFF !important
h2.event-summary {
color: #bbb;
&:before {
color: #DFDFDF;
}
}
li.event-future {
background: #222
color: #FFF
padding: 15px 0 15px 10px
h2.event-summary {
&:before {
transform: scale(1.2)
color: #FFF
animation: dot-flash 1s alternate infinite ease-in-out;
}
}
li.event-now {
background: #222;
color: #FFF;
padding: 15px 0 15px 10px;
h2.event-summary {
&:before {
transform: scale(1.2);
color: #FFF;
animation: dot-flash 1s alternate infinite ease-in-out;
}
* {
color: #FFF !important
}
* {
color: #FFF !important;
}
}
li.event-future {
background: #222;
color: #FFF;
padding: 15px 0 15px 10px;
h2.event-summary {
&:before {
transform: scale(1.2);
color: #FFF;
animation: dot-flash 1s alternate infinite ease-in-out;
}
}
* {
color: #FFF !important;
}
}
}
4 changes: 0 additions & 4 deletions source/css/_common/components/post/post-expand.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@
}
}

ul > li {
list-style: circle;
}

img {
box-sizing: border-box;
margin: 0 auto 25px;
Expand Down
2 changes: 1 addition & 1 deletion source/css/_common/components/sidebar/sidebar-button.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
display: inline-block;
padding: 0 15px;
color: rgb(252, 100, 35);
border: 1px solid rgb(252, 100, 35);
border: 1px solid rgb(252, 100, 35) !important;
Copy link
Member

@ivan-nginx ivan-nginx Mar 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Relevant to #734. Please, test carefully before make changes like this.

Copy link
Contributor Author

@stevenjoezhang stevenjoezhang Mar 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A mistake... I'll move this to styles of Mist&Muse...

border-radius: 4px;

i {
Expand Down
9 changes: 2 additions & 7 deletions source/css/_common/components/sidebar/sidebar-toggle.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,8 @@
z-index: $zindex-5;
cursor: pointer;

+tablet() {
fixbutton() if hexo-config('sidebar.onmobile');
hide() if not hexo-config('sidebar.onmobile');
}
+mobile() {
fixbutton() if hexo-config('sidebar.onmobile');
hide() if not hexo-config('sidebar.onmobile');
+tablet-mobile() {
hexo-config('sidebar.onmobile') ? fixbutton() : hide();
}
}

Expand Down
4 changes: 2 additions & 2 deletions source/css/_mixins/base.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ circle() {
}

hide() {
display: none !important;
display: none;
}

show() {
display: block !important;
display: block;
}

fixbutton() {
Expand Down