From 88a886d5ad4845f8157dab01eef6d99eaf95aa6f Mon Sep 17 00:00:00 2001 From: XPoet Date: Sat, 25 Apr 2020 11:16:58 +0800 Subject: [PATCH] style: unified buttons style --- source/css/layout/_partial/tools.styl | 8 +++++--- source/css/layout/common/basic.styl | 14 +++++++------- source/css/layout/common/magic-theme.styl | 4 +++- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/source/css/layout/_partial/tools.styl b/source/css/layout/_partial/tools.styl index dcf8534..0e8e443 100644 --- a/source/css/layout/_partial/tools.styl +++ b/source/css/layout/_partial/tools.styl @@ -1,11 +1,11 @@ -@require '../common/variables.styl' -@require '../common/magic-theme.styl' +@require "../common/variables.styl"; +@require "../common/magic-theme.styl"; +@require "../common/magic-theme.styl"; $li-padding = 10px; $li-border-radius = 5px; $li-margin-bottom = 10px; - .tools-container { .tools-list { @@ -39,6 +39,7 @@ $li-margin-bottom = 10px; height: 100%; &:hover { + transition(); color: var(--background-color); background: var(--primary-color); } @@ -47,6 +48,7 @@ $li-margin-bottom = 10px; &:hover { + transition(); color: var(--background-color); background: var(--primary-color); } diff --git a/source/css/layout/common/basic.styl b/source/css/layout/common/basic.styl index e583e88..fa95df3 100644 --- a/source/css/layout/common/basic.styl +++ b/source/css/layout/common/basic.styl @@ -57,16 +57,16 @@ button { border-radius: 5px; padding: 0.5em 1em; background: var(--background-color); - transition(); - magic-style(1.1); + + if (hexo-config('magic.enable') == true) { + magic-style(1.1); + } else { + border: 1px solid var(--third-text-color); + } &:hover { + transition(); color: var(--background-color); background: var(--primary-color); } - - //&:hover { - // color: var(--primary-color); - // border: 1px solid var(--primary-color); - //} } \ No newline at end of file diff --git a/source/css/layout/common/magic-theme.styl b/source/css/layout/common/magic-theme.styl index 50bdd6b..6359f61 100644 --- a/source/css/layout/common/magic-theme.styl +++ b/source/css/layout/common/magic-theme.styl @@ -1,10 +1,12 @@ +@require "animated.styl" magic-style(scale) { if (hexo-config('magic.enable') == true) { box-shadow: 0 0 3px var(--border-color); - transition: all 0.3s ease; + transition(); &:hover { + transition(); box-shadow: 0 0 8px var(--border-color); transform: scale(scale); }