From a4e5f4a05ffb22df0ff40234c97b18a8d00de73d Mon Sep 17 00:00:00 2001 From: fmittag Date: Thu, 29 Jan 2015 16:43:55 +0100 Subject: [PATCH] separated css styles of dialogs (for reuse in AdminConsole) --- java/com.sap.sailing.gwt.ui/AdminConsole.html | 1 + .../com.sap.sailing.gwt.ui/CommonControls.css | 34 ++----------------- .../com.sap.sailing.gwt.ui/SettingsDialog.css | 31 +++++++++++++++++ java/com.sap.sailing.gwt.ui/build.properties | 3 +- 4 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 java/com.sap.sailing.gwt.ui/SettingsDialog.css diff --git a/java/com.sap.sailing.gwt.ui/AdminConsole.html b/java/com.sap.sailing.gwt.ui/AdminConsole.html index ed197d7172a..caafac0df47 100644 --- a/java/com.sap.sailing.gwt.ui/AdminConsole.html +++ b/java/com.sap.sailing.gwt.ui/AdminConsole.html @@ -24,6 +24,7 @@ + diff --git a/java/com.sap.sailing.gwt.ui/CommonControls.css b/java/com.sap.sailing.gwt.ui/CommonControls.css index 68dd8edf6e6..ebe33c16fb5 100755 --- a/java/com.sap.sailing.gwt.ui/CommonControls.css +++ b/java/com.sap.sailing.gwt.ui/CommonControls.css @@ -1,3 +1,5 @@ +@import url("SettingsDialog.css"); + body ::-webkit-scrollbar { width: 16px; height: 10px; @@ -828,47 +830,15 @@ body ::-webkit-scrollbar-track { line-height: 1.4; } -/* Dialogs */ -.SettingsDialogComponent { - padding: 0 0 15px 0; -} - -.SettingsDialogComponent .dialogInnerHeadline { - border: 1px solid #CCCCCC; - font-family: OpenSansSemiBold,Arial,Verdana,sans-serif; - height: 21px; - padding: 2px 0 0 7px; - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - -o-border-radius: 3px; - -ms-border-radius: 3px; - margin: 0 0 10px 0; -} - -.SettingsDialogComponent .dialogInnerContent { - padding: 0 9px 0 5px; -} - .timingSettings .dialogInnerContent { padding: 0 9px 0 9px; } -.SettingsDialogComponent .gwt-CheckBox { - padding: 0 10px 0 0; -} - .timingSettings .gwt-Label { float: left; padding: 0 10px 0 0; } -.dialogInnerHeadlineOther { - font-family: OpenSansSemiBold, Arial, Verdana, sans-serif; - color: #e84a1a; - padding-left: 9px; -} - .helpPanel { margin-top: 15px; } diff --git a/java/com.sap.sailing.gwt.ui/SettingsDialog.css b/java/com.sap.sailing.gwt.ui/SettingsDialog.css new file mode 100644 index 00000000000..f0f54b31d75 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/SettingsDialog.css @@ -0,0 +1,31 @@ +/* settings dialogs styles */ +.SettingsDialogComponent { + padding: 0 0 15px 0; +} + +.dialogInnerHeadline { + border: 1px solid #CCCCCC; + font-family: OpenSansSemiBold,Arial,Verdana,sans-serif; + height: 21px; + padding: 2px 0 0 7px; + border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -o-border-radius: 3px; + -ms-border-radius: 3px; + margin: 0 0 10px 0; +} + +.dialogInnerHeadlineOther { + font-family: OpenSansSemiBold, Arial, Verdana, sans-serif; + color: #e84a1a; + padding-left: 9px; +} + +.dialogInnerContent { + padding: 0 9px 0 5px; +} + +.SettingsDialogComponent .gwt-CheckBox { + padding: 0 10px 0 0; +} diff --git a/java/com.sap.sailing.gwt.ui/build.properties b/java/com.sap.sailing.gwt.ui/build.properties index 8e813bd9a04..b67d0b7dd18 100755 --- a/java/com.sap.sailing.gwt.ui/build.properties +++ b/java/com.sap.sailing.gwt.ui/build.properties @@ -51,5 +51,6 @@ bin.includes = META-INF/,\ AutoPlay.css,\ AutoPlay.html,\ Home.css,\ - Home.html + Home.html,\ + SettingsDialog.css output.. = WEB-INF/classes/