You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/10/28 17:28:27 UTC
[25/35] allura git commit: [#7924] ticket:853 Remove old icon styles
[#7924] ticket:853 Remove old icon styles
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/5c2bf532
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/5c2bf532
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/5c2bf532
Branch: refs/heads/master
Commit: 5c2bf532a6cb9b6c712cd9304932ec90317ac110
Parents: ff94c41
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Oct 23 16:52:19 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Oct 27 16:22:12 2015 +0200
----------------------------------------------------------------------
Allura/allura/nf/allura/css/allura.css | 36 ----------
Allura/allura/nf/allura/css/site_style.css | 71 +------------------
.../images/neo-icon-set-454545-256x350.png | Bin 6879 -> 0 bytes
.../images/neo-icon-set-ffffff-256x350.png | Bin 8631 -> 0 bytes
Allura/allura/nf/allura/images/vote_down.png | Bin 566 -> 0 bytes
Allura/allura/nf/allura/images/vote_up.png | Bin 479 -> 0 bytes
6 files changed, 2 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/5c2bf532/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 83232df..745556b 100644
--- a/Allura/allura/nf/allura/css/allura.css
+++ b/Allura/allura/nf/allura/css/allura.css
@@ -22,14 +22,6 @@
width: 110px;
height: 24px;
}
-b.ico {
- background-image: url('../images/neo-icon-set-454545-256x350.png');
- display: inline-block;
- text-indent: -99999px;
- overflow: hidden;
- background-repeat: no-repeat;
- vertical-align: middle;
-}
a.fa,
a.fa:hover {
text-decoration: none;
@@ -41,34 +33,6 @@ a.fa:hover {
}
a.btn.fa { font-family: FontAwesome; }
a.fa > span { font-family: sans-serif; }
-h2.dark b.ico, .modal b.ico {background-image: url('../images/neo-icon-set-ffffff-256x350.png');}
-
-b.ico.ico-fork { background-position: -240px -16px; }
-b.ico.ico-merge { background-position: -224px -16px; }
-b.ico.ico-folder { background-position: 0 -96px; }
-b.ico.ico-table, b.ico.stats { background-position: -48px -96px; }
-b.ico.ico-mail { background-position: -80px -96px; }
-b.ico.ico-reply, b.ico.conversation { background-position: -128px -96px; }
-b.ico.ico-tag { background-position: -240px -96px; }
-b.ico.ico-flag { background-position: -16px -112px; }
-b.ico.ico-history { background-position: -32px -112px; }
-b.ico.ico-pencil { background-position: -64px -112px; }
-b.ico.ico-search { background-position: -160px -112px; }
-b.ico.ico-admin { background-position: -192px -112px; }
-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, 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; }
-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{
overflow: auto;
http://git-wip-us.apache.org/repos/asf/allura/blob/5c2bf532/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 142e0e3..052edaf 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -662,30 +662,14 @@ blockquote {
.message .content {
margin: 0;
}
-.message .ico-close {
- float: right;
- margin-top: -10px;
- margin-right: -10px;
- display: none;
- font-size: 18px;
- width: 18px;
- height: 18px;
- color: #1a1a1a;
-}
.message.error {
background-color: #8a0f0f;
border-color: #5c0a0a;
}
-.message.error .ico-close {
- color: #5c0a0a;
-}
.message.confirm {
background-color: #0f8a0f;
border-color: #0a5c0a;
}
-.message.confirm .ico-close {
- color: #0a5c0a;
-}
.message.warning {
background-color: #d9d926;
border-color: #adad1f;
@@ -697,12 +681,6 @@ blockquote {
.message.warning header {
text-shadow: none;
}
-.message.warning .ico-close {
- color: #adad1f;
-}
-.message:hover .ico-close {
- display: block;
-}
.no-js #messages {
margin: 0 auto;
@@ -1150,56 +1128,16 @@ button.btn.link, button.btn.link:hover {
}
/* icons */
-.ico, .ico-l:before, .ico-r:after {
- font: normal 16px/4px "Pictos";
- text-decoration: none;
- width: 16px;
- height: 16px;
- display: inline-block;
-}
-
-.ico:before, .ico-l:before, .ico-r:after {
- content: attr(data-icon);
-}
-
-.ico {
- line-height: 4px;
-}
-
-.btn em, .ico + em {
+.btn em {
text-indent: -9999px;
position: absolute;
}
-.ico-l:before {
- margin-right: 10px;
-}
-
-.ico-r:after {
- margin-left: 10px;
-}
-
-.ico.active, a.active {
+a.active {
color: #0077aa !important;
text-shadow: white 0 1px 0, #0099cc 0 1px 6px;
}
-.ico.reverse {
- color: #fff !important;
- text-shadow: #333333 0 1px 0, #0099cc 0 1px 10px !important;
-}
-
-a .ico:active {
- opacity: 1;
-}
-
-a .ico:hover {
- opacity: .7;
-}
-
-nav .ico {
- text-transform: none;
-}
.x16 {font-size: 16px; width: 16px; height: 16px;}
.x24 {font-size: 24px; width: 24px; height: 24px;}
@@ -3452,11 +3390,6 @@ ul.dropdown ul li:first-child a {
/* end of User Profile styles from _user_profile.scss */
/* Use the right icon set for the User Activity and Send Message action buttons on User Profile */
.profile-section.activity h3 b.ico,
-#user-message b.ico {
- background-image: url('../images/neo-icon-set-ffffff-256x350.png');
- width: 16px;
- height: 16px;
-}
#user-message {
top: 10px;
}
http://git-wip-us.apache.org/repos/asf/allura/blob/5c2bf532/Allura/allura/nf/allura/images/neo-icon-set-454545-256x350.png
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/images/neo-icon-set-454545-256x350.png b/Allura/allura/nf/allura/images/neo-icon-set-454545-256x350.png
deleted file mode 100644
index d601259..0000000
Binary files a/Allura/allura/nf/allura/images/neo-icon-set-454545-256x350.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/allura/blob/5c2bf532/Allura/allura/nf/allura/images/neo-icon-set-ffffff-256x350.png
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/images/neo-icon-set-ffffff-256x350.png b/Allura/allura/nf/allura/images/neo-icon-set-ffffff-256x350.png
deleted file mode 100644
index 56f6f75..0000000
Binary files a/Allura/allura/nf/allura/images/neo-icon-set-ffffff-256x350.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/allura/blob/5c2bf532/Allura/allura/nf/allura/images/vote_down.png
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/images/vote_down.png b/Allura/allura/nf/allura/images/vote_down.png
deleted file mode 100644
index e91a0a7..0000000
Binary files a/Allura/allura/nf/allura/images/vote_down.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/allura/blob/5c2bf532/Allura/allura/nf/allura/images/vote_up.png
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/images/vote_up.png b/Allura/allura/nf/allura/images/vote_up.png
deleted file mode 100644
index 0da2deb..0000000
Binary files a/Allura/allura/nf/allura/images/vote_up.png and /dev/null differ