[2375] Add icons to toolbar

ckan · May 17, 2012 · 5116aa3 · 5116aa3
1 parent 4834736
commit 5116aa3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/ckan/public/base/images/sprite-ckan-icons.png b/ckan/public/base/images/sprite-ckan-icons.png
diff --git a/ckan/public/base/less/icons.less b/ckan/public/base/less/icons.less
@@ -24,21 +24,6 @@
   background-position: 16px 16px;
 }
 
-.ckan-icon-small {
-  width:  @small-x;
-  height: @small-y;
-}
-
-.ckan-icon-medium {
-  width:  @medium-x;
-  height: @medium-y;
-}
-
-.ckan-icon-large {
-  width:  @large-x;
-  height: @large-y;
-}
-
 .ckan-icon-background-position(@offset, @size) {
   @w: "@{size}-x";
   @h: "@{size}-y";

diff --git a/ckan/public/base/less/toolbar.less b/ckan/public/base/less/toolbar.less
@@ -13,6 +13,13 @@
   border: none;
 }
 
+.toolbar .breadcrumb li:first-of-type:before {
+  content: " ";
+  .ckan-icon;
+  .ckan-icon-home;
+  margin-right: 5px;
+}
+
 .toolbar .breadcrumb li:after {
   content: " / ";
 }
@@ -39,3 +46,8 @@
 .toolbar .actions li:last-of-type {
   margin-right: 0;
 }
+
+.toolbar .actions .btn {
+  padding: 2px 6px 3px;
+  border-color: #b7b7b7;
+}
diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
@@ -15,9 +15,9 @@
           <li class="active"><a href="">${c.pkg_dict.get('title', c.pkg_dict.get('name'))}</a></li>
         </ol>
         <ul class="actions">
-          <li><a class="btn" href="">History</a></li>
-          <li><a class="btn" href="">Edit</a></li>
-          <li><a class="btn" href="">Report Issue</a></li>
+          <li><a class="btn" href=""><i class="ckan-icon ckan-icon-rewind"></i> History</a></li>
+          <li><a class="btn" href=""><i class="ckan-icon ckan-icon-tools"></i> Edit</a></li>
+          <li><a class="btn" href=""><i class="ckan-icon ckan-icon-flag"></i> Report Issue</a></li>
         </ul>
       </nav>