Skip to content

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
vegegoku committed Jul 17, 2023
2 parents 30cb92c + 958eb18 commit f5542d6
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 16 deletions.
2 changes: 1 addition & 1 deletion domino-ui-shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>domino-ui-parent</artifactId>
<groupId>org.dominokit</groupId>
<version>1.0.0-RC19</version>
<version>1.0.0</version>
</parent>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion domino-ui-tools/mdi-icons-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>domino-ui-tools</artifactId>
<groupId>org.dominokit</groupId>
<version>1.0.0-RC19</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion domino-ui-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>domino-ui-parent</artifactId>
<groupId>org.dominokit</groupId>
<version>1.0.0-RC19</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion domino-ui-tools/theme-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>domino-ui-tools</artifactId>
<groupId>org.dominokit</groupId>
<version>1.0.0-RC19</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion domino-ui-webjar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>domino-ui-parent</artifactId>
<groupId>org.dominokit</groupId>
<version>1.0.0-RC19</version>
<version>1.0.0</version>
</parent>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion domino-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.dominokit</groupId>
<artifactId>domino-ui-parent</artifactId>
<version>1.0.0-RC19</version>
<version>1.0.0</version>
</parent>

<artifactId>domino-ui</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.dominokit.domino.ui.grid.flex.FlexItem;
import org.dominokit.domino.ui.grid.flex.FlexJustifyContent;
import org.dominokit.domino.ui.grid.flex.FlexLayout;
import org.dominokit.domino.ui.grid.flex.FlexStyles;
import org.dominokit.domino.ui.icons.BaseIcon;
import org.dominokit.domino.ui.style.Color;
import org.dominokit.domino.ui.style.Elevation;
Expand Down Expand Up @@ -70,7 +71,11 @@ public abstract class BaseButton<B extends BaseButton<?>> extends WavesElement<H

/** creates a button with default size {@link ButtonSize#MEDIUM} */
protected BaseButton() {
textContainer = FlexItem.create().addCss("dui-btn-text").setFlexGrow(1).setOrder(20);
textContainer =
FlexItem.create()
.addCss("dui-btn-text", FlexStyles.FLEX_LAYOUT)
.setFlexGrow(1)
.setOrder(20);

iconContainer = FlexItem.create().setOrder(10);
contentLayout =
Expand Down Expand Up @@ -434,6 +439,13 @@ public B setIconPosition(IconPosition position) {
return (B) this;
}

public B setJustifyText(FlexJustifyContent justifyContent) {
if (nonNull(justifyContent)) {
textContainer.addCss(justifyContent.getStyle());
}
return (B) this;
}

private void applyCircleWaves() {
applyWaveStyle(WaveStyle.CIRCLE);
applyWaveStyle(WaveStyle.FLOAT);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public Tooltip(HTMLElement targetElement, Node content) {
};
targetElement.addEventListener(EventType.mouseenter.getName(), showToolTipListener, false);
targetElement.addEventListener(EventType.mouseleave.getName(), removeToolTipListener, false);
targetElement.addEventListener(EventType.click.getName(), removeToolTipListener, false);
targetElement.addEventListener(EventType.click.getName(), evt -> hide(), false);
init(this);

removeHandler =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -615,10 +615,10 @@ table th[class*="col-"] {
background-color: inherit;
}

.table-responsive thead,
.table-responsive thead tr,
.table-responsive tbody {
background-color: inherit;
.table-responsive thead:not([class*="bg-"]),
.table-responsive thead tr:not([class*="bg-"]),
.table-responsive tbody:not([class*="bg-"]) {
background-color: white;
}

.table-responsive.table-bordered {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,14 @@
font-weight: 600;
width: 35px;
height: 35px;
margin: auto;
line-height: 35px;
}

.date-picker tbody tr td {
text-align: center;
}

.date-picker .current-month:hover {
color: #000000;
}
Expand All @@ -111,6 +116,7 @@
color: #999999;
width: 35px;
height: 35px;
margin: auto;
line-height: 35px;
}

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.dominokit</groupId>
<artifactId>domino-ui-parent</artifactId>
<version>1.0.0-RC19</version>
<version>1.0.0</version>
<packaging>pom</packaging>

<name>domino-ui-parent</name>
Expand Down Expand Up @@ -68,7 +68,7 @@

<properties>
<snapshot.version>HEAD-SNAPSHOT</snapshot.version>
<next.release.version>1.0.0-RC19</next.release.version>
<next.release.version>1.0.0</next.release.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

Expand All @@ -85,8 +85,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<elemento.version>1.0.3</elemento.version>
<elemental2.version>1.1.0</elemental2.version>
<gwt.version>2.9.0</gwt.version>
<jackson.apt.version>1.0.0-RC3</jackson.apt.version>
<gwt.version>2.10.0</gwt.version>
<jackson.apt.version>1.0.0</jackson.apt.version>
<gwt.i18n.version>1.0</gwt.i18n.version>
</properties>

Expand Down

0 comments on commit f5542d6

Please sign in to comment.