diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css index bb5b86ced50..bbd2bc31cc4 100644 --- a/ckan/public/base/css/main.css +++ b/ckan/public/base/css/main.css @@ -105,7 +105,7 @@ textarea { clear: both; } .hide-text { - font: 0/0 a; + font: a; color: transparent; text-shadow: none; background-color: transparent; @@ -4455,7 +4455,7 @@ ul.icons li .icon-large:before { border-radius: 7px; } .pill .remove { - font: 0/0 a; + font: a; color: transparent; text-shadow: none; background-color: transparent; @@ -4513,13 +4513,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 { @@ -4675,8 +4675,6 @@ ul.icons li .icon-large:before { border-bottom: none; } .module-grid { - margin: 0; - list-style: none; margin: 0; list-style: none; *zoom: 1; @@ -4700,7 +4698,6 @@ ul.icons li .icon-large:before { padding-left: 20px; padding-bottom: 25px; float: left; - float: left; margin-left: 20px; width: 460px; padding-top: 10px; @@ -4866,13 +4863,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 { @@ -4894,12 +4891,10 @@ ol.media-grid:after { } .nav-item.active > a { background: url("../images/background-tag.png") no-repeat -13px center; - position: relative; display: block; font-size: 11px; line-height: 27px; color: #005772; - padding-left: 10px; padding-right: 5px; margin-right: 11px; -webkit-box-sizing: border-box; @@ -5171,8 +5166,6 @@ textarea { background-image: url("../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; @@ -5625,6 +5618,10 @@ textarea { .dataset-heading a { color: #333333; } +.dataset-heading .label { + position: relative; + top: -1px; +} .dataset-content { font-size: 12px; } @@ -5763,8 +5760,6 @@ textarea { vertical-align: text-bottom; position: relative; top: 2px; - width: 16px; - height: 16px; background-image: url("../images/sprite-ckan-icons.png"); background-repeat: no-repeat; background-position: 16px 16px; @@ -6600,7 +6595,6 @@ li .icon-large:before { float: right; } [role=main] .secondary { - float: left; margin-left: 20px; width: 220px; margin-left: 0; @@ -6848,13 +6842,11 @@ li .icon-large:before { bottom: NaN; width: 1px; background-color: #007094; - background-color: rgba(255, 255, 255, 0); background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(rgba(255, 255, 255, 0.1)), to(rgba(255, 255, 255, 0))); background-image: -webkit-radial-gradient(circle, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0)); background-image: -moz-radial-gradient(circle, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0)); background-image: -ms-radial-gradient(circle, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0)); background-image: -o-radial-gradient(circle, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0)); - background-repeat: no-repeat; background-color: rgba(255, 255, 255, 0.08000000000000002); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, 0.1)), to(rgba(255, 255, 255, 0))); background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 0.5, rgba(255, 255, 255, 0)); @@ -6868,13 +6860,11 @@ li .icon-large:before { .masthead .section:after { left: -1px; background-color: #004a61; - background-color: rgba(0, 0, 0, 0); background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(rgba(0, 0, 0, 0.2)), to(rgba(0, 0, 0, 0))); background-image: -webkit-radial-gradient(circle, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)); background-image: -moz-radial-gradient(circle, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)); background-image: -ms-radial-gradient(circle, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)); background-image: -o-radial-gradient(circle, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)); - background-repeat: no-repeat; background-color: rgba(0, 0, 0, 0.16000000000000003); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0)), color-stop(0.5, rgba(0, 0, 0, 0.2)), to(rgba(0, 0, 0, 0))); background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2) 0.5, rgba(0, 0, 0, 0)); diff --git a/ckan/public/base/less/dataset.less b/ckan/public/base/less/dataset.less index b35be681489..4e7e95a6f75 100644 --- a/ckan/public/base/less/dataset.less +++ b/ckan/public/base/less/dataset.less @@ -19,6 +19,11 @@ color: @listingHeadingTextColor; } +.dataset-heading .label { + position: relative; + top: -1px; +} + .dataset-content { font-size: 12px; } diff --git a/ckan/templates/snippets/package_list.html b/ckan/templates/snippets/package_list.html index 038ea349d51..94e7bc9c4cf 100644 --- a/ckan/templates/snippets/package_list.html +++ b/ckan/templates/snippets/package_list.html @@ -30,7 +30,9 @@

{{ h.link_to(h.truncate(title, truncate_title), h.url_for(controller='package', action='read', id=package.get('name'))) }} {% if package.get(state, '').startswith('draft') %} - [{{ _('Draft') }}] + {{ _('Draft') }} + {% elif package.get(state, '').startswith('deleted') %} + {{ _('Deleted') }} {% endif %} {{ h.popular('recent views', package.tracking_summary.recent, min=10) if package.tracking_summary }}