You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/10/28 19:01:28 UTC
[06/50] [abbrv] allura git commit: [#7924] ticket:858 Make merge icon
different from fork icon
[#7924] ticket:858 Make merge icon different from fork icon
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/13e194a9
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/13e194a9
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/13e194a9
Branch: refs/heads/hs/7919
Commit: 13e194a96461209015aac41b714eb44d7d95548b
Parents: c58d432
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Oct 27 17:03:02 2015 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Oct 27 17:03:02 2015 +0200
----------------------------------------------------------------------
Allura/allura/lib/app_globals.py | 2 +-
Allura/allura/nf/allura/css/site_style.css | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/13e194a9/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index f03da38..c6b52d3 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -246,7 +246,7 @@ class Globals(object):
pin=Icon('fa fa-mail-pin', 'Pin'),
folder=Icon('fa fa-folder', 'Folder'),
fork=Icon('fa fa-code-fork', 'Fork'),
- merge=Icon('fa fa-code-fork', 'Merge'), # TODO: use something else here
+ merge=Icon('fa fa-code-fork upside-down', 'Merge'),
conversation=Icon('fa fa-comments', 'Conversation'),
group=Icon('fa fa-group', 'Group'),
user=Icon('fa fa-user', 'User'),
http://git-wip-us.apache.org/repos/asf/allura/blob/13e194a9/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 aec0062..2237a87 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -1128,6 +1128,11 @@ button.btn.link, button.btn.link:hover {
}
/* icons */
+.fa.upside-down {
+ transform: scale(1, -1);
+ -moz-transform: scale(1, -1);
+ -webkit-transform: scale(1, -1);
+}
.btn em {
text-indent: -9999px;
position: absolute;