Author: david
Date: Wed Oct  5 13:30:35 2011
New Revision: 9933

Log:
Combine print.css and sfCaribou/print.css.  Move sfCaribou/print-preview.css to 
css/

Added:
   trunk/css/print-preview.css
      - copied, changed from r9931, 
trunk/plugins/sfCaribouPlugin/css/print-preview.css
Deleted:
   trunk/plugins/sfCaribouPlugin/css/print-preview.css
   trunk/plugins/sfCaribouPlugin/css/print.css
Modified:
   trunk/apps/qubit/modules/physicalobject/config/view.yml
   trunk/css/print.css

Modified: trunk/apps/qubit/modules/physicalobject/config/view.yml
==============================================================================
--- trunk/apps/qubit/modules/physicalobject/config/view.yml     Wed Oct  5 
12:07:57 2011        (r9932)
+++ trunk/apps/qubit/modules/physicalobject/config/view.yml     Wed Oct  5 
13:30:35 2011        (r9933)
@@ -1,6 +1,6 @@
 boxListSuccess:
   stylesheets:
-    /plugins/sfCaribouPlugin/css/print-preview: { media: screen, position: 
last }
+    print-preview: { media: screen, position: last }
   javascripts:
     /plugins/sfDrupalPlugin/vendor/drupal/misc/jquery.once.js:
     /plugins/sfDrupalPlugin/vendor/drupal/misc/tableheader:

Copied and modified: trunk/css/print-preview.css (from r9931, 
trunk/plugins/sfCaribouPlugin/css/print-preview.css)
==============================================================================
--- trunk/plugins/sfCaribouPlugin/css/print-preview.css Wed Oct  5 11:33:43 
2011        (r9931, copy source)
+++ trunk/css/print-preview.css Wed Oct  5 13:30:35 2011        (r9933)
@@ -1,4 +1,3 @@
-@import "../../../css/print.css";
 @import "print.css";
 
 #print-date

Modified: trunk/css/print.css
==============================================================================
--- trunk/css/print.css Wed Oct  5 12:07:57 2011        (r9932)
+++ trunk/css/print.css Wed Oct  5 13:30:35 2011        (r9933)
@@ -1,3 +1,31 @@
+.actions,
+.column.sidebar,
+.itemsPerPage,
+.no-print,
+.pager,
+.section.search,
+.section.browse,
+div.messages,
+h1,
+#footer,
+#header,
+#navigation,
+#preview-message,
+#sfWebDebug,
+#sidebar-first
+{
+  /* Hide */
+
+  display: none;
+}
+
+/* Hide description "areas" */
+#content .section .section > a, /* logged in */
+#content .section .section > span /* logged out */
+{
+  display: none;
+}
+
 @page
 {
   font-size: 9pt;
@@ -13,12 +41,6 @@
   }
 }
 
-a:link,
-a:visited
-{
-  text-decoration: underline;
-}
-
 body
 {
   margin: 0;
@@ -33,9 +55,10 @@
   font: 12pt/14pt "Times New Roman", serif;
 }
 
-#content
+a:link,
+a:visited
 {
-  width: 100%;
+  text-decoration: underline;
 }
 
 h1,
@@ -48,66 +71,154 @@
   page-break-after: avoid;
 }
 
-td
+h1
 {
-  vertical-align: top;
+  prince-bookmark-level: none;
+  font-size: 16pt;
+  text-align: left;
+  color: black;
+  padding: 2px 4px;
+  letter-spacing: normal;
+}
+
+/* DO print this h1 */
+h1.do-print
+{
+  display: block;
+}
+
+h1.label
+{
+  font-size: 14pt;
+  display: block;
+}
+
+/* Show 'Part of' for context in archival descriptions */
+h1.part-of
+{
+  display: block;
+  font: inherit;
+}
+
+ul, li.leaf
+{
+  list-style-image: none;
+}
+
+ul,
+.block ul,
+ol
+{
+  margin: 0;
+  margin-left: 1em;
+  padding: 0;
+}
+
+ol li,
+ul li,
+ul.menu li,
+.item-list ul li,
+ul li,
+li.leaf
+{
+  /* Reset */
+  margin: 0;
 }
 
-th
+tr.odd,
+tr.info
+{
+  /* Reset */
+
+  background-color: #FFF;
+}
+
+tr.even,
+tr.odd
+{
+  /* Reset */
+
+  border-bottom: 1px solid #CCC;
+}
+
+tr:hover
+{
+  background: none;
+}
+
+thead th
 {
   vertical-align: bottom;
+  border: 0;
+  border-bottom: medium solid;
 }
 
-.no-print
+thead th,
+.field > h3,
+.label,
+.sidebar > .section > div > h2,
+.sidebar > .section > div > h3
 {
-  display: none;
+  background: transparent;
+  color: #000;
+}
+
+td
+{
+  vertical-align: top;
 }
 
 .field
 {
   text-align: justify;
+  margin-top: 1em;
+  border: none;
 }
 
-/* Hide warnings and error messages */
-div.messages
+.field h3
 {
-  display: none;
+  float: none;
+  text-align: left;
+  font: inherit;
+  font-weight: bold;
+  padding: 2px 4px;
 }
 
-h1
+.field > div
 {
-  prince-bookmark-level: none;
-  font-size: 16pt;
-  display: none; /* Don't print page title <h1> by default */
+  margin: auto;
+  padding: 2px 4px;
 }
 
-/* DO print this h1 */
-h1.do-print
+.field .field
 {
-  display: block;
+  margin-bottom: 0;
 }
 
-h1.label
+.field .field > div
 {
-  font-size: 14pt;
-  display: block;
+  padding: 2px 0;
 }
 
-/* Show 'Part of' for context in archival descriptions */
-h1.part-of
+.label
 {
-  display: block;
-  font: inherit;
+  string-set: label content();
 }
 
-#sidebar-first
+#page
 {
-  display: none;
+  /* Header hidden */
+
+  padding: 0;
+
+  /* Reset */
+
+  width: auto;
 }
 
-#preview-message
+#content
 {
-  display: none;
+  width: 100%;
 }
 
 #print-date
@@ -117,14 +228,26 @@
   display: block;
 }
 
-#sfWebDebug
-{
-  display: none;
-}
-
 #result-count
 {
   text-align: center;
   color: #CCC;
 }
 
+#main
+{
+  /* Reset */
+
+  margin: 0;
+}
+
+#site-name
+{
+  string-set: site-name content();
+}
+
+/* Print formatting for "view" templates */
+#content .section .section
+{
+  margin: auto;
+}

-- 
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/qubit-commits?hl=en.

Reply via email to