Merge pull request scikit-learn#10 from GaelVaroquaux/pr_2201

amueller · amueller · commit 907ce126ef46 · 2013-07-25T07:48:34.000-07:00
CSS mucking around (yet again)
diff --git a/doc/themes/scikit-learn/layout.html b/doc/themes/scikit-learn/layout.html
@@ -20,13 +20,13 @@
 {% set script_files = script_files + ['_static/sidebar.js'] %}
 {% endif %}
 
-{% block extrahead %}
-
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <!-- Bootstrap -->
 <link rel="stylesheet" href="{{ pathto('_static/css/bootstrap.min.css', 1) }}" media`="screen" />
 <link rel="stylesheet" href="{{ pathto('_static/css/bootstrap-responsive.css', 1) }}"/>
 
+{% block extrahead %}
+
 <script src="{{ pathto('_static/js/bootstrap.min.js', 1)}}"></script>
 
 {%- if pagename == 'index' or pagename == 'documentation' %}
diff --git a/doc/themes/scikit-learn/static/nature.css_t b/doc/themes/scikit-learn/static/nature.css_t
@@ -261,7 +261,7 @@ div.sphinxsidebarwrapper {
 {% if theme_collapsiblesidebar|tobool %}
 /* for collapsible sidebar */
 div#sidebarbutton {
-    background-color: #F0F0F0;
+    background-color: #F6F6F6;
 }
 {% endif %}
 
@@ -803,3 +803,7 @@ div.box-links p {
     display: inline;
 }
 
+div.row-fluid div.box h2 {
+    padding-bottom: 0px;
+    margin-bottom: -10px;
+}
diff --git a/doc/themes/scikit-learn/static/sidebar.js b/doc/themes/scikit-learn/static/sidebar.js
@@ -124,7 +124,7 @@ $(function() {
           $(this).css('background-color', '#D0D0D0');
       },
       function () {
-          $(this).css('background-color', '#F0F0F0');
+          $(this).css('background-color', '#F6F6F6');
       }
     );
   }

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ div.sphinxsidebarwrapper {`
`261`	`261`	`{% if theme_collapsiblesidebar\|tobool %}`
`262`	`262`	`/* for collapsible sidebar */`
`263`	`263`	`div#sidebarbutton {`
`264`		`- background-color: #F0F0F0;`
	`264`	`+ background-color: #F6F6F6;`
`265`	`265`	`}`
`266`	`266`	`{% endif %}`
`267`	`267`
`@@ -803,3 +803,7 @@ div.box-links p {`
`803`	`803`	`display: inline;`
`804`	`804`	`}`
`805`	`805`
	`806`	`+div.row-fluid div.box h2 {`
	`807`	`+ padding-bottom: 0px;`
	`808`	`+ margin-bottom: -10px;`
	`809`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ $(function() {`
`124`	`124`	`$(this).css('background-color', '#D0D0D0');`
`125`	`125`	`},`
`126`	`126`	`function () {`
`127`		`- $(this).css('background-color', '#F0F0F0');`
	`127`	`+ $(this).css('background-color', '#F6F6F6');`
`128`	`128`	`}`
`129`	`129`	`);`
`130`	`130`	`}`