Skip to content

Commit

Permalink
Fix float classes (#999)
Browse files Browse the repository at this point in the history
* Update BootstrapNavigationToolbar.html - fix float classes

https://getbootstrap.com/docs/5.1/utilities/float/

pull-left -> float-start
pull-right -> float-end

* Replace float classes: pull-left -> float-start, pull-left -> float-end

(cherry picked from commit 9530283)
  • Loading branch information
vrozkovec authored and martin-g committed Aug 16, 2023
1 parent af641ab commit bb95d5c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public class AlignmentBehavior extends BootstrapBaseBehavior {
* TODO miha: add documentation.
*/
public enum Alignment implements ICssClassNameProvider {
RIGHT("pull-right"),
LEFT("pull-left"),
RIGHT("float-end"),
LEFT("float-start"),
NONE("");
private String className;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void onComponentTag(Component component, ComponentTag tag) {
* @return this component's instance
*/
public final QuoteBehavior pullRight() {
pullRight.setObject("pull-right");
pullRight.setObject("float-end");

return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ void nullClassNameThrowsException() {
@Test
void removeClass() {
ComponentTag tag = new ComponentTag("span", XmlTag.TagType.OPEN_CLOSE);
tag.put("class", "class1 pull-right class2");
tag.put("class", "class1 float-end class2");

Attributes.removeClass(tag, "pull-right");
Attributes.removeClass(tag, "float-end");

assertThat(tag.getAttribute("class"), is(equalTo("class1 class2")));
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<wicket:border xmlns:wicket="http://wicket.apache.org">
<a href="#" wicket:id="orderByLink" style="text-decoration: none;">
<wicket:body />
<span class="pull-right" wicket:enclosure>&nbsp;<span wicket:id="iconSort"></span></span>
<span class="float-end" wicket:enclosure>&nbsp;<span wicket:id="iconSort"></span></span>
</a>
</wicket:border>
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<wicket:panel xmlns:wicket="http://wicket.apache.org">
<tr class="navigation">
<td wicket:id="span">
<div class="pull-left"><wicket:container wicket:id="navigatorLabelPanel">[navigator-label]</wicket:container></div>
<div class="pull-right"><ul wicket:id="navigator">[navigator]</ul></div>
<div class="float-start"><wicket:container wicket:id="navigatorLabelPanel">[navigator-label]</wicket:container></div>
<div class="float-end"><ul wicket:id="navigator">[navigator]</ul></div>
</td>
</tr>
</wicket:panel>
</wicket:panel>

0 comments on commit bb95d5c

Please sign in to comment.