Merge branch 'feature-2332-theme-ui' of https://github.com/okfn/ckan

ckan · May 1, 2012 · 96e486d · 96e486d
2 parents ea19469 + 4bd2e33
commit 96e486d
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 647 deletions.
diff --git a/ckan/public/css/bootstrap.min.css b/ckan/public/css/bootstrap.min.css
diff --git a/ckan/public/css/style.css b/ckan/public/css/style.css
@@ -22,7 +22,7 @@ body.no-sidebar .content-outer {
 }
 
 header {
-  padding: 5px 0px 2px 0px;
+  padding: 5px 0px 5px 0px;
 }
 
 header #logo {
@@ -38,6 +38,7 @@ header #site-name {
   /*font-weight: bold;*/
   color: #333;
   text-shadow: 1px 1px 3px #ccc;
+  line-height: 1.3;
 }
 
 header #site-name a {
@@ -203,7 +204,7 @@ tbody tr:nth-child(odd) td, tbody tr.odd td {
 #page-logo {
   max-width: 36px;
   max-height: 36px;
-  margin-right: 5px;
+  vertical-align: text-top;
 }
 .hover-for-help {
   position: relative;
@@ -238,6 +239,7 @@ tbody tr:nth-child(odd) td, tbody tr.odd td {
 img.gravatar {
   margin: 0 5px -5px 0;
   border-radius: 3px;
+  vertical-align: baseline;
 }
 
 .inline-icon {
@@ -424,8 +426,7 @@ body.index.home .front-page .action-box {
   background:  #FFF7C0;
 }
 body.index.home .front-page .action-box-inner {
-  margin: 20px;
-  margin-bottom: 5px;
+  margin: 0 20px 5px;
   min-height: 15em;
 }
 body.index.home .front-page .action-box-inner.collaborate {
@@ -557,8 +558,14 @@ form.simple-form input[type=password] {
   margin-bottom: 0.5em;
   margin-left: -2em;
 }
-.group.read .property-list li ul li {
-  margin-left: -2.5em;
+/* Fix the indented headings on the groups page */
+.group.read .property-list {
+  margin-left: 0;
+  padding-left: 0;
+}
+.group.read .property-list li h3,
+.group.read .property-list li ul {
+  margin-left: 0;
 }
 .group-dataset-list {
   margin: 2em 0;
@@ -1123,7 +1130,7 @@ body.package.read #sidebar li.widget-container {
 body.package.resource_read #sidebar { display: none; }
 body.package.resource_read #content {
     border-right: 0;
-    width: 950px;
+    width: 940px;
 }
 
 .resource_read .notes {

diff --git a/ckan/public/img/glyphicons-halflings-white.png b/ckan/public/img/glyphicons-halflings-white.png
diff --git a/ckan/public/img/glyphicons-halflings.png b/ckan/public/img/glyphicons-halflings.png
diff --git a/ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js b/ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
diff --git a/ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js b/ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
diff --git a/ckan/templates/home/index.html b/ckan/templates/home/index.html
@@ -10,7 +10,7 @@
 
   <div py:match="//div[@id='content']" class="front-page">
     <div>
-      <h1>Welcome to ${g.site_title}!</h1>
+      <h1 class="page_heading">Welcome to ${g.site_title}!</h1>
     </div>
     <div class="row">
       <div class="span4">

diff --git a/ckan/templates/layout_base.html b/ckan/templates/layout_base.html
@@ -228,7 +228,7 @@ <h3 class="widget-title">Meta</h3>
   <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.chosen/0.9.7/chosen.js')}"></script>
   <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.placeholder/jquery.placeholder.js')}"></script>
   <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jqueryui/1.8.14/jquery-ui.min.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js')}"></script>
 
   <!-- for application.js -->
   <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/underscore/1.1.6/underscore.js')}"></script>