Skip to content
Snippets Groups Projects
Commit 320a07a9 authored by Thorge Petersen's avatar Thorge Petersen
Browse files

Started migrating labels to badges

parent aef27cf2
No related branches found
No related tags found
1 merge request!50Upgraded to CKAN 2.10
...@@ -937,9 +937,6 @@ ul.dataset-resources { ...@@ -937,9 +937,6 @@ ul.dataset-resources {
.dataformat-label { .dataformat-label {
background-color: #003064 !important; background-color: #003064 !important;
padding: 3px 3px 1px 3px;
font-size: 14px;
margin-right: 4px;
} }
...@@ -993,10 +990,6 @@ a.odsh-star:hover { ...@@ -993,10 +990,6 @@ a.odsh-star:hover {
vertical-align: middle; vertical-align: middle;
} }
.dataformat-label:hover {
background-color: #d4004b !important;
}
.dataset-info p { .dataset-info p {
font-size: 12px; font-size: 12px;
margin-bottom: 1px; margin-bottom: 1px;
...@@ -1490,15 +1483,15 @@ body { ...@@ -1490,15 +1483,15 @@ body {
} }
} }
.toolbar .breadcrumb>li+li::before { .toolbar .breadcrumb li:not(:first-child)::before {
padding: 0 9px; float: left;
padding-right: 9px;
background-image: url(/base/images/arrow-right.png); background-image: url(/base/images/arrow-right.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 8px 12px; background-size: 8px 12px;
background-position: 4px 1px; background-position: 4px 5px;
display: inline-block;
width: 12px; width: 12px;
height: 12px; height: 21px;
content: ""; content: "";
} }
...@@ -1663,10 +1656,6 @@ body { ...@@ -1663,10 +1656,6 @@ body {
text-align: center; text-align: center;
} }
.dataformat-label:hover {
background-color: #d4004b !important;
}
.resource-title { .resource-title {
float: left; float: left;
margin-left: 5px; margin-left: 5px;
...@@ -2843,17 +2832,17 @@ p.package-info-issued { ...@@ -2843,17 +2832,17 @@ p.package-info-issued {
} }
.label.label-open { .badge.label-open {
color: white; color: white;
background-color: #003064; background-color: #003064;
} }
.label.label-closed { .badge.label-closed {
color: white; color: white;
background-color: #DBDBDB; background-color: #DBDBDB;
} }
.datarequest .dataset-heading .label { .datarequest .dataset-heading .badge {
vertical-align: top; vertical-align: top;
} }
...@@ -2947,7 +2936,7 @@ p.package-info-issued { ...@@ -2947,7 +2936,7 @@ p.package-info-issued {
display: inline-block; display: inline-block;
} }
.datarequest .additional-info .label { .datarequest .additional-info .badge {
margin: 8px; margin: 8px;
} }
......
...@@ -56,11 +56,11 @@ ...@@ -56,11 +56,11 @@
<div >{{ _('Status') }}: <div >{{ _('Status') }}:
<div class="dataset-details"> <div class="dataset-details">
{% if c.datarequest.get('closed', False) %} {% if c.datarequest.get('closed', False) %}
<div class="label label-closed"> <div class="badge label-closed">
{% trans %}Done{% endtrans %} {% trans %}Done{% endtrans %}
</div> </div>
{% else %} {% else %}
<div class="label label-open"> <div class="badge label-open">
{% trans %}Open{% endtrans %} {% trans %}Open{% endtrans %}
</div> </div>
{% endif %} {% endif %}
......
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
{% block primary_content_inner %} {% block primary_content_inner %}
{% if c.datarequest.closed %} {% if c.datarequest.closed %}
<span class="uppercase label label-closed pull-right"> <span class="uppercase badge label-closed pull-right">
<i class="icon-lock fa fa-lock"></i> <i class="icon-lock fa fa-lock"></i>
{{ _('Closed') }} {{ _('Closed') }}
</span> </span>
{% else %} {% else %}
<span class="uppercase label label-open pull-right"> <span class="uppercase badge label-open pull-right">
<i class="icon-unlock fa fa-unlock"></i> <i class="icon-unlock fa fa-unlock"></i>
{{ _('Open') }} {{ _('Open') }}
</span> </span>
......
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
<div class="dataset-heading "> <div class="dataset-heading ">
<div class="span1"> <div class="span1">
{% if datarequest.get('closed', False) %} {% if datarequest.get('closed', False) %}
<div class="label label-closed"> <div class="badge label-closed">
{% trans %}Done{% endtrans %} {% trans %}Done{% endtrans %}
</div> </div>
{% else %} {% else %}
<div class="label label-open"> <div class="badge label-open">
{% trans %}Open{% endtrans %} {% trans %}Open{% endtrans %}
</div> </div>
{% endif %} {% endif %}
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</div> </div>
{% endif %} {% endif %}
{% if pkg.private %} {% if pkg.private %}
<span class="dataset-private label label-inverse"> <span class="dataset-private badge bg-secondary">
<i class="fa fa-lock"></i> <i class="fa fa-lock"></i>
{{ _('Private') }} {{ _('Private') }}
</span> </span>
......
...@@ -24,7 +24,7 @@ Example: ...@@ -24,7 +24,7 @@ Example:
</div> </div>
<div class="info-detail"> <div class="info-detail">
<div>{{ _('Format') }}:</div> <div>{{ _('Format') }}:</div>
<div class="label dataformat-label">{{res.format}}</div> <div class="badge badge-default dataformat-label">{{res.format}}</div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</div> </div>
{% if res_format %} {% if res_format %}
<a href="{{ download }}" > <a href="{{ download }}" >
<div class="dataformat-label resource-dataformat-label label" style='font-size:{{150/(res_format|length)}}px'>{{res_format}}</div> <div class="badge badge-default dataformat-label resource-dataformat-label" style='font-size:{{150/(res_format|length)}}px'>{{res_format}}</div>
</a> </a>
{% endif %} {% endif %}
</div> </div>
......
...@@ -65,7 +65,7 @@ Example: ...@@ -65,7 +65,7 @@ Example:
<span class='label new-dataset-label'>{{ _('NEW') }}</span> <span class='label new-dataset-label'>{{ _('NEW') }}</span>
{% endif %} {% endif %}
{% if package.private %} {% if package.private %}
<span class="dataset-private label label-inverse"> <span class="dataset-private badge bg-secondary">
<i class="fa fa-lock"></i> <i class="fa fa-lock"></i>
{{ _('Private') }} {{ _('Private') }}
</span> </span>
...@@ -78,9 +78,9 @@ Example: ...@@ -78,9 +78,9 @@ Example:
{% endblock heading_title %} {% endblock heading_title %}
{% block heading_meta %} {% block heading_meta %}
{% if package.get('state', '').startswith('draft') %} {% if package.get('state', '').startswith('draft') %}
<span class="label label-info">{{ _('Draft') }}</span> <span class="badge bg-info">{{ _('Draft') }}</span>
{% elif package.get('state', '').startswith('deleted') %} {% elif package.get('state', '').startswith('deleted') %}
<span class="label label-important">{{ _('Deleted') }}</span> <span class="badge bg-danger">{{ _('Deleted') }}</span>
{% endif %} {% endif %}
{{ h.popular('recent views', package.tracking_summary.recent, min=10) if package.tracking_summary }} {{ h.popular('recent views', package.tracking_summary.recent, min=10) if package.tracking_summary }}
{% endblock heading_meta %} {% endblock heading_meta %}
...@@ -127,7 +127,7 @@ Example: ...@@ -127,7 +127,7 @@ Example:
{% block resources_inner %} {% block resources_inner %}
{% for resource in h.dict_list_reduce(package.resources, 'format') %} {% for resource in h.dict_list_reduce(package.resources, 'format') %}
<li> <li>
<a href="{{ h.url_for(package.type ~ '.read', id=package.name) }}" class="label dataformat-label" <a href="{{ h.url_for(package.type ~ '.read', id=package.name) }}" class="badge badge-default dataformat-label"
data-format="{{ resource.lower().replace('_srvc','') }}">{{ data-format="{{ resource.lower().replace('_srvc','') }}">{{
resource.replace('_SRVC','') }}</a> resource.replace('_SRVC','') }}</a>
</li> </li>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment