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 2012/11/21 01:33:13 UTC

svn commit: r1411962 - in /isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui: components/actions/ components/entity/collections/ components/entity/header/ components/welcome/ components/widgets/cssmenu/ pages/

Author: danhaywood
Date: Wed Nov 21 00:33:11 2012
New Revision: 1411962

URL: http://svn.apache.org/viewvc?rev=1411962&view=rev
Log:
Updates to CSS

Modified:
    isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.css
    isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html
    isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css
    isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
    isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.css
    isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
    isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css

Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.css?rev=1411962&r1=1411961&r2=1411962&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.css Wed Nov 21 00:33:11 2012
@@ -22,7 +22,9 @@
 
 div.actionPanel .iconAndTitle {
 	float: left;
-    padding:1em;
+    position:absolute;
+    left:20px;
+    top:0px;
 }
 
 .actionPanel .iconAndTitle .entityImage {

Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html?rev=1411962&r1=1411961&r2=1411962&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.html Wed Nov 21 00:33:11 2012
@@ -25,7 +25,7 @@
 	<head></head>
 	<body>
 		<wicket:panel>
-			<div class="actionPanel actionComponentType">
+			<div class="actionPanel actionComponentType myBlockContainer">
 				<div class="iconAndTitle panel">
 			         <span wicket:id="entityIconAndTitle">[icon and title]</span>
 			         <p wicket:id="actionName" class="actionName">[action name]</p>

Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css?rev=1411962&r1=1411961&r2=1411962&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.css Wed Nov 21 00:33:11 2012
@@ -21,7 +21,9 @@
 }
  
 .entityCollectionsPanel fieldset legend {
-	margin-left: 10px;
+	position:absolute;
+	left:20px;
+	top:20px;
 }
 
 .entityCollectionsPanel .actions {

Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css?rev=1411962&r1=1411961&r2=1411962&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css Wed Nov 21 00:33:11 2012
@@ -18,19 +18,18 @@
  */
 .entityHeaderPanel {
 	clear:both;
+	padding-top:10px;
+	display:block;
 }
 
 div.entityHeaderPanel .iconAndTitle {
 	float: left;
-    padding:1em;
+    padding:0em;
 }
 
 div.entityHeaderPanel .actions {
-	float: left;
-    padding:1em;
-    
-	padding-top: 2.0em; 
-	padding-left: 50px;
+	float: right;
+    padding:0em 0em;
 }
 
 .entityHeaderPanel .entityImage {
@@ -41,5 +40,9 @@ div.entityHeaderPanel .actions {
 }
 
 .entityHeaderPanel .entityTitle {
-	font-size: x-large;
+	font-size: 1.8em;
+	font-weight:normal;
+	color:#413D37;
+	text-decoration:none;
 }
+

Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.css?rev=1411962&r1=1411961&r2=1411962&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.css Wed Nov 21 00:33:11 2012
@@ -17,13 +17,16 @@
  *  under the License.
  */
 .welcomePanel #message {
-	border-width: .1em;
-	border-style: dashed;
-	border-color: #444;
-	padding: 15px;
-	display: block;
-	margin-top: 50px;
-	margin-left: 100px;
-	margin-right: 100px;
+	background:#FFFFFF;
+	border-radius:4px;
+	-moz-border-radius:4px;
+	-webkit-border-radius:4px;
+    display: block;
+    margin-left: 50px;
+    margin-right: 50px;
+    margin-top: 50px;
+    padding: 15px;
+    text-align:center;
+    font-size:1.2em;
 }
 

Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css?rev=1411962&r1=1411961&r2=1411962&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css Wed Nov 21 00:33:11 2012
@@ -261,4 +261,9 @@
 	{
 	color: #000;
 	background-color:#FFFFFF;
-}
\ No newline at end of file
+}
+
+
+.additionalLinkList {
+	float:right;
+} 
\ No newline at end of file

Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css?rev=1411962&r1=1411961&r2=1411962&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css Wed Nov 21 00:33:11 2012
@@ -295,6 +295,7 @@ form fieldset .okButton {
 	-webkit-border-radius:4px;
 	margin-bottom:1%;
 	position:relative;
+	clear:both;
 }
 
 .myBlockContainer fieldset {