Skip to content

Commit

Permalink
Merge pull request #20 from GwtMaterialDesign/release_2.0
Browse files Browse the repository at this point in the history
Release 2.0
  • Loading branch information
kevzlou7979 authored Oct 20, 2017
2 parents 5ab1090 + 8b30b2f commit e9fabf4
Show file tree
Hide file tree
Showing 13 changed files with 44 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cache:
- $HOME/.m2
before_install:
# install the gwt-material library before we build the demo
- git clone https://github.com/GwtMaterialDesign/gwt-material.git
- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material.git
- cd gwt-material
- mvn install -DskipTests=true -DdryRun=true
- cd ..
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,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-rc6</version>
<version>2.0-rc7</version>
</dependency>
```

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<parent>
<artifactId>gwt-material-parent</artifactId>
<groupId>com.github.gwtmaterialdesign</groupId>
<version>2.0-rc6</version>
<version>2.0-rc7</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>gwt-material-themes</artifactId>
<version>2.0-rc6</version>
<version>2.0-rc7</version>

<name>Gwt Material Themes</name>
<description>Themes for gwt-material</description>
Expand All @@ -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-rc6</tag>
<tag>v2.0-rc7</tag>
</scm>

<licenses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockquote {
background-color: #ffc107;
}

/**SCROLLSPY**/
/** Scrollspy **/
.table-of-contents a.active {
border-left: 2px solid #ffc107 !important;
}
Expand All @@ -21,11 +21,12 @@ blockquote {
border-left: 1px solid #ffc107 !important;
}

/** Progress **/
.progress div {
background-color: #ffb300;
}

/**Time Picker**/
/** Time Picker **/
.lolliclock-header {
background: #ffc107 !important;
}
Expand Down Expand Up @@ -104,7 +105,7 @@ blockquote {
background: #ffc107 !important;
}

.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
background: #ffc107 !important;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockquote {
background-color: #2196f3;
}

/**SCROLLSPY**/
/** Scrollspy **/
.table-of-contents a.active {
border-left: 2px solid #2196f3 !important;
}
Expand All @@ -21,11 +21,12 @@ blockquote {
border-left: 1px solid #2196f3 !important;
}

/** Progress **/
.progress div {
background-color: #1e88e5;
}

/**Time Picker**/
/** Time Picker **/
.lolliclock-header {
background: #2196f3 !important;
}
Expand Down Expand Up @@ -104,7 +105,7 @@ blockquote {
background: #2196f3 !important;
}

.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
background: #2196f3 !important;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockquote {
background-color: #795548;
}

/**SCROLLSPY**/
/** Scrollspy **/
.table-of-contents a.active {
border-left: 2px solid #795548 !important;
}
Expand All @@ -21,11 +21,12 @@ blockquote {
border-left: 1px solid #795548 !important;
}

/** Progress**/
.progress div {
background-color: #6d4c41;
}

/**Time Picker**/
/** Time Picker **/
.lolliclock-header {
background: #795548 !important;
}
Expand Down Expand Up @@ -104,7 +105,7 @@ blockquote {
background: #795548 !important;
}

.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
background: #795548 !important;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockquote {
background-color: #4caf50;
}

/**SCROLLSPY**/
/** Scrollspy **/
.table-of-contents a.active {
border-left: 2px solid #4caf50 !important;
}
Expand All @@ -21,11 +21,12 @@ blockquote {
border-left: 1px solid #4caf50 !important;
}

/** Progress **/
.progress div {
background-color: #7cb342;
}

/**Time Picker**/
/** Time Picker **/
.lolliclock-header {
background: #4caf50 !important;
}
Expand Down Expand Up @@ -104,7 +105,7 @@ blockquote {
background: #4caf50 !important;
}

.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
background: #4caf50 !important;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockquote {
background-color: #9e9e9e;
}

/**SCROLLSPY**/
/** Scrollspy **/
.table-of-contents a.active {
border-left: 2px solid #9e9e9e !important;
}
Expand All @@ -21,11 +21,12 @@ blockquote {
border-left: 1px solid #9e9e9e !important;
}

/** Progress **/
.progress div {
background-color: #757575;
}

/**Time Picker**/
/** Time Picker **/
.lolliclock-header {
background: #9e9e9e !important;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockquote {
background-color: #ff9800;
}

/**SCROLLSPY**/
/** Scrollspy **/
.table-of-contents a.active {
border-left: 2px solid #ff9800 !important;
}
Expand All @@ -21,11 +21,12 @@ blockquote {
border-left: 1px solid #ff9800 !important;
}

/** Progress **/
.progress div {
background-color: #fb8c00;
}

/**Time Picker**/
/** Time Picker **/
.lolliclock-header {
background: #ff9800 !important;
}
Expand Down Expand Up @@ -104,7 +105,7 @@ blockquote {
background: #ff9800 !important;
}

.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
background: #ff9800 !important;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockquote {
background-color: #e91e63;
}

/**SCROLLSPY**/
/** Scrollspy **/
.table-of-contents a.active {
border-left: 2px solid #e91e63 !important;
}
Expand All @@ -21,11 +21,12 @@ blockquote {
border-left: 1px solid #e91e63 !important;
}

/** Progress **/
.progress div {
background-color: #d81b60;
}

/**Time Picker**/
/** Time Picker **/
.lolliclock-header {
background: #e91e63 !important;
}
Expand Down Expand Up @@ -104,7 +105,7 @@ blockquote {
background: #e91e63 !important;
}

.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
background: #e91e63 !important;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockquote {
background-color: #9c27b0;
}

/**SCROLLSPY**/
/** Scrollspy **/
.table-of-contents a.active {
border-left: 2px solid #9c27b0 !important;
}
Expand All @@ -21,11 +21,12 @@ blockquote {
border-left: 1px solid #9c27b0 !important;
}

/** Progress **/
.progress div {
background-color: #8e24aa;
}

/**Time Picker**/
/** Time Picker **/
.lolliclock-header {
background: #9c27b0 !important;
}
Expand Down Expand Up @@ -104,7 +105,7 @@ blockquote {
background: #9c27b0 !important;
}

.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .modal-footer .note-link-btn:hover, .note-editor .modal .modal-footer .note-image-btn:hover {
background: #9c27b0 !important;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockquote {
background-color: #f44336;
}

/**SCROLLSPY**/
/** Scrollspy **/
.table-of-contents a.active {
border-left: 2px solid #f44336 !important;
}
Expand All @@ -21,11 +21,12 @@ blockquote {
border-left: 1px solid #f44336 !important;
}

/** Progress **/
.progress div {
background-color: #e53935;
}

/**Time Picker**/
/** Time Picker **/
.lolliclock-header {
background: #f44336 !important;
}
Expand Down Expand Up @@ -104,7 +105,7 @@ blockquote {
background: #f44336 !important;
}

.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .note-link-btn:hover, .note-editor .modal .note-image-btn:hover {
.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .note-link-btn:hover, .note-editor .modal .note-image-btn:hover {
background: #f44336 !important;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ blockquote {
background-color: #ffeb3b;
}

/**SCROLLSPY**/
/** Scrollspy **/
.table-of-contents a.active {
border-left: 2px solid #ffeb3b !important;
}
Expand All @@ -21,11 +21,12 @@ blockquote {
border-left: 1px solid #ffeb3b !important;
}

/** Progress **/
.progress div {
background-color: #fdd835;
}

/**Time Picker**/
/** Time Picker **/
.lolliclock-header {
background: #ffeb3b !important;
}
Expand Down Expand Up @@ -104,7 +105,7 @@ blockquote {
background: #ffeb3b !important;
}

.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover,.note-editor .modal .file-field .btn:hover, .note-editor .modal .note-link-btn:hover, .note-editor .modal .note-image-btn:hover {
.editorDialogs .modal .btn-large:hover, .editorDialogs .modal .btn:hover, .note-editor .modal .btn-large:hover, .note-editor .modal .btn:hover, .note-editor .modal .btn.modal-close:hover, .note-editor .modal .file-field .btn:hover, .note-editor .modal .note-link-btn:hover, .note-editor .modal .note-image-btn:hover {
background: #ffeb3b !important;
}

Expand Down

0 comments on commit e9fabf4

Please sign in to comment.