diff --git a/source/css/_common/components/header/github-banner.styl b/source/css/_common/components/header/github-banner.styl index f0926a3561..043ee1fdcc 100644 --- a/source/css/_common/components/header/github-banner.styl +++ b/source/css/_common/components/header/github-banner.styl @@ -18,7 +18,7 @@ } } +tablet-mobile() { - >svg { + > svg { if (scheme == 'Pisces') || (scheme == 'Gemini') { fill: #fff !important; color: bg_color !important; @@ -32,7 +32,7 @@ } } +mobile() { - >svg { + > svg { if (scheme == 'Mist') { top: inherit !important; margin-top: -50px; diff --git a/source/css/_common/components/pages/schedule.styl b/source/css/_common/components/pages/schedule.styl index 632627797d..f9e97e5778 100644 --- a/source/css/_common/components/pages/schedule.styl +++ b/source/css/_common/components/pages/schedule.styl @@ -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; + } } } diff --git a/source/css/_common/components/post/post-expand.styl b/source/css/_common/components/post/post-expand.styl index 2887920311..466571c75e 100644 --- a/source/css/_common/components/post/post-expand.styl +++ b/source/css/_common/components/post/post-expand.styl @@ -55,10 +55,6 @@ } } - ul > li { - list-style: circle; - } - img { box-sizing: border-box; margin: 0 auto 25px; diff --git a/source/css/_common/components/sidebar/sidebar-button.styl b/source/css/_common/components/sidebar/sidebar-button.styl index 918f6a668a..da85a55547 100644 --- a/source/css/_common/components/sidebar/sidebar-button.styl +++ b/source/css/_common/components/sidebar/sidebar-button.styl @@ -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; border-radius: 4px; i { diff --git a/source/css/_common/components/sidebar/sidebar-toggle.styl b/source/css/_common/components/sidebar/sidebar-toggle.styl index 70ca0f3a08..a0f3bcf436 100644 --- a/source/css/_common/components/sidebar/sidebar-toggle.styl +++ b/source/css/_common/components/sidebar/sidebar-toggle.styl @@ -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(); } } diff --git a/source/css/_mixins/base.styl b/source/css/_mixins/base.styl index 4a9839f2d0..83087e5a50 100644 --- a/source/css/_mixins/base.styl +++ b/source/css/_mixins/base.styl @@ -69,11 +69,11 @@ circle() { } hide() { - display: none !important; + display: none; } show() { - display: block !important; + display: block; } fixbutton() {