You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/11/04 01:34:06 UTC
[08/27] git commit: ISIS-537 Fix the alignments for .label-none
ISIS-537 Fix the alignments for .label-none
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4fbe4447
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4fbe4447
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4fbe4447
Branch: refs/heads/master
Commit: 4fbe44479d1acd77894cf469f69882119ccbc620
Parents: 8470d51
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 31 11:43:09 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 31 11:43:09 2014 +0200
----------------------------------------------------------------------
.../wicket/ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4fbe4447/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 9f1e4b5..78afa72 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -354,7 +354,7 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
formGroup.add(new CssClassAppender("label-left"));
break;
case NONE:
- scalarName.setVisible(false);
+ formGroup.add(new CssClassAppender("label-none"));
break;
case TOP:
formGroup.add(new CssClassAppender("label-top"));
http://git-wip-us.apache.org/repos/asf/isis/blob/4fbe4447/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index 029024e..a84916c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -99,12 +99,18 @@ div.label-top label.control-label {
padding-left: 10px;
}
+div.label-none label.control-label {
+ padding-left: 10px;
+ visibility: hidden;
+}
+
div.label-left .scalarValueWrapper {
width: 70%;
float: right;
}
-div.label-top .scalarValueWrapper {
+div.label-top .scalarValueWrapper,
+div.label-none .scalarValueWrapper {
width: 99%;
display: block;
padding-left: 8px;