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/07 04:46:32 UTC
[08/29] isis git commit: ISIS-537 Remove margin-bottom: 15px;
for .form-group
ISIS-537 Remove margin-bottom: 15px; for .form-group
https://trello.com/c/ATmCqVEy/104-too-much-vertical-space-between-fields-all-themes
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bcd1794d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bcd1794d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bcd1794d
Branch: refs/heads/ISIS-939
Commit: bcd1794d4f82f68491f710b3ac0285181c0c2884
Parents: c195fa7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Nov 5 22:36:42 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Nov 5 22:36:42 2014 +0200
----------------------------------------------------------------------
.../entity/properties/EntityPropertiesPanel.css | 10 +++-------
.../entity/properties/EntityPropertiesPanel.java | 9 +++++++++
.../viewer/wicket/ui/pages/bootstrap-overrides.css | 15 +++++++--------
3 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bcd1794d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
index 20dfa96..bd6f65a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.css
@@ -16,11 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-.entityPropertiesPanel fieldset {
- margin: 0px 0px 10px 0px;
- padding:10px 10px 0px 10px;
- border-radius: 4px;
+.entityPropertiesPanel .property {
+ padding-top: 5px;
+ padding-bottom: 5px;
}
-
-.entityPropertiesPanel fieldset legend {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/bcd1794d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java
index fe9366a..ac89613 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.java
@@ -19,9 +19,11 @@
package org.apache.isis.viewer.wicket.ui.components.entity.properties;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
/**
* {@link PanelAbstract Panel} representing the properties of an entity, as per
@@ -41,6 +43,13 @@ public class EntityPropertiesPanel extends PanelAbstract<EntityModel> {
form.toViewMode(null);
}
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ PanelUtil.renderHead(response, getClass());
+ }
+
private void buildGui() {
buildEntityPropertiesAndOrCollectionsGui();
setOutputMarkupId(true); // so can repaint via ajax
http://git-wip-us.apache.org/repos/asf/isis/blob/bcd1794d/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 5d9ef09..64934e8 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
@@ -58,12 +58,6 @@
border: none;
}
-/** added here because looks lke EntityPropertiesPanel.css is currently excluded ...? */
-.entityPropertiesPanel .property {
- padding-top: 5px;
- padding-bottom: 5px;
-}
-
.pagination {
margin: 0;
}
@@ -82,7 +76,12 @@ th > a > div > strong {
float: left;
}
-/* Labels on the left START */
+/* Labels on the left/top/none START */
+
+.form-group {
+ margin-bottom: 0;
+}
+
div.label-left.form-group {
width: 100%;
}
@@ -139,4 +138,4 @@ div.label-left .choicesPlaceholder {
vertical-align: -webkit-baseline-middle;
vertical-align: middle;
}
-/* Labels on the right END */
+/* Labels on the left/top/none END */