Skip to content

Commit acec96b

Browse files
committed
TagLabel support dark mode.
1 parent 3e0c695 commit acec96b

File tree

9 files changed

+77
-5
lines changed

9 files changed

+77
-5
lines changed

src/main/java/gwt/material/design/incubator/client/dark/IncubatorDarkThemeLoader.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@
2222
import gwt.material.design.client.theme.dark.DarkThemeLoader;
2323
import gwt.material.design.incubator.client.placeholder.PlaceholderDarkTheme;
2424
import gwt.material.design.incubator.client.progress.ProgressLineBarDarkTheme;
25+
import gwt.material.design.incubator.client.tag.TagLabelDarkTheme;
2526
import gwt.material.design.incubator.client.toggle.GroupToggleDarkTheme;
2627

2728
public class IncubatorDarkThemeLoader extends DarkThemeLoader {
2829

2930
public IncubatorDarkThemeLoader() {
3031
super(new GroupToggleDarkTheme(),
3132
new PlaceholderDarkTheme(),
32-
new ProgressLineBarDarkTheme());
33+
new ProgressLineBarDarkTheme(),
34+
new TagLabelDarkTheme());
3335
}
3436
}

src/main/java/gwt/material/design/incubator/client/tag/TagClientBundle.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,7 @@ public interface TagClientBundle extends ClientBundle {
2828

2929
@Source("resources/css/tag.min.css")
3030
TextResource tagCss();
31+
32+
@Source("resources/css/tag-dark.min.css")
33+
TextResource tagDarkCss();
3134
}

src/main/java/gwt/material/design/incubator/client/tag/TagDebugClientBundle.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,7 @@ public interface TagDebugClientBundle extends ClientBundle {
2828

2929
@Source("resources/css/tag.css")
3030
TextResource tagDebugCss();
31+
32+
@Source("resources/css/tag-dark.css")
33+
TextResource tagDarkCss();
3134
}

src/main/java/gwt/material/design/incubator/client/tag/TagLabel.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import gwt.material.design.client.constants.Size;
2626
import gwt.material.design.client.ui.MaterialLabel;
2727
import gwt.material.design.incubator.client.AddinsIncubator;
28+
import gwt.material.design.incubator.client.dark.IncubatorDarkThemeReloader;
2829

2930
public class TagLabel extends MaterialLabel implements HasSize {
3031

@@ -46,6 +47,13 @@ public TagLabel() {
4647
setPosition(TagPosition.LEFT);
4748
}
4849

50+
@Override
51+
protected void onLoad() {
52+
super.onLoad();
53+
54+
IncubatorDarkThemeReloader.get().reload(TagLabelDarkTheme.class);
55+
}
56+
4957
@Override
5058
public void setSize(Size size) {
5159
getSizeMixin().setStyle(size.getCssName());
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package gwt.material.design.incubator.client.tag;
2+
3+
import gwt.material.design.addins.client.dark.AddinsWidgetDarkTheme;
4+
import gwt.material.design.incubator.client.AddinsIncubator;
5+
import gwt.material.design.incubator.client.progress.ProgressLineBarClientBundle;
6+
import gwt.material.design.incubator.client.progress.ProgressLineBarDebugClientBundle;
7+
8+
public class TagLabelDarkTheme extends AddinsWidgetDarkTheme {
9+
10+
public TagLabelDarkTheme() {
11+
super(AddinsIncubator.isDebug() ? TagDebugClientBundle.INSTANCE.tagDarkCss() : TagClientBundle.INSTANCE.tagDarkCss());
12+
}
13+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.tag-label {
2+
background: #2f2f2f;
3+
color: #ffffff;
4+
}
5+
6+
.tag-label.arrow-left:before {
7+
border-color: transparent #2f2f2f transparent
8+
}
9+
10+
.tag-label.arrow-right:after {
11+
border-color: transparent transparent transparent #2f2f2f !important;
12+
}

src/main/resources/gwt/material/design/incubator/client/tag/resources/css/tag-dark.min.css

Whitespace-only changes.

src/main/resources/gwt/material/design/incubator/client/tag/resources/css/tag.css

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,20 @@
9494

9595
.tag-label.arrow-left.medium:before {
9696
border-width: 16px 16px 16px 0;
97-
left: -15px;
97+
left: -16px;
98+
}
99+
100+
.tag-label.arrow-left.medium:after {
101+
top: 12px;
102+
width: 6px;
103+
height: 6px;
104+
border-radius: 3px;
98105
}
99106

100107
/** Right - Medium **/
101108
.tag-label.arrow-right.medium:after {
102109
border-width: 16px 0px 16px 16px !important;
103-
right: -15px;
110+
right: -16px;
104111
}
105112

106113
.tag-label.arrow-right.medium:before {
@@ -111,8 +118,32 @@
111118
}
112119

113120
/** Left - Large **/
114-
115121
.tag-label.large {
116122
height: 40px;
117123
line-height: 40px;
124+
}
125+
126+
.tag-label.arrow-left.large:before {
127+
border-width: 20px 20px 20px 0;
128+
left: -20px;
129+
}
130+
131+
.tag-label.arrow-left.large:after {
132+
top: 16px;
133+
width: 6px;
134+
height: 6px;
135+
border-radius: 3px;
136+
}
137+
138+
/** Right Large **/
139+
.tag-label.arrow-right.large:after {
140+
border-width: 20px 0px 20px 20px !important;
141+
right: -20px;
142+
}
143+
144+
.tag-label.arrow-right.large:before {
145+
top: 16px;
146+
width: 6px;
147+
height: 6px;
148+
border-radius: 3px;
118149
}

src/main/resources/gwt/material/design/incubator/client/tag/resources/css/tag.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)