From 6ba21b151d818c7106ccca3e5f0d2fd4db761df9 Mon Sep 17 00:00:00 2001 From: printempw Date: Sun, 24 Jul 2016 13:17:04 +0800 Subject: [PATCH] fix style bug under black color scheme --- assets/src/sass/index.scss | 71 +++++++++++++++++++++++++++----------- assets/src/sass/user.scss | 32 +++++++++-------- 2 files changed, 68 insertions(+), 35 deletions(-) diff --git a/assets/src/sass/index.scss b/assets/src/sass/index.scss index c963a6a3..86586965 100644 --- a/assets/src/sass/index.scss +++ b/assets/src/sass/index.scss @@ -1,8 +1,8 @@ /* * @Author: printempw * @Date: 2016-06-04 20:54:53 -* @Last Modified by: prpr -* @Last Modified time: 2016-07-21 21:13:16 +* @Last Modified by: printempw +* @Last Modified time: 2016-07-24 13:13:09 */ @import "style.scss"; @@ -17,36 +17,65 @@ body { background-size: auto 800px; background-repeat: no-repeat; background-position: center 0; -} -.navbar-nav>.user-menu .user-image { - border-radius: 10%; -} + .main-header .navbar-brand { + color: #5e5e5e; + font-family: Minecraft, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif; + } -.main-header .navbar-brand { - color: #5e5e5e; - font-family: Minecraft, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif; -} + .main-header .navbar .navbar-custom-menu .navbar-nav>li>a { + border-left: 0; + } -.navbar { - background-color: rgba(255, 255, 255, 0.2) !important; -} + .main-header .navbar .navbar-nav>li>a { + border: 0; + } -.navbar-nav > li > a { - color: #5e5e5e !important; -} + .main-header .navbar .nav>.active>a { + background: rgba(0,0,0,0.1); + color: #f6f6f6; + } -.navbar-header > a { - color: #5e5e5e; -} + .main-header .navbar .navbar-nav>li>a:hover { + background: rgba(0,0,0,0.1); + color: #f6f6f6; + } + + .main-header .navbar-brand { + border-right: 0; + } + + .navbar-nav { + .user-menu .user-image { + border-radius: 10%; + } + + li > a { + color: #5e5e5e !important; + } + } + + .navbar { + background-color: rgba(255, 255, 255, 0.2); + } + + .navbar-header > a { + color: #5e5e5e; + } -.main-footer > div, .main-footer > div > a { - color: #fff !important; } .main-footer { background-color: transparent; border-top: none; + + div { + color: #fff !important; + + a { + color: #fff !important; + } + } } .main-header { diff --git a/assets/src/sass/user.scss b/assets/src/sass/user.scss index 3b30ce9c..cc5c9d15 100644 --- a/assets/src/sass/user.scss +++ b/assets/src/sass/user.scss @@ -1,8 +1,8 @@ /* * @Author: printempw * @Date: 2016-07-10 17:17:07 -* @Last Modified by: prpr -* @Last Modified time: 2016-07-21 21:13:21 +* @Last Modified by: printempw +* @Last Modified time: 2016-07-24 13:14:58 */ @import "style.scss"; @@ -15,21 +15,25 @@ background-color: #f5f5f5; } -.box-title > a.selected { - color: #3c8dbc; +.box-title { + a { + color: #6d6d6d; + } + + a.selected { + color: #3c8dbc; + } } -.box-title > a { - color: #6d6d6d; -} +.breadcrumb { + a { + margin-right: 10px; + color: #444; + } -.breadcrumb > a { - margin-right: 10px; - color: #444; -} - -.breadcrumb > a:hover { - color: #3c8dbc; + a:hover { + color: #3c8dbc; + } } .item-footer > .dropdown-menu {