[open-ils-commits] r9188 - in branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb: public/oils/media/css/skin templates/oils

svn at svn.open-ils.org svn at svn.open-ils.org
Tue Apr 1 22:52:25 EDT 2008


Author: erickson
Date: 2008-04-01 22:16:11 -0400 (Tue, 01 Apr 2008)
New Revision: 9188

Modified:
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
Log:
moved some inline css to the default skin css file

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css	2008-04-02 01:24:06 UTC (rev 9187)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css	2008-04-02 02:16:11 UTC (rev 9188)
@@ -8,10 +8,16 @@
 /* use this for divs whose contents should be entirely contained within the div */
 .container:after {content: ""; display: block; height: 0; clear: both; }
 table { border-collapse: collapse; }
-body { margin-top: 0px; padding-top: 0px;}
 
+html, body, #oils-base-body-block {
+    width:100%;
+    height:100%;
+    border:0;
+    margin:0;
+    padding:0;
+}
+
 /* main layout blocks */
-#oils-base-body-block { width: 100%; margin-top: 0px; padding-top: 0px;}
 #oils-base-main-block { width: 100%; margin-top: 0px; padding-top: 0px;}
 #oils-base-navigate-block { width: 15%; vertical-align: top; float:left;}
 #oils-base-content-block { width: 84%; vertical-align: top; float:right; padding-top: 0px;}

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html	2008-04-02 01:24:06 UTC (rev 9187)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html	2008-04-02 02:16:11 UTC (rev 9188)
@@ -26,16 +26,8 @@
 
 <%def name='block_css()'>
     <style type="text/css">
-	@import "/js/dijit/themes/tundra/tundra.css";
-	@import "/js/dojo/resources/dojo.css";
-
-        html, body, #oils-base-body-block {
-	    width:100%;
-	    height:100%;
-	    border:0;
-	    margin:0;
-	    padding: 0;
-	}
+        @import "/js/dijit/themes/tundra/tundra.css";
+        @import "/js/dojo/resources/dojo.css";
     </style>
     <link rel='stylesheet' type='text/css' href='${c.oils.core.media_prefix.value}/css/skin/${c.oils.core.skin.value}.css'/>
     <link rel='stylesheet' type='text/css' href='${c.oils.core.media_prefix.value}/css/theme/${c.oils.core.theme.value}.css'/>



More information about the open-ils-commits mailing list