Merge pull request #14 from GwtMaterialDesign/release_2.0

Official 2.0 release
GwtMaterialDesign · Mar 8, 2017 · 9cd0f20 · 9cd0f20
2 parents 34f1293 + 732be66
commit 9cd0f20
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Gwt Material Design Themes for https://github.com/GwtMaterialDesign/gwt-material
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-themes</artifactId>
-    <version>2.0-rc3</version>
+    <version>2.0-rc4</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -3,12 +3,12 @@
   <parent>
     <artifactId>gwt-material-parent</artifactId>
     <groupId>com.github.gwtmaterialdesign</groupId>
-    <version>2.0-rc3</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>gwt-material-themes</artifactId>
-  <version>2.0-rc3</version>
+  <version>2.0-SNAPSHOT</version>
 
   <name>Gwt Material Themes</name>
   <description>Themes for gwt-material</description>
@@ -23,7 +23,7 @@
     <connection>scm:git:git@github.com:GwtMaterialDesign/gwt-material-themes.git</connection>
     <developerConnection>scm:git:git@github.com:GwtMaterialDesign/gwt-material-themes.git</developerConnection>
     <url>http://github.com/GwtMaterialDesign/gwt-material-themes</url>
-    <tag>v2.0-rc3</tag>
+    <tag>v2.0-SNAPSHOT</tag>
   </scm>
 
   <licenses>

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
@@ -82,7 +82,7 @@ blockquote {
 
 /** Window **/
 .window .window-toolbar {
-    background-color: #ffc107 !important;
+    background-color: #ffc107;
 }
 
 /** Tree Item **/
@@ -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;
 }
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
@@ -82,7 +82,7 @@ blockquote {
 
 /** Window **/
 .window .window-toolbar {
-    background-color: #2196f3 !important;
+    background-color: #2196f3;
 }
 
 /** Tree Item **/
@@ -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;
 }
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
@@ -82,7 +82,7 @@ blockquote {
 
 /** Window **/
 .window .window-toolbar {
-    background-color: #795548 !important;
+    background-color: #795548;
 }
 
 /** Tree Item **/
@@ -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;
 }
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
@@ -82,7 +82,7 @@ blockquote {
 
 /** Window **/
 .window .window-toolbar {
-    background-color: #4caf50 !important;
+    background-color: #4caf50;
 }
 
 /** Tree Item **/
@@ -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;
 }
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
@@ -82,7 +82,7 @@ blockquote {
 
 /** Window **/
 .window .window-toolbar {
-    background-color: #9e9e9e !important;
+    background-color: #9e9e9e;
 }
 
 /** Tree Item **/
@@ -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;
 }
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
@@ -82,7 +82,7 @@ blockquote {
 
 /** Window **/
 .window .window-toolbar {
-    background-color: #ff9800 !important;
+    background-color: #ff9800;
 }
 
 /** Tree Item **/
@@ -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;
 }
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
@@ -82,7 +82,7 @@ blockquote {
 
 /** Window **/
 .window .window-toolbar {
-    background-color: #e91e63 !important;
+    background-color: #e91e63;
 }
 
 /** Tree Item **/
@@ -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;
 }
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
@@ -82,7 +82,7 @@ blockquote {
 
 /** Window **/
 .window .window-toolbar {
-    background-color: #9c27b0 !important;
+    background-color: #9c27b0;
 }
 
 /** Tree Item **/
@@ -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;
 }
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
@@ -82,7 +82,7 @@ blockquote {
 
 /** Window **/
 .window .window-toolbar {
-    background-color: #f44336 !important;
+    background-color: #f44336;
 }
 
 /** Tree Item **/
@@ -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;
 }
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
@@ -82,7 +82,7 @@ blockquote {
 
 /** Window **/
 .window .window-toolbar {
-    background-color: #ffeb3b !important;
+    background-color: #ffeb3b;
 }
 
 /** Tree Item **/
@@ -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;
 }