ISIS-537: CSS positioning of additional links in panel-headings for properties, entity collections and standalone collections.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/53f364c1 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/53f364c1 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/53f364c1 Branch: refs/heads/master Commit: 53f364c14ace508b245924d1d938e3cbd28b4f52 Parents: db57699 Author: Dan Haywood <[email protected]> Authored: Wed Nov 26 16:31:43 2014 +0000 Committer: Dan Haywood <[email protected]> Committed: Wed Nov 26 16:31:43 2014 +0000 ---------------------------------------------------------------------- .../components/additionallinks/AdditionalLinksPanel.css | 2 ++ .../ui/components/widgets/cssmenu/CssMenuPanel.css | 10 ++++++++++ .../isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 12 ++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/53f364c1/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css index 1a4447d..accd5ac 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.css @@ -33,6 +33,8 @@ div.additionalLinkList { padding-bottom: 10px; } +.standaloneCollectionPanel div.additionalLinkList, +.standaloneCollectionPanel ul.additionalLinkList, .entityCollectionsPanel div.additionalLinkList, .entityCollectionsPanel ul.additionalLinkList { padding-bottom: 0px; http://git-wip-us.apache.org/repos/asf/isis/blob/53f364c1/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css index 9fc82f4..87bbf2b 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css @@ -227,8 +227,18 @@ list-style:none; } +.entityCollectionsPanel .panel-heading .additionalLinkList { + margin-right: 10px; +} + .additionalLinkList li { float:left; margin-right:10px; /* margin-bottom: 2px;*/ } +.entityPropertiesPanel .additionalLinkList li { + margin-right:0px; +} +.entityPropertiesPanel .properties .panel-heading .additionalLinkList { + margin-right: -5px; +} http://git-wip-us.apache.org/repos/asf/isis/blob/53f364c1/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 a902a0a..533d34c 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 @@ -181,13 +181,14 @@ div.label-left .choicesPlaceholder { resize: none; } -.entityCollectionsPanel .panel-heading, -.standaloneCollectionPanel .panel-heading { - padding-bottom: 15px; -} .standaloneCollectionPanel .additionalLinkList { margin-left: 50px; + margin-bottom: 0px; + margin-top: -4px; +} +.standaloneCollectionPanel .selectorDropdown { + margin-top: -4px; } .referencePanel .entityLinkSelect2Panel .entityImage { @@ -206,6 +207,9 @@ div.label-left .choicesPlaceholder { .entityCollectionsPanel .panel-heading { padding-bottom: 10px; } +.standaloneCollectionPanel .panel-heading { + padding-bottom: 5px; /* different from entityCollectionsPanel because of display-inline ? of additionalLinks */ +} #body { padding-top: 20px;
