summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAnthony Hunter2013-06-13 14:38:07 (EDT)
committer Mark Macdonald2013-06-14 12:41:13 (EDT)
commit9920747d27c5e76e4dd07f0f8c27840050e79545 (patch)
tree1b0b8a2cce4ab83759ae6bed9153b9e43b8baee1
parent96a681c35c85ac694211ce5a6e430147be7fcd22 (diff)
downloadorg.eclipse.orion.client-9920747d27c5e76e4dd07f0f8c27840050e79545.zip
org.eclipse.orion.client-9920747d27c5e76e4dd07f0f8c27840050e79545.tar.gz
org.eclipse.orion.client-9920747d27c5e76e4dd07f0f8c27840050e79545.tar.bz2
Bug 410757 Mergesquash image needs to be added to the git sprites
-rw-r--r--bundles/org.eclipse.orion.client.git/web/git/css/git.css24
-rw-r--r--bundles/org.eclipse.orion.client.git/web/git/images/git_sprites.pngbin1986 -> 2028 bytes
2 files changed, 12 insertions, 12 deletions
diff --git a/bundles/org.eclipse.orion.client.git/web/git/css/git.css b/bundles/org.eclipse.orion.client.git/web/git/css/git.css
index b6dc57d..07e6419 100644
--- a/bundles/org.eclipse.orion.client.git/web/git/css/git.css
+++ b/bundles/org.eclipse.orion.client.git/web/git/css/git.css
@@ -98,15 +98,15 @@
.git-sprite-file{ background-position: 0 -144px; width: 16px; height: 16px; }
.git-sprite-incoming_commit{ background-position: 0 -162px; width: 16px; height: 16px; }
.git-sprite-merge{ background-position: 0 -180px; width: 16px; height: 16px; }
-.git-sprite-merge_squash{ background: url( ../images/mergesquash.png ) no-repeat top left; width: 16px; height: 16px; }
-.git-sprite-notsure{ background-position: 0 -198px; width: 16px; height: 16px; }
-.git-sprite-outgoing_commit{ background-position: 0 -216px; width: 16px; height: 16px; }
-.git-sprite-pull{ background-position: 0 -234px; width: 16px; height: 16px; }
-.git-sprite-rebase{ background-position: 0 -252px; width: 16px; height: 16px; }
-.git-sprite-remote{ background-position: 0 -270px; width: 16px; height: 16px; }
-.git-sprite-removal{ background-position: 0 -288px; width: 16px; height: 16px; }
-.git-sprite-repository{ background-position: 0 -306px; width: 16px; height: 16px; }
-.git-sprite-reset{ background-position: 0 -324px; width: 16px; height: 16px; }
-.git-sprite-stage{ background-position: 0 -342px; width: 16px; height: 16px; }
-.git-sprite-tag{ background-position: 0 -360px; width: 16px; height: 16px; }
-.git-sprite-unstage{ background-position: 0 -378px; width: 16px; height: 16px; }
+.git-sprite-merge_squash{ background-position: 0 -198px; width: 16px; height: 16px; }
+.git-sprite-notsure{ background-position: 0 -216px; width: 16px; height: 16px; }
+.git-sprite-outgoing_commit{ background-position: 0 -234px; width: 16px; height: 16px; }
+.git-sprite-pull{ background-position: 0 -252px; width: 16px; height: 16px; }
+.git-sprite-rebase{ background-position: 0 -270px; width: 16px; height: 16px; }
+.git-sprite-remote{ background-position: 0 -288px; width: 16px; height: 16px; }
+.git-sprite-removal{ background-position: 0 -306px; width: 16px; height: 16px; }
+.git-sprite-repository{ background-position: 0 -324px; width: 16px; height: 16px; }
+.git-sprite-reset{ background-position: 0 -342px; width: 16px; height: 16px; }
+.git-sprite-stage{ background-position: 0 -360px; width: 16px; height: 16px; }
+.git-sprite-tag{ background-position: 0 -378px; width: 16px; height: 16px; }
+.git-sprite-unstage{ background-position: 0 -396px; width: 16px; height: 16px; } \ No newline at end of file
diff --git a/bundles/org.eclipse.orion.client.git/web/git/images/git_sprites.png b/bundles/org.eclipse.orion.client.git/web/git/images/git_sprites.png
index 9a82a23..788fff5 100644
--- a/bundles/org.eclipse.orion.client.git/web/git/images/git_sprites.png
+++ b/bundles/org.eclipse.orion.client.git/web/git/images/git_sprites.png
Binary files differ