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/20 16:36:32 UTC
isis git commit: ISIS-537: CSS and related fixes:
Repository: isis
Updated Branches:
refs/heads/master 07b423587 -> a14951eea
ISIS-537: CSS and related fixes:
- top-level actions (both enabled and disabled)
- margins around panels for properties and collections
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a14951ee
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a14951ee
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a14951ee
Branch: refs/heads/master
Commit: a14951eeaafd3201b92f835e1b3059c770a994ff
Parents: 07b4235
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Nov 20 16:32:11 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Nov 20 16:32:11 2014 +0100
----------------------------------------------------------------------
.../additionallinks/AdditionalLinksPanel.css | 6 +++-
.../collections/EntityCollectionsPanel.css | 3 +-
.../collections/EntityCollectionsPanel.html | 2 +-
.../entity/header/EntityHeaderPanel.css | 1 +
.../icontitle/EntityIconAndTitlePanel.css | 1 +
.../entity/properties/EntityPropertiesPanel.css | 3 +-
.../components/widgets/cssmenu/CssMenuItem.java | 13 ++++++---
.../components/widgets/cssmenu/CssMenuPanel.css | 2 +-
.../widgets/cssmenu/CssSubMenuItemsPanel.html | 2 +-
.../viewer/wicket/ui/pages/PageAbstract.html | 2 ++
.../wicket/ui/pages/bootstrap-overrides.css | 29 +++++++++++++++++++-
11 files changed, 53 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a14951ee/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 fd9ad27..c6f721d 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
@@ -21,10 +21,14 @@ span .fa {
padding-right: 2px;
}
-
.additionalLinkList {
float:left;
margin:0;
padding:0;
list-style:none;
}
+
+ul.additionalLinkList {
+ padding-bottom: 10px;
+}
+
http://git-wip-us.apache.org/repos/asf/isis/blob/a14951ee/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css
index 4c681ea..4fd45a3 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css
@@ -26,10 +26,11 @@
.entityCollectionsPanel fieldset legend {
position:absolute;
left:10px;
- top:10px;
+ top:12px;
}
.entityCollectionsPanel .actions {
float: right;
height: 0px;
}
+
http://git-wip-us.apache.org/repos/asf/isis/blob/a14951ee/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
index 9d0ac51..2d39517 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
@@ -26,7 +26,7 @@
<div class="panel-heading">
<span wicket:id="collectionName" class="panel-title">[collection name]</span>
- <div class="pull-right">
+ <div class="additionalLinksAndSelectorDropDown pull-right">
<div class="btn-group">
<div wicket:id="additionalLinks"></div>
http://git-wip-us.apache.org/repos/asf/isis/blob/a14951ee/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 2cdb440..76b9496 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
@@ -25,6 +25,7 @@
div.entityHeaderPanel .iconAndTitle{
float: left;
padding:0;
+ padding-bottom: 5px;
width: 100%;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a14951ee/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.css
index aff2cf5..3e9b367 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.css
@@ -34,3 +34,4 @@
.entityIconAndTitlePanel a.zclip-copy.active {
/* not required */
}
+
http://git-wip-us.apache.org/repos/asf/isis/blob/a14951ee/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 b46a621..66ea3e5 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
@@ -17,5 +17,6 @@
* under the License.
*/
.entityPropertiesPanel .property {
- padding-bottom: 7px;
+ padding-bottom: 0px;
+ margin-left: -3px; /* adjusting for leading pixels in front of label, to get 15px overall */
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a14951ee/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
index 05b0184..12ea621 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
@@ -422,7 +422,8 @@ public class CssMenuItem implements Serializable {
final AbstractLink link = getLink();
final Label label = new Label(CssMenuItem.ID_MENU_LABEL, Model.of(this.getName()));
- if (this.isEnabled() && link != null) {
+ if (link != null) {
+
// show link...
markupContainer.add(link);
link.add(label);
@@ -435,9 +436,6 @@ public class CssMenuItem implements Serializable {
}
if(this.prototype) {
link.add(new CssClassAppender("prototype"));
- link.add(new CssClassAppender("btn-default"));
- } else {
- link.add(new CssClassAppender("btn-default"));
}
@@ -455,6 +453,13 @@ public class CssMenuItem implements Serializable {
link.add(dummy);
}
+ if(! this.isEnabled()) {
+ link.add(new AttributeModifier("title", Model.of(this.getDisabledReason())));
+ link.add(new CssClassAppender("disabled"));
+
+ link.setEnabled(false);
+ }
+
// .. and hide label
Components.permanentlyHide(markupContainer, CssMenuItem.ID_MENU_LABEL);
return link;
http://git-wip-us.apache.org/repos/asf/isis/blob/a14951ee/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 c858633..a967c01 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
@@ -203,6 +203,7 @@
/*border: none;*/
}
+.entityActions .cssMenuPanel .menuh a,
.entityActions .cssMenuPanel .menuh a:link,
.entityActions .cssMenuPanel .menuh a:visited,
.entityActions .cssMenuPanel .menuh a:active,
@@ -212,7 +213,6 @@
height: 30px;
line-height: 30px;
padding:0 10px;
- font-weight:bold;
font-size:0.85em;
border-radius:4px;
-moz-border-radius:4px;
http://git-wip-us.apache.org/repos/asf/isis/blob/a14951ee/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.html
index 4b4d00d..1ef03c9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.html
@@ -22,7 +22,7 @@
<wicket:panel>
<ul class="cssSubMenuItemsPanel">
<li wicket:id="subMenuItems" class="cssSubMenuItem">
- <a wicket:id="menuLink" class="btn">
+ <a wicket:id="menuLink" class="btn btn-primary">
<span class="fontAwesomeIcon" wicket:id="menuLinkFontAwesome"></span>
<span class="menuLabel" wicket:id="menuLabel">[menu label]</span>
</a>
http://git-wip-us.apache.org/repos/asf/isis/blob/a14951ee/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
index 90c2175..fb1c372 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
@@ -64,6 +64,8 @@
</div>
</header>
+ <div class="clear"/>
+
<div id="body">
<wicket:child/>
http://git-wip-us.apache.org/repos/asf/isis/blob/a14951ee/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 9e3e23d..8105db2 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
@@ -62,8 +62,35 @@
margin: 0;
}
+
+.entityPropertiesPanel .panel-body {
+ padding-bottom: 0px;
+}
+
+.entityCollectionsPanel .viewLinks {
+ margin-top: -10px;
+}
+
+.entityCollectionsPanel .additionalLinksAndSelectorDropDown {
+ margin-top: -2px;
+}
+
+.collection.panel-body {
+ padding-top: 0px;
+ /*
+ padding-left: 5px;
+ padding-right: 5px;
+ padding-bottom: 5px;
+ */
+}
+
+.collectionPanel .well {
+ background-color: transparent;
+ margin-bottom: 0px;
+}
+
body {
- padding-top: 80px;
+ padding-top: 60px;
}
.nav > li > a {