From d6fc3c7d527a746d4aa4e7e2189be3735966f339 Mon Sep 17 00:00:00 2001 From: Van Date: Mon, 1 Dec 2014 15:05:48 +0800 Subject: [PATCH] . --- static/css/dialog.css | 4 +--- static/css/themes/black.css | 8 ++++++++ static/css/themes/default.css | 10 +++++++++- static/css/wide.css | 7 ++++++- static/js/menu.js | 2 +- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/static/css/dialog.css b/static/css/dialog.css index d1262d5..f6ffc4d 100644 --- a/static/css/dialog.css +++ b/static/css/dialog.css @@ -96,13 +96,11 @@ overflow: auto; margin-top: 5px; background-color: #FFF; - border: 1px solid #9B9B9B; + border: 1px solid #919191; } #dialogPreference { margin: 10px; - border: 1px solid #A4A4A4; - border-top-width: 0; } #dialogPreference .select { diff --git a/static/css/themes/black.css b/static/css/themes/black.css index 53296ae..55620e4 100644 --- a/static/css/themes/black.css +++ b/static/css/themes/black.css @@ -134,4 +134,12 @@ .ztree li a { color: #e1e1e1; +} + +.bottom-window-group { + border-top: 1px solid #000; +} + +#dialogPreference { + border: 1px solid #000; } \ No newline at end of file diff --git a/static/css/themes/default.css b/static/css/themes/default.css index 12f1792..61958ca 100644 --- a/static/css/themes/default.css +++ b/static/css/themes/default.css @@ -15,7 +15,7 @@ */ .side { background-color: #FFF; - border-right: 1px solid #9B9B9B; + border-right: 1px solid #919191; } .footer { @@ -116,4 +116,12 @@ .dialog-main { background-color: #F0F0F0; +} + +.bottom-window-group { + border-top: 1px solid #919191; +} + +#dialogPreference { + border: 1px solid #A4A4A4; } \ No newline at end of file diff --git a/static/css/wide.css b/static/css/wide.css index 9c134b0..f8bc3a2 100644 --- a/static/css/wide.css +++ b/static/css/wide.css @@ -118,7 +118,7 @@ height: 20px; padding: 0 5px; cursor: pointer; - + } .tabs > div > span.changed { @@ -230,6 +230,7 @@ top: 0; width: 100%; z-index: 11; + border-top-width: 0 !important; } .bottom-window-group > div > div { @@ -297,6 +298,10 @@ padding-left: 5px; height: 19px; line-height: 18px; + position: fixed; + bottom: 0; + z-index: 11; + width: 100%; } .footer .cursor { diff --git a/static/js/menu.js b/static/js/menu.js index 875ef49..79298c4 100644 --- a/static/js/menu.js +++ b/static/js/menu.js @@ -409,7 +409,7 @@ var menu = { var $okBtn = $("#dialogPreference").closest(".dialog-main").find(".dialog-footer > button:eq(0)"); $okBtn.prop("disabled", true); - $("#themesLink").attr("href", config.staticServer + '/static/css/themes/' + $theme.val() + '.css?') + $("#themesLink").attr("href", config.staticServer + '/static/css/themes/' + $theme.val() + '.css'); } }); }