From 97be955a2541dd38c2dd610f5e8edea9d2ee8217 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sun, 26 Mar 2017 13:08:15 +0800 Subject: [PATCH] code refactor --- src/styles/controls/settings-table.css | 8 -------- src/styles/core/core.css | 12 ++++++++++-- src/styles/core/extend.css | 15 +++++++++++++++ src/styles/theme/default.css | 1 - 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/styles/controls/settings-table.css b/src/styles/controls/settings-table.css index d5cf9ce..923d3d0 100644 --- a/src/styles/controls/settings-table.css +++ b/src/styles/controls/settings-table.css @@ -68,14 +68,6 @@ z-index: inherit; } -.settings-table .setting-value .input-group.input-group-multiple .input-group-addon { - border-right: 0; -} - -.settings-table .setting-value .input-group.input-group-multiple .input-group-addon:last-child { - border-right: 1px solid #d2d6de; -} - .settings-table .tip { font-size: 12px; padding: 4px 8px 4px 8px; diff --git a/src/styles/core/core.css b/src/styles/core/core.css index c2573c8..d6aa00a 100644 --- a/src/styles/core/core.css +++ b/src/styles/core/core.css @@ -15,14 +15,18 @@ td { vertical-align: middle !important; } -.skin-aria-ng .main-header .logo { +.main-header .logo { overflow: visible; } -.skin-aria-ng .main-header .logo .dropdown-menu { +.main-header .logo .dropdown-menu { z-index: 2000; } +.main-header .navbar .nav > li.disabled > a { + pointer-events: none !important; +} + .main-header .navbar .navbar-searchbar { padding-top: 8px; padding-right: 20px; @@ -33,6 +37,10 @@ td { cursor: pointer; } +.content-wrapper, .right-side { + background-color: #fff; +} + .content-wrapper > .content-body { overflow-y: scroll; } diff --git a/src/styles/core/extend.css b/src/styles/core/extend.css index 1762143..3fe7aff 100644 --- a/src/styles/core/extend.css +++ b/src/styles/core/extend.css @@ -19,6 +19,21 @@ white-space: nowrap; } +.input-group.input-group-multiple > .input-group-addon { + border-left: 0; + border-right: 0; +} + +.input-group.input-group-multiple > .input-group-addon:first-child, +.input-group.input-group-multiple > .input-grougp-addon-container:first-child { + border-left: 1px solid #d2d6de; +} + +.input-group .input-grougp-addon-container { + width: 1%; + display: table-cell; +} + /* font-awesome extend */ .fa-half { font-size: 0.5em; diff --git a/src/styles/theme/default.css b/src/styles/theme/default.css index 2ef674b..07771b3 100644 --- a/src/styles/theme/default.css +++ b/src/styles/theme/default.css @@ -39,7 +39,6 @@ .skin-aria-ng .main-header .navbar .nav > li.disabled > a { color: #ccc !important; - pointer-events: none !important; } .skin-aria-ng .main-header .navbar .nav > li.divider {