Skip to content

Commit

Permalink
Merge pull request #4 from GwtMaterialDesign/release_1.5.2
Browse files Browse the repository at this point in the history 
Release 1.5.2
  • Loading branch information
@kevzlou7979
kevzlou7979 authored Jun 29, 2016
2 parents fce7879 + 91c0495 commit e899fbc
Show file tree
Hide file tree
Showing 12 changed files with 923 additions and 40 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>1.5.1</version>
<version>1.5.2</version>
</dependency>
```

Expand Down
19 changes: 16 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
<parent>
<artifactId>gwt-material-parent</artifactId>
<groupId>com.github.gwtmaterialdesign</groupId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>gwt-material-themes</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>

<name>Gwt Material Themes</name>

<scm>
<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>v1.5.1</tag>
<tag>v1.5.2</tag>
</scm>

<licenses>
Expand All @@ -26,6 +26,19 @@
</license>
</licenses>

<repositories>
<repository>
<id>sonatype-nexus-snapshots</id>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
Expand Down
99 changes: 93 additions & 6 deletions src/main/resources/gwt/material/design/themes/amber/css/overridecss.amber.css
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,113 @@
/** Blockquote **/
blockquote {
border-left: 5px solid #ffca28 !important;
border-left: 5px solid #ffca28 !important;
}

.multiValueSuggestBox-panel:focus {
border-bottom: 2px solid #ffca28 !important;
border-bottom: 2px solid #ffca28 !important;
}

/** Image Slider **/
.slider .indicators .indicator-item.active {
background-color: #ffc107;
background-color: #ffc107;
}

/**SCROLLSPY**/
.table-of-contents a.active {
border-left: 2px solid #ffc107 !important;
border-left: 2px solid #ffc107 !important;
}

.table-of-contents a:hover {
border-left: 1px solid #ffc107 !important;
border-left: 1px solid #ffc107 !important;
}

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

/**Time Picker**/
.lolliclock-header {
background: #ffc107 !important;
}

.lolliclock-active-button-background {
background-color: #ffc107 !important;
}

.lolliclock-button {
color: #ffc107 !important;
}

.lolliclock-canvas-bg {
fill: rgba(255, 193, 7, 0.25) !important;
}

.lolliclock-canvas-fg {
fill: #ffc107 !important;
}

.lolliclock-canvas line {
stroke: rgba(255, 193, 7, 0.5) !important;
}

.lolliclock-tick.active, .lolliclock-tick:hover {
background-color: #ffd54f !important;
}

/** File Uploader **/
.fileuploader .upload-label {
background-color: #ffc107 !important;
}

.fileuploader .upload-label i {
background: #fff !important;
color: #ffc107 !important;
}

.fileuploader.active {
background: #ffc107 !important;
}

.fileuploader.active .upload-label {
color: #fff !important;
}

.preview-container .previews .zdrop-info .preview-icon {
color: #ffc107 !important;
}

.preview-container .header {
background-color: #ffc107 !important;
}

/** Window **/
.window-overlay .window .window-toolbar {
background-color: #ffc107 !important;
}

/** Tree Item **/
.tree-item i {
color: #ffc107;
}

/** Stepper **/
.stepper .step.success > div:first-child i, .stepper .step.success .title, .stepper .step.success .description {
color: #ffc107 !important;
}

.stepper .step > div:first-child .circle {
background: #ffc107 !important;
}

/** Rich Editor **/
.editorDialogs .modal .btn, .editorDialogs .modal .btn-large, .note-editor .modal .btn, .note-editor .modal .btn-large {
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 {
background: #ffc107 !important;
}

button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.btn.disabled:hover {
background: #d8d8d7 !important;
}
99 changes: 93 additions & 6 deletions src/main/resources/gwt/material/design/themes/blue/css/overridecss.blue.css
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,113 @@
/** Blockquote **/
blockquote {
border-left: 5px solid #42A5F5 !important;
border-left: 5px solid #42A5F5 !important;
}

.multiValueSuggestBox-panel:focus {
border-bottom: 2px solid #42A5F5 !important;
border-bottom: 2px solid #42A5F5 !important;
}

/** Image Slider **/
.slider .indicators .indicator-item.active {
background-color: #2196f3;
background-color: #2196f3;
}

/**SCROLLSPY**/
.table-of-contents a.active {
border-left: 2px solid #2196f3 !important;
border-left: 2px solid #2196f3 !important;
}

.table-of-contents a:hover {
border-left: 1px solid #2196f3 !important;
border-left: 1px solid #2196f3 !important;
}

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

/**Time Picker**/
.lolliclock-header {
background: #2196f3 !important;
}

.lolliclock-active-button-background {
background-color: #2196f3 !important;
}

.lolliclock-button {
color: #2196f3 !important;
}

.lolliclock-canvas-bg {
fill: rgba(33, 150, 243, 0.25) !important;
}

.lolliclock-canvas-fg {
fill: #2196f3 !important;
}

.lolliclock-canvas line {
stroke: rgba(33, 150, 243, 0.5) !important;
}

.lolliclock-tick.active, .lolliclock-tick:hover {
background-color: #64b5f6 !important;
}

/** File Uploader **/
.fileuploader .upload-label {
background-color: #2196f3 !important;
}

.fileuploader .upload-label i {
background: #fff !important;
color: #2196f3 !important;
}

.fileuploader.active {
background: #2196f3 !important;
}

.fileuploader.active .upload-label {
color: #fff !important;
}

.preview-container .previews .zdrop-info .preview-icon {
color: #2196f3 !important;
}

.preview-container .header {
background-color: #2196f3 !important;
}

/** Window **/
.window-overlay .window .window-toolbar {
background-color: #2196f3 !important;
}

/** Tree Item **/
.tree-item i {
color: #2196f3;
}

/** Stepper **/
.stepper .step.success > div:first-child i, .stepper .step.success .title, .stepper .step.success .description {
color: #2196f3 !important;
}

.stepper .step > div:first-child .circle {
background: #2196f3 !important;
}

/** Rich Editor **/
.editorDialogs .modal .btn, .editorDialogs .modal .btn-large, .note-editor .modal .btn, .note-editor .modal .btn-large {
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 {
background: #2196f3 !important;
}

button.waves-effect.waves-light.btn.disabled, button.waves-effect.waves-light.btn.disabled:hover {
background: #d8d8d7 !important;
}
Loading

0 comments on commit e899fbc

Please sign in to comment.