[2/2] git commit: [#5939] fix icon sprites on project permission page

[je...@apache.org]

[#5939] fix icon sprites on project permission page


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/12b1649e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/12b1649e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/12b1649e

Branch: refs/heads/master
Commit: 12b1649e10848fa480cc921e2bf0c7ca571875cf
Parents: 09685f8
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Jul 1 14:54:14 2014 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Fri Jul 18 08:40:38 2014 +0000

----------------------------------------------------------------------
 Allura/allura/nf/allura/css/allura.css     | 3 ++-
 Allura/allura/nf/allura/css/site_style.css | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/12b1649e/Allura/allura/nf/allura/css/allura.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/allura.css b/Allura/allura/nf/allura/css/allura.css
index b7579bf..4087e1e 100644
--- a/Allura/allura/nf/allura/css/allura.css
+++ b/Allura/allura/nf/allura/css/allura.css
@@ -48,7 +48,7 @@ b.ico.ico-plus { background-position: -16px -128px; }
 b.ico.ico-minus { background-position: -48px -128px; }
 b.ico.ico-minuscirc { background-position: -48px -128px; }
 b.ico.ico-undelete { background-position: 0px -64px; }
-b.ico.ico-delete { background-position: -80px -128px; }
+b.ico.ico-delete, b.ico.ico-noentry { background-position: -80px -128px; }
 b.ico.ico-help { background-position: -48px -144px; }
 b.ico.ico-pin { background-position: -144px -144px; }
 b.ico.ico-feed { background-position: -16px -176px; }
@@ -56,6 +56,7 @@ b.ico.ico-close { background-position: -80px -128px; }
 b.ico.ico-vote-up { background-image: url('../images/vote_up.png'); }
 b.ico.ico-vote-down { background-image: url('../images/vote_down.png'); }
 b.ico.ico-star { background-position: -240px -96px; }
+b.ico.ico-check, b.ico.ico-checkcircle { background-position: -64px -144px; } /* TODO: these should be separate images */
 
 
 #ticket_search_results_holder{

http://git-wip-us.apache.org/repos/asf/allura/blob/12b1649e/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index c4b7326..8f8d5ab 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -1213,6 +1213,7 @@ nav .ico {
   text-transform: none;
 }
 
+/* these don't work with sprite images (only if the icons were font-based)
 .x16 {
   font-size: 16px;
   width: 16px;
@@ -1242,6 +1243,7 @@ nav .ico {
   width: 64px;
   height: 64px;
 }
+*/
 
 .modal b.close {
   position: absolute;