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 2020/01/21 20:12:19 UTC
[isis] branch master updated: ISIS-2158: css fix for boolean
fields: render inline edit box same vertical pos as check box
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
The following commit(s) were added to refs/heads/master by this push:
new 44466ed ISIS-2158: css fix for boolean fields: render inline edit box same vertical pos as check box
44466ed is described below
commit 44466edc4b0f25d7a70c9c5c56e2a23b8aa59508
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 21 21:12:10 2020 +0100
ISIS-2158: css fix for boolean fields: render inline edit box same
vertical pos as check box
---
.../demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java | 7 +------
.../isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java b/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java
index a24e314..18e43a0 100644
--- a/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java
+++ b/examples/demo/src/main/java/demoapp/dom/events/DemoEventSubscriber.java
@@ -22,7 +22,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Import;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
@@ -35,7 +34,6 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import lombok.val;
import lombok.extern.log4j.Log4j2;
-import demoapp.dom.events.DemoEventSubscriber.EventLogWriter;
import demoapp.dom.events.EventsDemo.UiButtonEvent;
import static demoapp.utils.DemoUtils.emphasize;
@@ -43,9 +41,6 @@ import static demoapp.utils.DemoUtils.emphasize;
@Service
@Named("demoapp.eventSubscriber")
@Qualifier("demo")
-@Import({
- EventLogWriter.class
-})
@Log4j2
public class DemoEventSubscriber {
@@ -65,7 +60,7 @@ public class DemoEventSubscriber {
}
@DomainObject(
- nature = Nature.BEAN,
+ nature = Nature.BEAN, // <-- have this Object's lifecycle managed by Spring (EXPERIMENTAL)
objectType = "demoapp.eventLogWriter")
public static class EventLogWriter {
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 38490c3..5db8c09 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
@@ -976,7 +976,7 @@ li.select2-results__option {
.booleanPanel .form-control.scalarValueInlinePromptLink,
.referencePanel .form-control.scalarValueInlinePromptLink {
- display: inline-block;
+ display: inline-flex;
width: 85%;
}