summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/liferay
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-08-08 14:27:31 +0300
committerHenri Sara <hesara@vaadin.com>2012-08-08 14:44:49 +0300
commitcfa455d6cfd4a535fd77cbc76637a57e7024e9ac (patch)
treececb66492671ed20fa9865581da12930ed502047 /WebContent/VAADIN/themes/liferay
parent620e096b45f27ecc5aa85d164ca8b81df000e593 (diff)
downloadvaadin-framework-cfa455d6cfd4a535fd77cbc76637a57e7024e9ac.tar.gz
vaadin-framework-cfa455d6cfd4a535fd77cbc76637a57e7024e9ac.zip
Standard themes in SCSS form, updated CompileDefaultTheme (#9223)
Conversion performed for most themes trivial, just rename file and wrap in a mixin. For chameleon compounds, also nesting used. In some cases, related small files combined in a single SCSS file Chameleon accordion and select contain fixes other than just a missing semicolon.
Diffstat (limited to 'WebContent/VAADIN/themes/liferay')
-rw-r--r--WebContent/VAADIN/themes/liferay/accordion/accordion.scss (renamed from WebContent/VAADIN/themes/liferay/accordion/accordion.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/button/button.scss (renamed from WebContent/VAADIN/themes/liferay/button/button.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/common/common.scss (renamed from WebContent/VAADIN/themes/liferay/common/common.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/contextmenu/contextmenu.scss (renamed from WebContent/VAADIN/themes/liferay/contextmenu/contextmenu.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/datefield/datefield.scss (renamed from WebContent/VAADIN/themes/liferay/datefield/datefield.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/formlayout/formlayout.scss (renamed from WebContent/VAADIN/themes/liferay/formlayout/formlayout.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/liferay.scss25
-rw-r--r--WebContent/VAADIN/themes/liferay/menubar/menubar.scss (renamed from WebContent/VAADIN/themes/liferay/menubar/menubar.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/notification/notification.scss (renamed from WebContent/VAADIN/themes/liferay/notification/notification.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/panel/panel.scss (renamed from WebContent/VAADIN/themes/liferay/panel/panel.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/popupview/popupview.scss (renamed from WebContent/VAADIN/themes/liferay/popupview/popupview.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/progressindicator/progressindicator.scss (renamed from WebContent/VAADIN/themes/liferay/progressindicator/progressindicator.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/select/select.scss (renamed from WebContent/VAADIN/themes/liferay/select/select.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/slider/slider.scss (renamed from WebContent/VAADIN/themes/liferay/slider/slider.css)7
-rw-r--r--WebContent/VAADIN/themes/liferay/splitpanel/splitpanel.scss (renamed from WebContent/VAADIN/themes/liferay/splitpanel/splitpanel.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/styles.scss28
-rw-r--r--WebContent/VAADIN/themes/liferay/table/table.scss (renamed from WebContent/VAADIN/themes/liferay/table/table.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.scss (renamed from WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/textfield/textfield.scss (renamed from WebContent/VAADIN/themes/liferay/textfield/textfield.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/tree/tree.scss (renamed from WebContent/VAADIN/themes/liferay/tree/tree.css)4
-rw-r--r--WebContent/VAADIN/themes/liferay/window/window.scss (renamed from WebContent/VAADIN/themes/liferay/window/window.css)4
21 files changed, 132 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/liferay/accordion/accordion.css b/WebContent/VAADIN/themes/liferay/accordion/accordion.scss
index 8faff71137..840c02feec 100644
--- a/WebContent/VAADIN/themes/liferay/accordion/accordion.css
+++ b/WebContent/VAADIN/themes/liferay/accordion/accordion.scss
@@ -1,3 +1,5 @@
+@mixin liferay-accordion {
+
.v-accordion {
border: 1px solid #999;
-webkit-border-radius: 4px;
@@ -25,4 +27,6 @@
.v-accordion-item-open .v-accordion-item-caption {
border-bottom: 1px solid #999;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/button/button.css b/WebContent/VAADIN/themes/liferay/button/button.scss
index bd0f307947..3a2e4a7acb 100644
--- a/WebContent/VAADIN/themes/liferay/button/button.css
+++ b/WebContent/VAADIN/themes/liferay/button/button.scss
@@ -1,3 +1,5 @@
+@mixin liferay-button {
+
.v-button:focus {
outline: none;
}
@@ -101,4 +103,6 @@ button.v-nativebutton-link-pressed,
/* CheckBox */
.v-checkbox input {
margin-right: 3px;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/common/common.css b/WebContent/VAADIN/themes/liferay/common/common.scss
index 521c4f3ac1..a94431d4cb 100644
--- a/WebContent/VAADIN/themes/liferay/common/common.css
+++ b/WebContent/VAADIN/themes/liferay/common/common.scss
@@ -1,3 +1,5 @@
+@mixin liferay-common {
+
div.v-app {
background-color: transparent;
}
@@ -33,3 +35,5 @@ div.v-app {
font-weight: bold;
margin: 1px 0 4px 0;
}
+
+} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/contextmenu/contextmenu.css b/WebContent/VAADIN/themes/liferay/contextmenu/contextmenu.scss
index e29f0976e1..7748580f0c 100644
--- a/WebContent/VAADIN/themes/liferay/contextmenu/contextmenu.css
+++ b/WebContent/VAADIN/themes/liferay/contextmenu/contextmenu.scss
@@ -1,3 +1,5 @@
+@mixin liferay-contextmenu {
+
.v-contextmenu {
background: #ccc9c9 url(/html/themes/classic/images/application/menu_bg.png) repeat-x 0 0;
border: 1px solid;
@@ -37,4 +39,6 @@
.v-contextmenu .gwt-MenuItem-selected div {
background: transparent;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/datefield/datefield.css b/WebContent/VAADIN/themes/liferay/datefield/datefield.scss
index 6040052798..4bfc810b52 100644
--- a/WebContent/VAADIN/themes/liferay/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/liferay/datefield/datefield.scss
@@ -1,3 +1,5 @@
+@mixin liferay-datefield {
+
.v-datefield-popup {
padding: 3px;
-webkit-border-radius: 4px;
@@ -163,4 +165,6 @@ span.v-datefield-calendarpanel-month {
.v-datefield-calendarpanel-body table {
margin: 0 auto;
width: 200px;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/formlayout/formlayout.css b/WebContent/VAADIN/themes/liferay/formlayout/formlayout.scss
index 9cf250627e..3fa6fa20ee 100644
--- a/WebContent/VAADIN/themes/liferay/formlayout/formlayout.css
+++ b/WebContent/VAADIN/themes/liferay/formlayout/formlayout.scss
@@ -1,3 +1,7 @@
+@mixin liferay-formlayout {
+
.v-formlayout .v-caption {
font-weight: normal;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/liferay.scss b/WebContent/VAADIN/themes/liferay/liferay.scss
new file mode 100644
index 0000000000..68e9efbfe2
--- /dev/null
+++ b/WebContent/VAADIN/themes/liferay/liferay.scss
@@ -0,0 +1,25 @@
+// this file just defines all reindeer mixins by importing them
+
+// common between others for now for backwards compatibility
+
+@import "accordion/accordion.scss";
+@import "button/button.scss";
+
+@import "common/common.scss";
+
+@import "contextmenu/contextmenu.scss";
+@import "datefield/datefield.scss";
+@import "formlayout/formlayout.scss";
+@import "menubar/menubar.scss";
+@import "notification/notification.scss";
+@import "panel/panel.scss";
+@import "popupview/popupview.scss";
+@import "progressindicator/progressindicator.scss";
+@import "select/select.scss";
+@import "slider/slider.scss";
+@import "splitpanel/splitpanel.scss";
+@import "table/table.scss";
+@import "tabsheet/tabsheet.scss";
+@import "textfield/textfield.scss";
+@import "tree/tree.scss";
+@import "window/window.scss";
diff --git a/WebContent/VAADIN/themes/liferay/menubar/menubar.css b/WebContent/VAADIN/themes/liferay/menubar/menubar.scss
index cb0812f268..71891ff059 100644
--- a/WebContent/VAADIN/themes/liferay/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/liferay/menubar/menubar.scss
@@ -1,3 +1,5 @@
+@mixin liferay-menubar {
+
.v-menubar {
background: #97A1AE url(/html/themes/classic/images/dockbar/dockbar_bg.png) repeat-x 0 0;
border-bottom: 1px solid #636364;
@@ -61,4 +63,6 @@
.v-menubar span.v-menubar-menuitem-disabled:focus,
.v-menubar span.v-menubar-menuitem-disabled:active {
color: #999;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/notification/notification.css b/WebContent/VAADIN/themes/liferay/notification/notification.scss
index 10168fecbd..2312768287 100644
--- a/WebContent/VAADIN/themes/liferay/notification/notification.css
+++ b/WebContent/VAADIN/themes/liferay/notification/notification.scss
@@ -1,3 +1,5 @@
+@mixin liferay-notification {
+
.v-Notification {
background: #dff4ff;
color: #34404F;
@@ -45,4 +47,6 @@
.v-Notification-system h1 {
display: block;
margin: 0;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/panel/panel.css b/WebContent/VAADIN/themes/liferay/panel/panel.scss
index bb0bbe5338..79172b2474 100644
--- a/WebContent/VAADIN/themes/liferay/panel/panel.css
+++ b/WebContent/VAADIN/themes/liferay/panel/panel.scss
@@ -1,3 +1,5 @@
+@mixin liferay-panel {
+
.v-panel {
background: transparent url(top-left.png) no-repeat;
}
@@ -80,3 +82,5 @@
.v-ie .v-panel-caption-light {
border-bottom: 1px solid #999;
}
+
+} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/popupview/popupview.css b/WebContent/VAADIN/themes/liferay/popupview/popupview.scss
index 06cfddb7fe..ab06d18c98 100644
--- a/WebContent/VAADIN/themes/liferay/popupview/popupview.css
+++ b/WebContent/VAADIN/themes/liferay/popupview/popupview.scss
@@ -1,3 +1,5 @@
+@mixin liferay-popupview {
+
.v-popupview-popup {
background: #d4d4d4 url(/html/themes/classic/images/application/state_default_bg.png) repeat-x 0 0;
padding: 8px;
@@ -6,4 +8,6 @@
border-radius: 4px;
border: 1px solid #c8c9ca;
border-color :#c8c9ca #9e9e9e #9e9e9e #c8c9ca;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/liferay/progressindicator/progressindicator.scss
index ad8fb1c871..4371b2aeef 100644
--- a/WebContent/VAADIN/themes/liferay/progressindicator/progressindicator.css
+++ b/WebContent/VAADIN/themes/liferay/progressindicator/progressindicator.scss
@@ -1,3 +1,5 @@
+@mixin liferay-progressindicator {
+
.v-progressindicator-wrapper {
background: #dfe2e4 url(../../reindeer/progressindicator/img/base.gif) repeat-x;
border: 1px solid #bfbfbf;
@@ -9,4 +11,6 @@
.v-progressindicator-indicator {
background: #f7f9f9 url(../../reindeer/progressindicator/img/progress.png);
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/select/select.css b/WebContent/VAADIN/themes/liferay/select/select.scss
index 66672cc573..3dbeaeab9d 100644
--- a/WebContent/VAADIN/themes/liferay/select/select.css
+++ b/WebContent/VAADIN/themes/liferay/select/select.scss
@@ -1,3 +1,5 @@
+@mixin liferay-select {
+
.v-app select,
.v-window select {
padding: 1px;
@@ -74,4 +76,6 @@ select {
.v-select-twincol-buttons .v-button-wrap {
padding-left: 11px;
padding-right: 11px;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/slider/slider.css b/WebContent/VAADIN/themes/liferay/slider/slider.scss
index 4f11091f16..d30de67da0 100644
--- a/WebContent/VAADIN/themes/liferay/slider/slider.css
+++ b/WebContent/VAADIN/themes/liferay/slider/slider.scss
@@ -1,3 +1,5 @@
+@mixin liferay-slider {
+
.v-slider {
border: 1px solid #9e9e9e;
border-right: 1px solid #c8c9ca;
@@ -24,6 +26,11 @@
height: 10px;
}
+/* Invalid rule (not used at least by some browsers */
+/*
.v-slider-feedback {
background: #33;
+}
+*/
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/liferay/splitpanel/splitpanel.scss
index 5ee753389f..b8058f8cb1 100644
--- a/WebContent/VAADIN/themes/liferay/splitpanel/splitpanel.css
+++ b/WebContent/VAADIN/themes/liferay/splitpanel/splitpanel.scss
@@ -1,3 +1,5 @@
+@mixin liferay-splitpanel {
+
.v-splitpanel-hsplitter,
.v-splitpanel-hsplitter-locked {
font-size: 1px;
@@ -60,4 +62,6 @@
font-size: 1px;
height: 1px;
background: #c8c9ca;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/styles.scss b/WebContent/VAADIN/themes/liferay/styles.scss
new file mode 100644
index 0000000000..78fbd62c25
--- /dev/null
+++ b/WebContent/VAADIN/themes/liferay/styles.scss
@@ -0,0 +1,28 @@
+// this file actually attaches all liferay mixins to a parent style
+
+@import "../base/styles.scss";
+@import "liferay.scss";
+
+// .v-theme-liferay {
+ @include liferay-accordion;
+ @include liferay-button;
+
+ @include liferay-common;
+
+ @include liferay-contextmenu;
+ @include liferay-datefield;
+ @include liferay-formlayout;
+ @include liferay-menubar;
+ @include liferay-notification;
+ @include liferay-panel;
+ @include liferay-popupview;
+ @include liferay-progressindicator;
+ @include liferay-select;
+ @include liferay-slider;
+ @include liferay-splitpanel;
+ @include liferay-table;
+ @include liferay-tabsheet;
+ @include liferay-textfield;
+ @include liferay-tree;
+ @include liferay-window;
+// }
diff --git a/WebContent/VAADIN/themes/liferay/table/table.css b/WebContent/VAADIN/themes/liferay/table/table.scss
index 81446d4628..0e1b96f5b0 100644
--- a/WebContent/VAADIN/themes/liferay/table/table.css
+++ b/WebContent/VAADIN/themes/liferay/table/table.scss
@@ -1,3 +1,5 @@
+@mixin liferay-table {
+
.v-table-body {
border: 1px solid #999;
}
@@ -132,4 +134,6 @@
.v-off {
color: #999;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.scss
index 7f23edb809..73e2c71dcb 100644
--- a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.scss
@@ -1,3 +1,5 @@
+@mixin liferay-tabsheet {
+
.v-tabsheet-content {
border: none;
}
@@ -139,4 +141,6 @@
text-indent: -999px;
width: 13px;
height: 9px;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/textfield/textfield.css b/WebContent/VAADIN/themes/liferay/textfield/textfield.scss
index b66a805eb0..9e3d2ece03 100644
--- a/WebContent/VAADIN/themes/liferay/textfield/textfield.css
+++ b/WebContent/VAADIN/themes/liferay/textfield/textfield.scss
@@ -1,3 +1,5 @@
+@mixin liferay-textfield {
+
.v-app input[type="text"],
.v-app input[type="password"],
.v-app input[type="reset"],
@@ -12,4 +14,6 @@
input.v-textfield-prompt,
textarea.v-textarea-prompt {
font-style: normal;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/tree/tree.css b/WebContent/VAADIN/themes/liferay/tree/tree.scss
index 33da398736..99ce8e709f 100644
--- a/WebContent/VAADIN/themes/liferay/tree/tree.css
+++ b/WebContent/VAADIN/themes/liferay/tree/tree.scss
@@ -1,3 +1,5 @@
+@mixin liferay-tree {
+
.v-tree-node {
background: transparent url(arrows_sprites.png) no-repeat -42px 1px;
}
@@ -55,4 +57,6 @@
.v-tree-node-children {
padding-left: 14px;
+}
+
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/window/window.css b/WebContent/VAADIN/themes/liferay/window/window.scss
index f034d7503f..54bfb37938 100644
--- a/WebContent/VAADIN/themes/liferay/window/window.css
+++ b/WebContent/VAADIN/themes/liferay/window/window.scss
@@ -1,3 +1,5 @@
+@mixin liferay-window {
+
.v-window {
background: transparent;
}
@@ -62,4 +64,6 @@
width: 10px;
height: 10px;
bottom: 0;
+}
+
} \ No newline at end of file