[Checkins] SVN: grok/trunk/doc/.static/grok resolve conflict with two different items with the class name of sidebar. add the grok club to the sidebar to make it look better, and make the sidebar "non-sideways" :P

[Kevin Teague]

Log message for revision 87818:
  resolve conflict with two different items with the class name of sidebar. add the grok club to the sidebar to make it look better, and make the sidebar "non-sideways" :P 

Changed:
  U   grok/trunk/doc/.static/grok.css
  A   grok/trunk/doc/.static/grok_club.gif

-=-
Modified: grok/trunk/doc/.static/grok.css
===================================================================
--- grok/trunk/doc/.static/grok.css	2008-06-27 00:43:46 UTC (rev 87817)
+++ grok/trunk/doc/.static/grok.css	2008-06-27 05:38:20 UTC (rev 87818)
@@ -95,11 +95,11 @@
 
 /* ::: Table of Contents :::: */
 
-div.sidebarwrapper {
+.document > div.sidebarwrapper {
     padding: 10px 5px 0 10px;
 }
 
-div.sidebar {
+.document > div.sidebar {
     float: left;
     width: 230px;
     margin-left: -100%;
@@ -107,11 +107,11 @@
     color: #333333;
 }
 
-div.sidebar a {
+.document > div.sidebar a {
     color: #436976;
 }
 
-div.sidebar h3 {
+.document > div.sidebar h3 {
     font-family: 'Trebuchet MS', sans-serif;
     font-size: 1.4em;
     font-weight: normal;
@@ -119,7 +119,7 @@
     padding: 0;
 }
 
-div.sidebar h4 {
+.document > div.sidebar h4 {
     font-family: 'Trebuchet MS', sans-serif;
     font-size: 1.3em;
     font-weight: normal;
@@ -127,43 +127,60 @@
     padding: 0;
 }
 
-div.sidebar p.topless {
+.document > div.sidebar p.topless {
     margin: 5px 10px 10px 10px;
 }
 
-div.sidebar ul {
+.document > div.sidebar ul {
     margin: 10px;
     padding: 0;
     list-style: none;
     color: #c90;
 }
 
-div.sidebar ul ul,
-div.sidebar ul.want-points {
+.document > div.sidebar ul ul,
+.document > div.sidebar ul.want-points {
     margin-left: 20px;
     list-style: square;
     color: #436976;
 }
 
-div.sidebar ul ul {
+.document > div.sidebar ul ul {
     margin-top: 0;
     margin-bottom: 0;
 }
 
-div.sidebar ul li {
+.document > div.sidebar ul li {
     margin: 0.25em 0 0.5em 0;
 }
 
-div.sidebar form {
+.document > div.sidebar form {
     margin-top: 10px;
 }
 
-div.sidebar input {
+.document > div.sidebar input {
     border: 1px solid #555555;
     font-family: sans-serif;
     font-size: 1em;
 }
 
+/* Grok Tutorial style sidebar */
+.section div.sidebar {
+    font-size: 95%;
+    margin: 1em 2em;
+    padding: 0.5em 2em 1em 100px;
+    background-color: #f2f2f2;
+    border: 1px solid #777;
+    border-top-width: 6px;
+    background-image: url(grok_club.gif);
+    background-repeat: no-repeat;
+}
+
+.section .sidebar-title {
+    font-weight: bold;
+    font-size: 110%;
+}
+
 /* :::: MODULE CLOUD :::: */
 div.modulecloud {
     margin: -5px 10px 5px 10px;
@@ -744,9 +761,9 @@
 
 pre {
     padding: 5px;
-    background-color: #efc;
-    color: #333;
-    border: 1px solid #ac9;
+    background-color: #fafafa;
+    color: #333333;
+    border: 1px solid #bbb;
     border-left: none;
     border-right: none;
 }

Added: grok/trunk/doc/.static/grok_club.gif
===================================================================
(Binary files differ)


Property changes on: grok/trunk/doc/.static/grok_club.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream