Skip to content

Commit 4e049b7

Browse files
committed
Merge branch 'release_2.0' into mk_api_work
# Conflicts: # src/main/java/gwt/material/design/demo/client/application/components/errors/ErrorsView.ui.xml # src/main/java/gwt/material/design/demo/client/application/components/forms/FormsView.ui.xml # src/main/java/gwt/material/design/demo/client/application/dto/Version.java # src/main/java/gwt/material/design/demo/client/application/style/themes/ThemesView.ui.xml
2 parents 1cb6eb7 + c95f9e4 commit 4e049b7

File tree

9 files changed

+34
-12
lines changed

9 files changed

+34
-12
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
#gwt-material-demo [![Build Status](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo.svg?branch=master)](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo)
33
Demo application to show the features of the [gwt-material](https://github.com/GwtMaterialDesign/gwt-material) library.
44

5-
### Release 1.5.1 Demo
5+
### Release 1.6.0 Demo
66
[http://gwtmaterialdesign.github.io/gwt-material-demo](http://gwtmaterialdesign.github.io/gwt-material-demo)
77
```xml
88
<dependency>
99
<groupId>com.github.gwtmaterialdesign</groupId>
1010
<artifactId>gwt-material-demo</artifactId>
11-
<version>1.5.1</version>
11+
<version>1.6.0</version>
1212
</dependency>
1313
```
1414

15-
### 1.5.2 Snapshot Demo
15+
### 2.0 Snapshot Demo
1616
[http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot)
1717
```xml
1818
<dependency>
1919
<groupId>com.github.gwtmaterialdesign</groupId>
2020
<artifactId>gwt-material-demo</artifactId>
21-
<version>1.5.2-SNAPSHOT</version>
21+
<version>2.0-SNAPSHOT</version>
2222
</dependency>
2323
```
2424

src/main/java/gwt/material/design/demo/client/ThemeManager.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
* #%L
3+
* GwtMaterial
4+
* %%
5+
* Copyright (C) 2015 - 2016 GwtMaterialDesign
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
120
package gwt.material.design.demo.client;
221

322
import com.google.gwt.user.client.Cookies;

src/main/java/gwt/material/design/demo/client/application/about/AboutView.ui.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
#L%
1919
-->
2020
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'
21-
xmlns:m="urn:import:gwt.material.design.client.ui"
22-
xmlns:p="urn:import:gwt.material.design.demo.client.panel">
21+
xmlns:m="urn:import:gwt.material.design.client.ui">
2322

2423
<ui:with field='res' type='gwt.material.design.demo.client.resources.MaterialResources' />
2524

src/main/java/gwt/material/design/demo/client/application/addins/dnd/DndView.ui.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
2121
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
2222
xmlns:m="urn:import:gwt.material.design.client.ui"
23-
xmlns:m.addins="urn:import:gwt.material.design.addins.client.ui"
23+
xmlns:m.addins="urn:import:gwt.material.design.addins.client"
2424
xmlns:demo="urn:import:gwt.material.design.demo.client.ui">
2525
<m:MaterialPanel>
2626
<m:MaterialRow addStyleNames="code">

src/main/java/gwt/material/design/demo/client/application/addins/scrollfire/ScrollFireView.ui.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
2222
xmlns:m="urn:import:gwt.material.design.client.ui"
2323
xmlns:g="urn:import:com.google.gwt.user.client.ui"
24-
xmlns:m.addins="urn:import:gwt.material.design.addins.client.ui"
24+
xmlns:m.addins="urn:import:gwt.material.design.addins.client"
2525
xmlns:m.html="urn:import:gwt.material.design.client.ui.html"
2626
xmlns:demo="urn:import:gwt.material.design.demo.client.ui">
2727

src/main/java/gwt/material/design/demo/client/application/components/dropdown/DropdownView.ui.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
2222
xmlns:g="urn:import:com.google.gwt.user.client.ui"
2323
xmlns:m="urn:import:gwt.material.design.client.ui"
24-
xmlns:m.addins="urn:import:gwt.material.design.addins.client.ui"
24+
xmlns:m.addins="urn:import:gwt.material.design.addins.client"
2525
xmlns:demo="urn:import:gwt.material.design.demo.client.ui">
2626
<m:MaterialPanel>
2727
<g:HTMLPanel>

src/main/java/gwt/material/design/demo/client/application/menu/MenuView.ui.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@
2626
<ui:with field="tokens" type="gwt.material.design.demo.client.place.NameTokens"/>
2727

2828
<ui:style>
29-
@external .sidebar, .nav-wrapper;
29+
@external .sidebar, .nav-wrapper, .select2-selection__rendered;
3030
main, header, footer{
3131
/*padding-left: 250px;*/
3232
}
3333

34+
.select2-selection__rendered {
35+
color: white !important;
36+
}
37+
3438
.sidebar {
3539
padding: 10% !important;
3640
font-size: 1em;

src/main/java/gwt/material/design/demo/client/application/showcase/pathanimator/PathAnimatorShowcase.ui.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
2121
xmlns:g='urn:import:com.google.gwt.user.client.ui'
2222
xmlns:m="urn:import:gwt.material.design.client.ui"
23-
xmlns:m.addins="urn:import:gwt.material.design.addins.client.ui">
23+
xmlns:m.addins="urn:import:gwt.material.design.addins.client">
2424

2525

2626
<ui:style>

src/main/resources/gwt/material/design/demo/client/resources/MaterialConstants.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apkUrl=http://gwt-material.appspot.com/bin/gwtmaterial.apk
22
rawSourceUrl=http://gwt-material.appspot.com/bin/materialize-v0.96.5.zip
3-
sourceUrl=http://central.maven.org/maven2/com/github/gwtmaterialdesign/gwt-material/1.5.1/gwt-material-1.5.1.jar
3+
sourceUrl=http://central.maven.org/maven2/com/github/gwtmaterialdesign/gwt-material/1.6.0/gwt-material-1.6.0.jar
44
gitterUrl=https://gitter.im/GwtMaterialDesign/gwt-material
55
weatherIconsUrl=http://gwt-material.appspot.com/bin/weather
66
mavenUrl=http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material

0 commit comments

Comments
 (0)