You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/18 14:09:49 UTC
[isis] 03/11: Adjusting card bottom margin, adding new sizes
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2617_wicketstuff.bs4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit aa5bd348a22547b83d614760ac4ad2fb659a8546
Author: mwhesse <mw...@gmail.com>
AuthorDate: Sat Apr 17 18:39:19 2021 +0700
Adjusting card bottom margin, adding new sizes
---
.../layout/grid/bootstrap3/BS3ClearFixHidden.java | 2 +-
.../layout/grid/bootstrap3/BS3ClearFixVisible.java | 5 ++--
.../isis/applib/layout/grid/bootstrap3/Size.java | 31 ++++++++++++++++------
.../applib/layout/grid/bootstrap3/SizeSpan.java | 11 ++++----
.../wicket/ui/pages/bootstrap-overrides-all-v2.css | 6 ++++-
5 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java
index b227be6..e64d81f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java
@@ -44,7 +44,7 @@ public class BS3ClearFixHidden extends BS3ClearFix {
@Override
public String toCssClass() {
return "clearfix "
- + "hidden-" + getSize().toCssClassFragment() +
+ + getSize().toCssDNoneClassFragment() +
(getCssClass() != null? " " + getCssClass(): "");
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java
index 22d661c..9de23c0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java
@@ -68,8 +68,9 @@ public class BS3ClearFixVisible extends BS3ClearFix {
@Override
public String toCssClass() {
return "clearfix "
- + "visible-" + getSize().toCssClassFragment() + "-" + getCssDisplay().toCssClassFragment() +
- (getCssClass() != null? " " + getCssClass(): "");
+ + getSize().toCssDBlockClassFragment()
+ // + "-" + getCssDisplay().toCssClassFragment()
+ + (getCssClass() != null? " " + getCssClass(): "");
}
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java
index fbecbaa..1459376 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java
@@ -19,18 +19,33 @@
package org.apache.isis.applib.layout.grid.bootstrap3;
/**
- * As per <a href="http://getbootstrap.com/css/#grid-options">grid options</a>, also used in
- * <a href="http://getbootstrap.com/css/#responsive-utilities">responsive utility</a> classes.
+ * As per <a href="https://getbootstrap.com/docs/5.0/layout/grid/#grid-options">grid options</a>
*
* @since 1.x {@index}
*/
public enum Size {
- XS,
- SM,
- MD,
- LG;
+ XS(""),
+ SM("sm-"),
+ MD("md-"),
+ LG("lg-"),
+ XL("xl-"),
+ XXL("xxl-");
+
+ final String bsPrefix;
+ private Size(String bsPrefix) {
+ this.bsPrefix = bsPrefix;
+ }
- public String toCssClassFragment() {
- return name().toLowerCase();
+ public String toCssSpanClassFragment(int span) {
+ return String.format("%s%d", bsPrefix, span);
}
+
+ public String toCssDNoneClassFragment() {
+ return String.format("d-%snone", bsPrefix);
+ }
+
+ public String toCssDBlockClassFragment() {
+ return String.format("d-%sblock", bsPrefix);
+ }
+
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java
index 51098a0..1f63c72 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java
@@ -96,12 +96,11 @@ public class SizeSpan implements Serializable {
if(buf.length() > 0) {
buf.append(" ");
}
- buf
- // .append("col-")
- // .append(size.toCssClassFragment())
- // .append("-")
- .append(offset != null && offset ? "offset-": "")
- .append(span);
+ if(Boolean.TRUE.equals(offset)) {
+ buf.append("offset-").append(span);
+ } else {
+ buf.append("col-").append(size.toCssSpanClassFragment(span));
+ }
return buf;
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
index f2bd251..c5b9dd6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
@@ -43,7 +43,11 @@ header.navbar-fixed-top {
left: initial;
}
-.card-default .card-header {
+.card {
+ margin-bottom: 21px;
+}
+
+.card .card-header {
padding: 3px 15px;
display: flex;
align-items: center;