From 2053152ae810af4b653f9efa4e2820448fd8aaaf Mon Sep 17 00:00:00 2001 From: Kevzlou7979 Date: Tue, 29 Nov 2016 11:10:09 +0800 Subject: [PATCH 1/4] Iteration for 2.0-SNAPSHOT --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1cb98a5..9387794 100644 --- a/pom.xml +++ b/pom.xml @@ -3,12 +3,12 @@ gwt-material-parent com.github.gwtmaterialdesign - 2.0-rc3 + 2.0-SNAPSHOT 4.0.0 gwt-material-themes - 2.0-rc3 + 2.0-SNAPSHOT Gwt Material Themes Themes for gwt-material @@ -23,7 +23,7 @@ scm:git:git@github.com:GwtMaterialDesign/gwt-material-themes.git scm:git:git@github.com:GwtMaterialDesign/gwt-material-themes.git http://github.com/GwtMaterialDesign/gwt-material-themes - v2.0-rc3 + v2.0-SNAPSHOT From ea4dcc2479ad2606bbbc26f4ed7a1b661540e63a Mon Sep 17 00:00:00 2001 From: Kevzlou7979 Date: Mon, 5 Dec 2016 15:38:26 +0800 Subject: [PATCH 2/4] Fixed issue - Param toolbarColor of window ignored #522 --- .../gwt/material/design/themes/amber/css/overridecss.amber.css | 2 +- .../gwt/material/design/themes/blue/css/overridecss.blue.css | 2 +- .../gwt/material/design/themes/brown/css/overridecss.brown.css | 2 +- .../gwt/material/design/themes/green/css/overridecss.green.css | 2 +- .../gwt/material/design/themes/grey/css/overridecss.grey.css | 2 +- .../material/design/themes/orange/css/overridecss.orange.css | 2 +- .../gwt/material/design/themes/pink/css/overridecss.pink.css | 2 +- .../material/design/themes/purple/css/overridecss.purple.css | 2 +- .../gwt/material/design/themes/red/css/overridecss.red.css | 2 +- .../material/design/themes/yellow/css/overridecss.yellow.css | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css b/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css index 0f0fc08..800619f 100644 --- a/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css +++ b/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css @@ -82,7 +82,7 @@ blockquote { /** Window **/ .window .window-toolbar { - background-color: #ffc107 !important; + background-color: #ffc107; } /** Tree Item **/ diff --git a/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css b/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css index 36009a5..fd79122 100644 --- a/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css +++ b/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css @@ -82,7 +82,7 @@ blockquote { /** Window **/ .window .window-toolbar { - background-color: #2196f3 !important; + background-color: #2196f3; } /** Tree Item **/ diff --git a/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css b/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css index 0fb6d15..4b01133 100644 --- a/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css +++ b/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css @@ -82,7 +82,7 @@ blockquote { /** Window **/ .window .window-toolbar { - background-color: #795548 !important; + background-color: #795548; } /** Tree Item **/ diff --git a/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css b/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css index 7e1e973..be13ea6 100644 --- a/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css +++ b/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css @@ -82,7 +82,7 @@ blockquote { /** Window **/ .window .window-toolbar { - background-color: #4caf50 !important; + background-color: #4caf50; } /** Tree Item **/ diff --git a/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css b/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css index 883ff48..ceb2906 100644 --- a/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css +++ b/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css @@ -82,7 +82,7 @@ blockquote { /** Window **/ .window .window-toolbar { - background-color: #9e9e9e !important; + background-color: #9e9e9e; } /** Tree Item **/ diff --git a/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css b/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css index 19586b9..09ed015 100644 --- a/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css +++ b/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css @@ -82,7 +82,7 @@ blockquote { /** Window **/ .window .window-toolbar { - background-color: #ff9800 !important; + background-color: #ff9800; } /** Tree Item **/ diff --git a/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css b/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css index 22239e2..02d42c3 100644 --- a/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css +++ b/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css @@ -82,7 +82,7 @@ blockquote { /** Window **/ .window .window-toolbar { - background-color: #e91e63 !important; + background-color: #e91e63; } /** Tree Item **/ diff --git a/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css b/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css index 18ae861..f1e53c5 100644 --- a/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css +++ b/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css @@ -82,7 +82,7 @@ blockquote { /** Window **/ .window .window-toolbar { - background-color: #9c27b0 !important; + background-color: #9c27b0; } /** Tree Item **/ diff --git a/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css b/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css index 4826c7e..a3910db 100644 --- a/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css +++ b/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css @@ -82,7 +82,7 @@ blockquote { /** Window **/ .window .window-toolbar { - background-color: #f44336 !important; + background-color: #f44336; } /** Tree Item **/ diff --git a/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css b/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css index 64a8ebe..937605d 100644 --- a/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css +++ b/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css @@ -82,7 +82,7 @@ blockquote { /** Window **/ .window .window-toolbar { - background-color: #ffeb3b !important; + background-color: #ffeb3b; } /** Tree Item **/ From 7693d5e185910cbc745eb209f13ed179eade589a Mon Sep 17 00:00:00 2001 From: Kevzlou7979 Date: Wed, 8 Mar 2017 08:35:55 +0800 Subject: [PATCH 3/4] Fixed - ComboBox : Theme issue on multiple select box #15 --- .../material/design/themes/amber/css/overridecss.amber.css | 6 ++++++ .../material/design/themes/blue/css/overridecss.blue.css | 6 ++++++ .../material/design/themes/brown/css/overridecss.brown.css | 6 ++++++ .../material/design/themes/green/css/overridecss.green.css | 6 ++++++ .../material/design/themes/grey/css/overridecss.grey.css | 6 ++++++ .../design/themes/orange/css/overridecss.orange.css | 6 ++++++ .../material/design/themes/pink/css/overridecss.pink.css | 6 ++++++ .../design/themes/purple/css/overridecss.purple.css | 6 ++++++ .../gwt/material/design/themes/red/css/overridecss.red.css | 6 ++++++ .../design/themes/yellow/css/overridecss.yellow.css | 6 ++++++ 10 files changed, 60 insertions(+) diff --git a/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css b/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css index 800619f..858e25c 100644 --- a/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css +++ b/src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css @@ -130,4 +130,10 @@ button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.bt /** Table **/ .top-panel { background: #ff8f00; +} + +/** ComboBox **/ +ul.select2-results__options[aria-multiselectable="true"] li.select2-results__option:not([role="group"])[aria-selected="true"]:after { + border: 2px solid #ffc107; + background-color: #ffc107; } \ No newline at end of file diff --git a/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css b/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css index fd79122..eabf673 100644 --- a/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css +++ b/src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css @@ -130,4 +130,10 @@ button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.bt /** Table **/ .top-panel { background: #1565c0; +} + +/** ComboBox **/ +ul.select2-results__options[aria-multiselectable="true"] li.select2-results__option:not([role="group"])[aria-selected="true"]:after { + border: 2px solid #2196f3; + background-color: #2196f3; } \ No newline at end of file diff --git a/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css b/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css index 4b01133..b4db93a 100644 --- a/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css +++ b/src/main/resources/gwt/material/design/themes/brown/css/overridecss.brown.css @@ -130,4 +130,10 @@ button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.bt /** Table **/ .top-panel { background: #4e342e; +} + +/** ComboBox **/ +ul.select2-results__options[aria-multiselectable="true"] li.select2-results__option:not([role="group"])[aria-selected="true"]:after { + border: 2px solid #795548; + background-color: #795548; } \ No newline at end of file diff --git a/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css b/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css index be13ea6..baf8133 100644 --- a/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css +++ b/src/main/resources/gwt/material/design/themes/green/css/overridecss.green.css @@ -130,4 +130,10 @@ button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.bt /** Table **/ .top-panel { background: #2e7d32; +} + +/** ComboBox **/ +ul.select2-results__options[aria-multiselectable="true"] li.select2-results__option:not([role="group"])[aria-selected="true"]:after { + border: 2px solid #4caf50; + background-color: #4caf50; } \ No newline at end of file diff --git a/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css b/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css index ceb2906..7bedd8e 100644 --- a/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css +++ b/src/main/resources/gwt/material/design/themes/grey/css/overridecss.grey.css @@ -130,4 +130,10 @@ button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.bt /** Table **/ .top-panel { background: #424242; +} + +/** ComboBox **/ +ul.select2-results__options[aria-multiselectable="true"] li.select2-results__option:not([role="group"])[aria-selected="true"]:after { + border: 2px solid #9e9e9e; + background-color: #9e9e9e; } \ No newline at end of file diff --git a/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css b/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css index 09ed015..96306f3 100644 --- a/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css +++ b/src/main/resources/gwt/material/design/themes/orange/css/overridecss.orange.css @@ -130,4 +130,10 @@ button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.bt /** Table **/ .top-panel { background: #ef6c00; +} + +/** ComboBox **/ +ul.select2-results__options[aria-multiselectable="true"] li.select2-results__option:not([role="group"])[aria-selected="true"]:after { + border: 2px solid #ff9800; + background-color: #ff9800; } \ No newline at end of file diff --git a/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css b/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css index 02d42c3..3c4c5ee 100644 --- a/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css +++ b/src/main/resources/gwt/material/design/themes/pink/css/overridecss.pink.css @@ -130,4 +130,10 @@ button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.bt /** Table **/ .top-panel { background: #ad1457; +} + +/** ComboBox **/ +ul.select2-results__options[aria-multiselectable="true"] li.select2-results__option:not([role="group"])[aria-selected="true"]:after { + border: 2px solid #e91e63; + background-color: #e91e63; } \ No newline at end of file diff --git a/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css b/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css index f1e53c5..61b5394 100644 --- a/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css +++ b/src/main/resources/gwt/material/design/themes/purple/css/overridecss.purple.css @@ -130,4 +130,10 @@ button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.bt /** Table **/ .top-panel { background: #6a1b9a; +} + +/** ComboBox **/ +ul.select2-results__options[aria-multiselectable="true"] li.select2-results__option:not([role="group"])[aria-selected="true"]:after { + border: 2px solid #9c27b0; + background-color: #9c27b0; } \ No newline at end of file diff --git a/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css b/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css index a3910db..c03e5d3 100644 --- a/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css +++ b/src/main/resources/gwt/material/design/themes/red/css/overridecss.red.css @@ -130,4 +130,10 @@ button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.bt /** Table **/ .top-panel { background: #c62828; +} + +/** ComboBox **/ +ul.select2-results__options[aria-multiselectable="true"] li.select2-results__option:not([role="group"])[aria-selected="true"]:after { + border: 2px solid #f44336; + background-color: #f44336; } \ No newline at end of file diff --git a/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css b/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css index 937605d..c6d6a5d 100644 --- a/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css +++ b/src/main/resources/gwt/material/design/themes/yellow/css/overridecss.yellow.css @@ -130,4 +130,10 @@ button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.bt /** Table **/ .top-panel { background: #f9a825; +} + +/** ComboBox **/ +ul.select2-results__options[aria-multiselectable="true"] li.select2-results__option:not([role="group"])[aria-selected="true"]:after { + border: 2px solid #ffeb3b; + background-color: #ffeb3b; } \ No newline at end of file From 732be663ee2f6f767235df7578526c187d0fdc91 Mon Sep 17 00:00:00 2001 From: Kevzlou7979 Date: Wed, 8 Mar 2017 10:50:46 +0800 Subject: [PATCH 4/4] Updated README for Themes 2.0-rc4 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8282715..4400128 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Gwt Material Design Themes for https://github.com/GwtMaterialDesign/gwt-material com.github.gwtmaterialdesign gwt-material-themes - 2.0-rc3 + 2.0-rc4 ```