From b36d04071f66845c916d2abe0660795db158f989 Mon Sep 17 00:00:00 2001 From: Vanesssa Date: Mon, 7 Dec 2015 16:43:23 +0800 Subject: [PATCH] resize color --- static/css/start.css | 2 +- static/css/themes/dark.css | 26 +- static/css/themes/default.css | 25 +- .../jquery-layout/layout-default-latest.css | 293 +++++++++--------- static/js/windows.js | 2 - 5 files changed, 191 insertions(+), 157 deletions(-) diff --git a/static/css/start.css b/static/css/start.css index 8e152fd..91508ec 100644 --- a/static/css/start.css +++ b/static/css/start.css @@ -32,7 +32,7 @@ } #startPage .title { - background-color: #9F9F9F; + background-color: #BBB; border-bottom-width: 0 !important; border-radius: 3px 3px 0 0; font-size: 15px; diff --git a/static/css/themes/dark.css b/static/css/themes/dark.css index d08a68a..f6e61a3 100644 --- a/static/css/themes/dark.css +++ b/static/css/themes/dark.css @@ -40,11 +40,13 @@ color: #EBEBEB; } -.font-ico { +.font-ico, +.ico-restore { color: rgba(255, 255, 255, 0.5); } .font-ico:hover, +.ico-restore:hover, .frame li:hover .font-ico { color: #e1e1e1; } @@ -152,4 +154,26 @@ #dialogPreference .preference { border: 1px solid #000; +} +/* start layout resize */ +.ui-layout-resizer, +.ui-layout-resizer-dragging, +.ui-layout-resizer-open-hover, +.ui-layout-resizer-dragging { + background: #000; +} +.ui-layout-resizer-closed { + background-color: #555555; +} +.ui-layout-resizer-west-closed { + border-right: 1px solid #000; +} +.ui-layout-resizer-south-closed { + border-top: 1px solid #000; +} +.ui-layout-resizer-east-closed { + border-left: 1px solid #000; +} +.ui-layout-resizer-closed-hover { /* hover-color to 'slide open' */ + background: #000; } \ No newline at end of file diff --git a/static/css/themes/default.css b/static/css/themes/default.css index 2b0b91b..d8de727 100644 --- a/static/css/themes/default.css +++ b/static/css/themes/default.css @@ -39,11 +39,13 @@ background-color: #FFF; } -.font-ico { +.font-ico, +.ico-restore { color: #666; } .font-ico:hover, +.ico-restore:hover, .frame li:hover .font-ico { color: #333; } @@ -129,4 +131,25 @@ #dialogPreference .preference { border: 1px solid #A4A4A4; +} +/* start layout resize */ +.ui-layout-resizer, +.ui-layout-resizer-dragging { + background: #bbb; +} +.ui-layout-resizer-open-hover , /* hover-color to 'resize' */ +.ui-layout-resizer-dragging { /* resizer beging 'dragging' */ + background: #919191; +} +.ui-layout-resizer-west-closed { + border-right: 1px solid #919191; +} +.ui-layout-resizer-south-closed { + border-top: 1px solid #919191; +} +.ui-layout-resizer-east-closed { + border-left: 1px solid #919191; +} +.ui-layout-resizer-closed-hover { /* hover-color to 'slide open' */ + background: #919191; } \ No newline at end of file diff --git a/static/js/lib/jquery-layout/layout-default-latest.css b/static/js/lib/jquery-layout/layout-default-latest.css index 49f66aa..1dd0f7b 100644 --- a/static/js/lib/jquery-layout/layout-default-latest.css +++ b/static/js/lib/jquery-layout/layout-default-latest.css @@ -19,31 +19,31 @@ * Just to make demo-pages look better - not actually relevant to Layout! */ body { - font-family: Geneva, Arial, Helvetica, sans-serif; - font-size: 100%; - *font-size: 80%; + font-family: Geneva, Arial, Helvetica, sans-serif; + font-size: 100%; + *font-size: 80%; } /* * PANES & CONTENT-DIVs */ .ui-layout-pane { /* all 'panes' - background: #FFF; - border: 1px solid #BBB; - padding: 10px; - overflow: auto; - DO NOT add scrolling (or padding) to 'panes' that have a content-div, - otherwise you may get double-scrollbars - on the pane AND on the content-div - - use ui-layout-wrapper class if pane has a content-div - - use ui-layout-container if pane has an inner-layout - */ - } - /* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */ - .ui-layout-content { - padding: 10px; - position: relative; /* contain floated or positioned elements */ - overflow: auto; /* add scrolling to content-div */ - } + background: #FFF; + border: 1px solid #BBB; + padding: 10px; + overflow: auto; + DO NOT add scrolling (or padding) to 'panes' that have a content-div, + otherwise you may get double-scrollbars - on the pane AND on the content-div + - use ui-layout-wrapper class if pane has a content-div + - use ui-layout-container if pane has an inner-layout + */ +} +/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */ +.ui-layout-content { + padding: 10px; + position: relative; /* contain floated or positioned elements */ + overflow: auto; /* add scrolling to content-div */ +} /* * UTILITY CLASSES @@ -52,109 +52,98 @@ body { */ .layout-child-container, .layout-content-container { - padding: 0; - overflow: hidden; + padding: 0; + overflow: hidden; } .layout-child-container { - border: 0; /* remove border because inner-layout-panes probably have borders */ + border: 0; /* remove border because inner-layout-panes probably have borders */ } .layout-scroll { - overflow: auto; + overflow: auto; } .layout-hide { - display: none; + display: none; } /* * RESIZER-BARS */ .ui-layout-resizer { /* all 'resizer-bars' */ - background: #bbb; - border-width: 0; - } - .ui-layout-resizer-drag { /* REAL resizer while resize in progress */ - } - .ui-layout-resizer-hover { /* affects both open and closed states */ - } - /* NOTE: It looks best when 'hover' and 'dragging' are set to the same color, - otherwise color shifts while dragging when bar can't keep up with mouse */ - .ui-layout-resizer-open-hover , /* hover-color to 'resize' */ - .ui-layout-resizer-dragging { /* resizer beging 'dragging' */ - background: #919191; - } - .ui-layout-resizer-dragging { /* CLONED resizer being dragged */ - border: 1px solid #BBB; - } - .ui-layout-resizer-north-dragging, - .ui-layout-resizer-south-dragging { - border-width: 1px 0; - } - .ui-layout-resizer-west-dragging, - .ui-layout-resizer-east-dragging { - border-width: 0 1px; - } - /* NOTE: Add a 'dragging-limit' color to provide visual feedback when resizer hits min/max size limits */ - .ui-layout-resizer-dragging-limit { /* CLONED resizer at min or max size-limit */ - background: #F0F0F0; /* red */ - } + border-width: 0; +} +.ui-layout-resizer-drag { /* REAL resizer while resize in progress */ +} +.ui-layout-resizer-hover { /* affects both open and closed states */ +} +/* NOTE: It looks best when 'hover' and 'dragging' are set to the same color, + otherwise color shifts while dragging when bar can't keep up with mouse */ +.ui-layout-resizer-north-dragging, +.ui-layout-resizer-south-dragging { + border-width: 1px 0; +} +.ui-layout-resizer-west-dragging, +.ui-layout-resizer-east-dragging { + border-width: 0 1px; +} +/* NOTE: Add a 'dragging-limit' color to provide visual feedback when resizer hits min/max size limits */ +.ui-layout-resizer-dragging-limit { /* CLONED resizer at min or max size-limit */ + background: #F0F0F0; /* red */ +} - .ui-layout-resizer-closed-hover { /* hover-color to 'slide open' */ - background: #919191; - } - .ui-layout-resizer-sliding { /* resizer when pane is 'slid open' */ - opacity: .10; /* show only a slight shadow */ - filter: alpha(opacity=10); - } - .ui-layout-resizer-sliding-hover { /* sliding resizer - hover */ - opacity: 1.00; /* on-hover, show the resizer-bar normally */ - filter: alpha(opacity=100); - } - /* sliding resizer - add 'outside-border' to resizer on-hover - * this sample illustrates how to target specific panes and states */ - .ui-layout-resizer-north-sliding-hover { border-bottom-width: 1px; } - .ui-layout-resizer-south-sliding-hover { border-top-width: 1px; } - .ui-layout-resizer-west-sliding-hover { border-right-width: 1px; } - .ui-layout-resizer-east-sliding-hover { border-left-width: 1px; } +.ui-layout-resizer-sliding { /* resizer when pane is 'slid open' */ + opacity: .10; /* show only a slight shadow */ + filter: alpha(opacity=10); +} +.ui-layout-resizer-sliding-hover { /* sliding resizer - hover */ + opacity: 1.00; /* on-hover, show the resizer-bar normally */ + filter: alpha(opacity=100); +} +/* sliding resizer - add 'outside-border' to resizer on-hover + * this sample illustrates how to target specific panes and states */ +.ui-layout-resizer-north-sliding-hover { border-bottom-width: 1px; } +.ui-layout-resizer-south-sliding-hover { border-top-width: 1px; } +.ui-layout-resizer-west-sliding-hover { border-right-width: 1px; } +.ui-layout-resizer-east-sliding-hover { border-left-width: 1px; } /* * TOGGLER-BUTTONS */ .ui-layout-toggler { - border: 1px solid #BBB; /* match pane-border */ - background-color: #BBB; - } - .ui-layout-resizer-hover .ui-layout-toggler { - opacity: .60; - filter: alpha(opacity=60); - } - .ui-layout-toggler-hover , /* need when NOT resizable */ - .ui-layout-resizer-hover .ui-layout-toggler-hover { /* need specificity when IS resizable */ - background-color: #FC6; - opacity: 1.00; - filter: alpha(opacity=100); - } - .ui-layout-toggler-north , - .ui-layout-toggler-south { - border-width: 0 1px; /* left/right borders */ - } - .ui-layout-toggler-west , - .ui-layout-toggler-east { - border-width: 1px 0; /* top/bottom borders */ - } - /* hide the toggler-button when the pane is 'slid open' */ - .ui-layout-resizer-sliding .ui-layout-toggler { - display: none; - } - /* - * style the text we put INSIDE the togglers - */ - .ui-layout-toggler .content { - color: #666; - font-size: 12px; - font-weight: bold; - width: 100%; - padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */ - } + border: 1px solid #BBB; /* match pane-border */ + background-color: #BBB; +} +.ui-layout-resizer-hover .ui-layout-toggler { + opacity: .60; + filter: alpha(opacity=60); +} +.ui-layout-toggler-hover , /* need when NOT resizable */ +.ui-layout-resizer-hover .ui-layout-toggler-hover { /* need specificity when IS resizable */ + background-color: #FC6; + opacity: 1.00; + filter: alpha(opacity=100); +} +.ui-layout-toggler-north , +.ui-layout-toggler-south { + border-width: 0 1px; /* left/right borders */ +} +.ui-layout-toggler-west , +.ui-layout-toggler-east { + border-width: 1px 0; /* top/bottom borders */ +} +/* hide the toggler-button when the pane is 'slid open' */ +.ui-layout-resizer-sliding .ui-layout-toggler { + display: none; +} +/* + * style the text we put INSIDE the togglers + */ +.ui-layout-toggler .content { + color: #666; + font-size: 12px; + font-weight: bold; + width: 100%; + padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */ +} /* * PANE-MASKS @@ -162,19 +151,19 @@ body { * included here as !important to ensure will overrides any generic styles */ .ui-layout-mask { - border: none !important; - padding: 0 !important; - margin: 0 !important; - overflow: hidden !important; - position: absolute !important; - opacity: 0 !important; - filter: Alpha(Opacity="0") !important; + border: none !important; + padding: 0 !important; + margin: 0 !important; + overflow: hidden !important; + position: absolute !important; + opacity: 0 !important; + filter: Alpha(Opacity="0") !important; } .ui-layout-mask-inside-pane { /* masks always inside pane EXCEPT when pane is an iframe */ - top: 0 !important; - left: 0 !important; - width: 100% !important; - height: 100% !important; + top: 0 !important; + left: 0 !important; + width: 100% !important; + height: 100% !important; } div.ui-layout-mask {} /* standard mask for iframes */ iframe.ui-layout-mask {} /* extra mask for objects/applets */ @@ -183,41 +172,41 @@ iframe.ui-layout-mask {} /* extra mask for objects/applets */ * Default printing styles */ @media print { - /* - * Unless you want to print the layout as it appears onscreen, - * these html/body styles are needed to allow the content to 'flow' - */ - html { - height: auto !important; - overflow: visible !important; - } - body.ui-layout-container { - position: static !important; - top: auto !important; - bottom: auto !important; - left: auto !important; - right: auto !important; - /* only IE6 has container width & height set by Layout */ - _width: auto !important; - _height: auto !important; - } - .ui-layout-resizer, .ui-layout-toggler { - display: none !important; - } - /* - * Default pane print styles disables positioning, borders and backgrounds. - * You can modify these styles however it suit your needs. - */ - .ui-layout-pane { - border: none !important; - background: transparent !important; - position: relative !important; - top: auto !important; - bottom: auto !important; - left: auto !important; - right: auto !important; - width: auto !important; - height: auto !important; - overflow: visible !important; - } + /* + * Unless you want to print the layout as it appears onscreen, + * these html/body styles are needed to allow the content to 'flow' + */ + html { + height: auto !important; + overflow: visible !important; + } + body.ui-layout-container { + position: static !important; + top: auto !important; + bottom: auto !important; + left: auto !important; + right: auto !important; + /* only IE6 has container width & height set by Layout */ + _width: auto !important; + _height: auto !important; + } + .ui-layout-resizer, .ui-layout-toggler { + display: none !important; + } + /* + * Default pane print styles disables positioning, borders and backgrounds. + * You can modify these styles however it suit your needs. + */ + .ui-layout-pane { + border: none !important; + background: transparent !important; + position: relative !important; + top: auto !important; + bottom: auto !important; + left: auto !important; + right: auto !important; + width: auto !important; + height: auto !important; + overflow: visible !important; + } } \ No newline at end of file diff --git a/static/js/windows.js b/static/js/windows.js index 2e49e91..dee1079 100644 --- a/static/js/windows.js +++ b/static/js/windows.js @@ -32,7 +32,6 @@ var windows = { north__size: 22, south__size: 19, spacing_open: 2, - spacing_closed: 4, north__spacing_open: 0, south__spacing_open: 0, defaults: { @@ -62,7 +61,6 @@ var windows = { this.innerLayout = $('div.content').layout({ spacing_open: 2, - spacing_closed: 4, defaults: { fxSpeed_open: 300, fxSpeed_close: 100,