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 2022/08/27 10:10:22 UTC

[isis] branch master updated (4dbb4adfb6 -> 136788924e)

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


    from 4dbb4adfb6 ISIS-3180: refactors programmatic badge rendering into common utility
     new 65c99bccb6 ISIS-3180: fixes prev. commit
     new 136788924e ISIS-3180: render badges just slightly larger 0.85em -> 0.90em

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/isis/commons/internal/html/_BootstrapBadge.java    | 11 ++++++++++-
 .../pages/common/bootstrap/css/bootstrap-overrides-all-v2.css |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)


[isis] 01/02: ISIS-3180: fixes prev. commit

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 65c99bccb6726eaeb539822f6236d44cf3899013
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Aug 27 11:47:25 2022 +0200

    ISIS-3180: fixes prev. commit
---
 .../apache/isis/commons/internal/html/_BootstrapBadge.java    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/commons/src/main/java/org/apache/isis/commons/internal/html/_BootstrapBadge.java b/commons/src/main/java/org/apache/isis/commons/internal/html/_BootstrapBadge.java
index 58842db771..ec089d59a0 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/html/_BootstrapBadge.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/html/_BootstrapBadge.java
@@ -19,6 +19,7 @@
 package org.apache.isis.commons.internal.html;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.isis.commons.internal.base._NullSafe;
@@ -52,7 +53,7 @@ public class _BootstrapBadge {
         sb
         .append("<span ")
         .append("class=\"")
-        .append(Stream.concat(Stream.of("badge", "bg-light"), _NullSafe.stream(cssClasses)))
+        .append(classesLiteral())
         .append("\"");
 
         // optional tooltip
@@ -77,4 +78,12 @@ public class _BootstrapBadge {
         .append("</span>");
         return sb.toString();
     }
+
+    // -- HELPER
+
+    private String classesLiteral() {
+        return Stream.concat(Stream.of("badge", "bg-light"), _NullSafe.stream(cssClasses))
+                .collect(Collectors.joining(" "));
+    }
+
 }
\ No newline at end of file


[isis] 02/02: ISIS-3180: render badges just slightly larger 0.85em -> 0.90em

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 136788924e6d1150440bfd71751753249b1892a8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Aug 27 12:10:17 2022 +0200

    ISIS-3180: render badges just slightly larger 0.85em -> 0.90em
    
    - badges have different font or font-style based on theme (so 1em is
    just ugly)
---
 .../ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
index c8b3083c4f..24856258cc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
@@ -55,9 +55,10 @@ body {
 /* font-size fix for badges inside tables and form-controls */
 td .badge,
 .form-control-sm .badge {
- font-size:.85em
+	font-size:.90em
 }
 
+
 .card {
 	margin-bottom: 21px;
 }