Merge branch '1263'

ckan · Oct 16, 2013 · 383ab77 · 383ab77
2 parents 10d495e + 971026b
commit 383ab77
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 19 deletions.
diff --git a/ckan/public/base/less/iehacks.less b/ckan/public/base/less/iehacks.less
@@ -200,11 +200,6 @@
     .media-content {
       position: relative;
     }
-    .action {
-      position: absolute;
-      top: 9px;
-      right: 10px;
-    }
     .media-image img {
       float: left;
     }

diff --git a/ckan/public/base/less/module.less b/ckan/public/base/less/module.less
@@ -13,17 +13,6 @@
   border-bottom: 1px solid @moduleHeadingBorderColor;
 }
 
-.module-heading .action {
-  float: right;
-  color: @moduleHeadingActionTextColor;
-  font-size: 12px;
-  line-height: @baseLineHeight;
-  text-decoration: underline;
-  &:hover {
-    color: @layoutTextColor;
-  }
-}
-
 .module-content {
   padding: 0 @gutterX;
   margin: 20px 0;

diff --git a/ckan/templates/development/snippets/facet.html b/ckan/templates/development/snippets/facet.html
@@ -1,6 +1,6 @@
 <section class="module module-narrow">
   {% with items=(("First", true), ("Second", false), ("Third", true), ("Fourth", false), ("Last", false)) %}
-    <h2 class="module-heading"><i class="icon-medium icon-filter"></i>  Facet List <a href="#" class="action">Clear All</a></h2>
+    <h2 class="module-heading"><i class="icon-medium icon-filter"></i>  Facet List</h2>
     <nav>
       <ul class="unstyled nav nav-simple nav-facet">
         {% for value, active in items %}

diff --git a/ckan/templates/development/snippets/module.html b/ckan/templates/development/snippets/module.html
@@ -3,7 +3,7 @@
     {% if heading_link %}
       <h{{ hn }} class="module-heading"><a href="#">{{ heading }}</a></h{{ hn }}>
     {% elif heading_action %}
-      <h{{ hn }} class="module-heading">{{ heading }} <a href="#" class="action">Clear All</a></h{{ hn }}>
+      <h{{ hn }} class="module-heading">{{ heading }}</h{{ hn }}>
     {% elif heading_icon %}
       <h{{ hn }} class="module-heading"><i class="icon-medium icon-wrench"></i> {{ heading }}</h{{ hn }}>
     {% else %}

diff --git a/ckan/templates/snippets/facet_list.html b/ckan/templates/snippets/facet_list.html
@@ -50,7 +50,6 @@ <h2 class="module-heading">
         <i class="icon-medium icon-filter"></i>
         {% set title = title or h.get_facet_title(name) %}
         {{ title }}
-        <a href="{{ h.remove_url_param(name, extras=extras, alternative_url=alternative_url) }}" class="action">{{ _('Clear All') }}</a>
       </h2>
       {% if items %}
         <nav>