You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2024/02/08 09:16:37 UTC

(causeway) 01/02: CAUSEWAY-3686: fine-tuning veto icon rendering (CSS)

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/causeway.git

commit 442167cd3915a61ad69e814589b956ab8bd2e824
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Feb 8 09:53:03 2024 +0100

    CAUSEWAY-3686: fine-tuning veto icon rendering (CSS)
---
 .../ui/components/scalars/ScalarPanelAbstract2.java       | 10 ++++------
 .../common/bootstrap/css/bootstrap-overrides-all-v2.css   | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index 51db2dd072..06c3762df3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -26,7 +26,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.repeater.RepeatingView;
-
 import org.springframework.lang.Nullable;
 
 import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral;
@@ -42,13 +41,12 @@ import org.apache.causeway.viewer.wicket.ui.panels.FormExecutorDefault;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;
 import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
 
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.val;
 
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
-
 /**
  *  Adds inline prompt logic.
  */
@@ -256,11 +254,11 @@ extends ScalarPanelAbstract {
                     //XXX Future extension
                     break;
                 case DISABLED_REASON:
-                    addDisabledReasonIcon(buttonContainer, "fa-solid fa-ban", "");
+                    addDisabledReasonIcon(buttonContainer, "fa-solid fa-ban veto-reason-icon", "");
                     break;
                 case DISABLED_REASON_PROTOTYPING:
-                    addDisabledReasonIcon(buttonContainer, "fa-solid fa-text-slash icon-prototyping",
-                            " Note: This icon only appears in prototyping mode.");
+                    addDisabledReasonIcon(buttonContainer, "fa-solid fa-text-slash veto-reason-icon prototyping",
+                            " Note: This icon only appears in prototyping mode (unless disabled via config option).");
                     break;
                 case CLEAR_FIELD:
                     addClearFieldButton(buttonContainer);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
index bc5141745b..696c6e3310 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
@@ -605,8 +605,19 @@ div.additionalLinkList {
 
 }
 
-.icon-prototyping {
-    color: silver;
+/* veto reason fa-icon rendering */
+
+.veto-reason-icon {
+    color: rgba(127, 127, 127, 0.5);
+}
+.btn:hover > .veto-reason-icon {
+    color: rgba(127, 127, 127, 1);
+}
+.veto-reason-icon .prototyping {
+    color: rgba(127, 127, 255, 0.5);
+}
+.btn:hover > .veto-reason-icon .prototyping {
+    color: rgba(127, 127, 255, 1);
 }
 
 /* dropdown-menu: distinguished rendering for disabled menu-items