Skip to content

Commit

Permalink
Merge pull request #34 from GwtMaterialDesign/release_2.4.0
Browse files Browse the repository at this point in the history
Release 2.4.0
  • Loading branch information
kevzlou7979 authored Jul 24, 2020
2 parents abaa565 + d1c2aa8 commit c1e2eb4
Show file tree
Hide file tree
Showing 36 changed files with 1,073 additions and 345 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ cache:
- $HOME/.m2
before_install:
# install the gwt-material-jquery library before we build the demo
- git clone -b release_2.3 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
- git clone -b release_2.4.0 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
- cd gwt-material-jquery
- mvn install -DskipTests=true -DdryRun=true
- cd ..
# install the gwt-material library before we build the demo
- git clone -b release_2.3 https://github.com/GwtMaterialDesign/gwt-material.git
- git clone -b release_2.4.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 .utility/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
set -ev
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.3" ]; then
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.0" ]; then
echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
mvn deploy --settings ~/settings.xml
fi
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.3.0</version>
<version>2.4.0-rc1</version>
</dependency>
```

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

<artifactId>gwt-material-themes</artifactId>
<packaging>gwt-lib</packaging>
<version>2.3.0</version>
<version>2.4.0-rc1</version>

<name>Gwt Material Themes</name>
<description>Themes for gwt-material</description>
Expand All @@ -27,7 +27,7 @@
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-themes.git</connection>
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-themes.git</developerConnection>
<url>http://github.com/GwtMaterialDesign/gwt-material-themes</url>
<tag>v2.3.0</tag>
<tag>v2.4.0-rc1</tag>

</scm>

Expand Down Expand Up @@ -290,6 +290,19 @@
<generateSourceMap>false</generateSourceMap>
</configuration>
</execution>
<!-- Custom Theme -->
<execution>
<id>custom-theme</id>
<phase>package</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<inputPath>${sass.source}/custom</inputPath>
<outputPath>${sass.target}/custom/css</outputPath>
<generateSourceMap>false</generateSourceMap>
</configuration>
</execution>
</executions>
</plugin>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8550,6 +8550,10 @@ body {
width: 100%;
height: 100%; }

/** RLT Languages **/
body[dir="rtl"] .row .col {
float: right; }

a:hover,
a:visited {
color: none !important;
Expand All @@ -8574,30 +8578,42 @@ nav ul li a {
/**
* Async Switch and CheckBox
*/
.async.gwt-CheckBox,
.async.checkbox,
.async.switch {
position: relative;
display: inline-block !important; }

.async.gwt-CheckBox .loader-wrapper,
.async.switch .loader-wrapper {
.checkbox .loader-wrapper,
.switch .loader-wrapper {
position: absolute;
background: transparent; }
background: transparent !important;
width: 100px; }

.async.gwt-CheckBox .preloader-wrapper.active,
.async.switch .preloader-wrapper.active {
.checkbox .preloader-wrapper.active,
.switch .preloader-wrapper.active {
margin: auto;
width: 28px;
height: 28px; }
height: 28px;
margin-top: -2px !important; }

.async.gwt-CheckBox .preloader-wrapper.active {
.checkbox .preloader-wrapper.active {
position: absolute;
left: -4px;
top: -2px; }
top: -2px;
margin-top: -4px !important; }

.async.gwt-CheckBox.loading label:before, .async.gwt-CheckBox.loading label:after {
.checkbox.loading label:before, .checkbox.loading label:after {
visibility: hidden; }

.checkbox .loader-wrapper {
width: 32px;
height: 32px;
margin-left: 5px; }

.checkbox.loading [type="checkbox"].filled-in + label:before,
.checkbox.loading [type="checkbox"].filled-in + label:after {
display: none; }

/**
* Async Button
*/
Expand Down Expand Up @@ -8805,6 +8821,9 @@ button.btn-ghost:hover, button.btn-ghost:active {
/**
* InputField - Outlined
**/
.input-field input:read-only {
pointer-events: none; }

.input-field label {
left: 0 !important; }

Expand Down Expand Up @@ -9064,6 +9083,9 @@ input:-webkit-autofill {
/**
* ListBox
**/
.input-field.listbox-wrapper input:read-only {
pointer-events: initial; }

.input-field .select-wrapper.gwt-ListBox + label.active {
-webkit-transform: translateY(0);
-moz-transform: translateY(0);
Expand Down Expand Up @@ -9250,8 +9272,12 @@ input[type=range]::-ms-fill-lower {
.range-field {
padding-top: 12px; }

.no-thumb .range-field .thumb {
display: none; }

input[type=range] {
border: none;
color: transparent;
margin: 0px !important; }

input[type=range]::-webkit-slider-thumb {
Expand Down Expand Up @@ -9310,8 +9336,7 @@ input[type=range]::-ms-track {
height: 32px;
position: absolute;
background: transparent;
border: transparent;
opacity: 0; }
border: transparent; }

input[type=range]::-ms-fill-lower,
input[type=range]::-ms-fill-upper {
Expand All @@ -9321,7 +9346,13 @@ input[type=range]::-ms-fill-upper {

input[type=range]::-ms-thumb {
transform: translateY(18px);
margin-bottom: 20px; }
margin-bottom: 22px; }

input[type=range]:hover::-ms-thumb,
input[type=range]:focus::-ms-thumb {
-webkit-box-shadow: none !important;
-moz-box-shadow: none !important;
box-shadow: none !important; }

/**
* Chips
Expand Down Expand Up @@ -9383,6 +9414,15 @@ input[type=range]::-ms-thumb {
width: 30px;
height: 30px; }

/** Toggleable Chip **/
.chip-container .chip {
cursor: pointer; }

.chip.active {
color: #ffd54f;
background-color: rgba(255, 213, 79, 0.25);
font-weight: bold; }

/**
* Collapsible
**/
Expand Down Expand Up @@ -9437,6 +9477,9 @@ table .gwt-CheckBox label {
.table-container .top-panel {
background: #ffca28; }

.tabs .tab a {
color: #cbe2f5; }

/**
* Date Picker - Landscape
**/
Expand Down Expand Up @@ -9510,6 +9553,9 @@ table .gwt-CheckBox label {
border-bottom: 1px solid #ffca28;
box-shadow: 0 1px 0 0 #ffca28; }

.input-field input.picker__input:read-only {
pointer-events: initial; }

/**
* Dropdown
**/
Expand Down Expand Up @@ -10136,10 +10182,6 @@ i[class*="waves-"].material-icons {
left: 60px;
transform: translateX(0); }
/** Search Bar **/
.input-field input[type=search] {
width: calc(100% - 10rem) !important;
margin-bottom: 0 !important;
padding-left: 0px !important; }
.input-field input[type=search] + label {
z-index: 998 !important; }
.search-result {
Expand Down

Large diffs are not rendered by default.

Loading

0 comments on commit c1e2eb4

Please sign in to comment.