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/02/21 17:53:53 UTC
[2/2] git commit: ISIS-695: CSS fixes
ISIS-695: CSS fixes
- align icons in tables
- align toggle box (IE9 fix)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b4ee8405
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b4ee8405
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b4ee8405
Branch: refs/heads/master
Commit: b4ee8405fed570b686efcf35f359f68ed3146fa7
Parents: 29657d4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Feb 21 16:53:29 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Feb 21 16:53:29 2014 +0000
----------------------------------------------------------------------
.../ajaxtable/CollectionContentsAsAjaxTablePanel.css | 1 -
.../components/widgets/checkbox/ContainedToggleboxPanel.html | 2 +-
.../org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css | 8 ++++++++
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b4ee8405/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
index 5d67e80..37acdbe 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
@@ -171,7 +171,6 @@
}
.collectionContentsAsAjaxTablePanel table.contents .entityLinkSelect2Panel .entityImage {
- vertical-align:text-bottom;
padding-right:6px;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b4ee8405/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html
index 5e95e66..3491ab6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.html
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<span wicket:id="container" class="containedToggleboxPanel">
- <form wicket:id="form">
+ <form wicket:id="form" class="containedToggleboxPanelForm">
<input type="checkbox" wicket:id="togglebox" />
</form>
</span>
http://git-wip-us.apache.org/repos/asf/isis/blob/b4ee8405/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
index ad09e87..8d0cf78 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
@@ -969,3 +969,11 @@ zero clipboard
background-repeat: no-repeat;
cursor: pointer;
}
+
+
+/**
+for some reason the containedToggleboxPanel.css is not being picked up...
+*/
+.containedToggleboxPanel .containedToggleboxPanelForm {
+ display: inline;
+}
\ No newline at end of file