Merge branch 'master' into 3021-logout-without-js

Conflicts: ckan/public/base/css/main.css recreated
ckan · Nov 20, 2012 · d031ee6 · d031ee6
2 parents 403d36d + 18f306c
commit d031ee6
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css
@@ -4506,13 +4506,13 @@ ul.icons li .icon-large:before {
 .simple-list:after {
   clear: both;
 }
-.simple-list > li {
+.simple-list  > li {
   font-size: 12px;
   line-height: 1.1666666666666667em;
   padding: 7px 25px;
   border-bottom: 1px dotted #cccccc;
 }
-.simple-list > li:last-of-type {
+.simple-list  > li:last-of-type {
   border-bottom: 0;
 }
 .simple-list .ckan-icon {
@@ -4669,6 +4669,8 @@ ul.icons li .icon-large:before {
   padding-right: 15px;
 }
 .module-grid {
+  margin: 0;
+  list-style: none;
   margin: 0;
   list-style: none;
   *zoom: 1;
@@ -4692,6 +4694,7 @@ ul.icons li .icon-large:before {
   padding-left: 20px;
   padding-bottom: 25px;
   float: left;
+  float: left;
   margin-left: 20px;
   width: 460px;
   padding-top: 10px;
@@ -4717,10 +4720,10 @@ ul.icons li .icon-large:before {
 .ckanext-datapreview {
   position: relative;
 }
-.ckanext-datapreview > iframe {
+.ckanext-datapreview  > iframe {
   min-height: 400px;
 }
-.ckanext-datapreview > img {
+.ckanext-datapreview  > img {
   max-height: 500px;
   max-width: 100%;
   overflow: hidden;
@@ -4884,13 +4887,13 @@ ol.media-grid:after {
 .nav-simple:after {
   clear: both;
 }
-.nav-simple > li {
+.nav-simple  > li {
   font-size: 12px;
   line-height: 1.1666666666666667em;
   padding: 7px 25px;
   border-bottom: 1px dotted #cccccc;
 }
-.nav-simple > li:last-of-type {
+.nav-simple  > li:last-of-type {
   border-bottom: 0;
 }
 .nav-simple .ckan-icon {
@@ -4912,10 +4915,12 @@ ol.media-grid:after {
 }
 .nav-item.active > a {
   background: url("../../../base/images/background-tag.png") no-repeat -13px center;
+  position: relative;
   display: block;
   font-size: 11px;
   line-height: 27px;
   color: #187794;
+  padding-left: 10px;
   padding-right: 5px;
   margin-right: 11px;
   -webkit-box-sizing: border-box;
@@ -5204,6 +5209,8 @@ textarea {
   background-image: url("../../../base/images/sprite-ckan-icons.png");
   background-repeat: no-repeat;
   background-position: 16px 16px;
+  width: 17px;
+  height: 17px;
   background-position: -51px -16px;
   position: absolute;
   display: block;
@@ -5797,6 +5804,8 @@ textarea {
   vertical-align: text-bottom;
   position: relative;
   top: 2px;
+  width: 16px;
+  height: 16px;
   background-image: url("../../../base/images/sprite-ckan-icons.png");
   background-repeat: no-repeat;
   background-position: 16px 16px;
@@ -6652,6 +6661,7 @@ li .icon-large:before {
   float: right;
 }
 [role=main] .secondary {
+  float: left;
   margin-left: 20px;
   width: 220px;
   margin-left: 0;