From 71c1de86ab5d2745da48b3f9554e21aa89381e1b Mon Sep 17 00:00:00 2001 From: Bing Zhang Date: Thu, 11 Jan 2018 11:08:12 +0800 Subject: [PATCH 1/2] refactor: adjust and clean styles --- src/main/resources/i18n/messages.properties | 4 +- .../resources/i18n/messages_zh_CN.properties | 2 + .../static/apps/admin/assets/css/style.css | 17 --- .../apps/admin/assets/css/style.css.map | 2 +- .../static/apps/admin/assets/css/style.scss | 19 --- .../apps/admin/modules/core/userProfile.html | 4 +- .../resources/static/assets/css/common.css | 41 +++--- .../static/assets/css/common.css.map | 5 +- .../resources/static/assets/css/common.scss | 130 +++++++++--------- src/main/resources/static/assets/css/main.css | 100 +------------- .../resources/static/assets/css/main.css.map | 2 +- .../resources/static/assets/css/main.scss | 100 +------------- src/main/resources/static/assets/css/sso.css | 8 +- .../resources/static/assets/css/sso.css.map | 2 +- src/main/resources/static/assets/css/sso.scss | 8 +- .../templates/admin/partials/headers.html | 4 +- .../templates/admin/partials/layout.html | 2 + .../templates/admin/partials/sidebars.html | 4 +- .../templates/common/layout_main.html | 2 +- 19 files changed, 126 insertions(+), 330 deletions(-) diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index bef3ea95..14976be4 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -84,11 +84,13 @@ admin.modules.core.userProfile.valueFemale=Female admin.modules.core.userProfile.labelBirthday=Birthday admin.modules.core.userProfile.uploadAvatar=Upload Your Avatar admin.modules.core.userProfile.updateProfile=Update Profile -admin.modules.user.disableEditForSuperAdmin=You can not edit initialization user +admin.modules.user.disableEditForSuperAdmin=You can not edit initialization user. common.search=Search admin.modules.user.searchTips=Search by username common.cancelSearch=Cancel Search common.noData=No Data Found +common.menu=Menu Navigation +common.searchPlaceHolder=Search... diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties index 947a0768..58eb71fd 100644 --- a/src/main/resources/i18n/messages_zh_CN.properties +++ b/src/main/resources/i18n/messages_zh_CN.properties @@ -89,3 +89,5 @@ common.search=\u641C\u7D22 admin.modules.user.searchTips=\u7528\u6237\u540D... common.cancelSearch=\u53D6\u6D88\u641C\u7D22 common.noData=\u672A\u627E\u5230\u4EFB\u4F55\u5339\u914D\u7684\u6570\u636E +common.menu=\u83DC\u5355\u5BFC\u822A +common.searchPlaceHolder=\u641C\u7D22... diff --git a/src/main/resources/static/apps/admin/assets/css/style.css b/src/main/resources/static/apps/admin/assets/css/style.css index 81774f31..a5b21227 100644 --- a/src/main/resources/static/apps/admin/assets/css/style.css +++ b/src/main/resources/static/apps/admin/assets/css/style.css @@ -1,12 +1,3 @@ -html, -body { - height: 100%; -} - -a { - cursor: pointer; -} - /* AdminLTE */ .lockscreen { display: none; @@ -158,14 +149,6 @@ md-backdrop.md-dialog-backdrop { } /* misc */ -.no-scroll { - overflow: hidden; -} - -.img-radius { - border-radius: 5px; -} - .search-box { width: 260px; margin-right: 1rem; diff --git a/src/main/resources/static/apps/admin/assets/css/style.css.map b/src/main/resources/static/apps/admin/assets/css/style.css.map index 736fc0e0..c7bbed5a 100644 --- a/src/main/resources/static/apps/admin/assets/css/style.css.map +++ b/src/main/resources/static/apps/admin/assets/css/style.css.map @@ -1,6 +1,6 @@ { "version": 3, - "mappings": "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", + "mappings": "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", "sources": [ "style.scss" ], diff --git a/src/main/resources/static/apps/admin/assets/css/style.scss b/src/main/resources/static/apps/admin/assets/css/style.scss index 21c89e62..7e41ad6f 100644 --- a/src/main/resources/static/apps/admin/assets/css/style.scss +++ b/src/main/resources/static/apps/admin/assets/css/style.scss @@ -1,15 +1,4 @@ -html, -body { - height: 100%; -} - -a { - cursor: pointer; -} - - /* AdminLTE */ - .lockscreen { display: none; position: absolute; @@ -193,14 +182,6 @@ md-backdrop.md-dialog-backdrop { } /* misc */ -.no-scroll { - overflow: hidden; -} - -.img-radius { - border-radius: 5px; -} - .search-box { width: 260px; margin-right: 1rem; diff --git a/src/main/resources/static/apps/admin/modules/core/userProfile.html b/src/main/resources/static/apps/admin/modules/core/userProfile.html index f6776c3e..de106ce0 100644 --- a/src/main/resources/static/apps/admin/modules/core/userProfile.html +++ b/src/main/resources/static/apps/admin/modules/core/userProfile.html @@ -8,11 +8,11 @@
-
+
-
+