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/10/21 22:13:19 UTC
git commit: ISIS-537: using h4 for title/icon rather than panel;
flowing actions after title.
Repository: isis
Updated Branches:
refs/heads/master b49759b31 -> 436b896fa
ISIS-537: using h4 for title/icon rather than panel; flowing actions after title.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/436b896f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/436b896f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/436b896f
Branch: refs/heads/master
Commit: 436b896fa166b60812a3672ad8597b9bc9e05fa5
Parents: b49759b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Oct 21 21:13:08 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Oct 21 21:13:08 2014 +0100
----------------------------------------------------------------------
.../ui/components/entity/header/EntityHeaderPanel.css | 13 +++++++------
.../ui/components/entity/header/EntityHeaderPanel.html | 12 ++++++------
.../entity/icontitle/EntityIconAndTitlePanel.html | 4 ++--
.../ui/components/widgets/cssmenu/CssMenuPanel.css | 2 +-
.../viewer/wicket/ui/pages/bootstrap-overrides.css | 4 +++-
5 files changed, 19 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/436b896f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
index 1209035..7785ccf 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
@@ -28,18 +28,16 @@ div.entityHeaderPanel .iconAndTitle{
width: 100%;
}
-div.entityHeaderPanel .entityActions {
- margin-top: -1px;
- margin-bottom: -10px;
- float: left;
- padding:0 0;
+div.entityHeaderPanel .entityActions .cssMenuPanel .cssMenuItems:first-child {
+ float: left;
+ margin-top: 3px;
+ margin-left: 20px;
}
.entityHeaderPanel .entityImage {
width: 32px;
height: 32px;
vertical-align:text-bottom;
- padding-right:5px;
}
.entityHeaderPanel .entityTitle {
@@ -49,3 +47,6 @@ div.entityHeaderPanel .entityActions {
}
+div.entityHeaderPanel .iconAndTitleLabel {
+ float: left;
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/436b896f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
index 2ed59dc..6304813 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
@@ -20,12 +20,12 @@
<html xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:panel>
- <div class="entityHeaderPanel panel">
- <div class="iconAndTitle panel-heading">
- <div wicket:id="entityIconAndTitle" class="panel-title">[icon and title]</div>
- </div>
- <span class="entityActions" wicket:id="entityActions"></span>
- <div class="clearfix"></div>
+ <div class="entityHeaderPanel">
+ <h4 class="iconAndTitle">
+ <div wicket:id="entityIconAndTitle" class="iconAndTitleLabel">[icon and title]</div>
+ <span class="entityActions" wicket:id="entityActions"></span>
+ <div class="clearfix"></div>
+ </h4>
</div>
</wicket:panel>
</body>
http://git-wip-us.apache.org/repos/asf/isis/blob/436b896f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
index 66ce03d..97e81f9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
@@ -20,13 +20,13 @@
<html xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:panel>
- <div wicket:id="entityLinkWrapper" class="entityIconAndTitlePanel entityIconAndTitleComponentType">
+ <span wicket:id="entityLinkWrapper" class="entityIconAndTitlePanel entityIconAndTitleComponentType">
<a href="#" wicket:id="entityLink" class="entityUrlSource">
<img wicket:id="entityImage" class="entityImage"/>
<span wicket:id="entityTitle" class="entityTitle">[title]</span>
</a>
<wicket:child/>
- </div>
+ </span>
</wicket:panel>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/436b896f/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 2406036..b1508c5 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
@@ -268,7 +268,7 @@
}
.additionalLinkList {
- float:right;
+ float:left;
margin:0;
padding:0;
list-style:none;
http://git-wip-us.apache.org/repos/asf/isis/blob/436b896f/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 437ad19..c4fab95 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
@@ -73,7 +73,9 @@
margin: 0;
}
-body { padding-top: 161px; }
+body {
+ padding-top: 80px;
+}
label {
font-weight: normal;