summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorGabriel Luong2013-05-23 17:09:26 (EDT)
committer libing wang2013-05-24 07:53:24 (EDT)
commit7e49a2836a88a2e7f0df17495af0ac50bdd01141 (patch)
treede932898876f80c0c0484431f68f618bd884017f
parentbb3087ff3a103d0c66ee20cfc1c7366c8bd9c610 (diff)
downloadorg.eclipse.orion.client-7e49a2836a88a2e7f0df17495af0ac50bdd01141.zip
org.eclipse.orion.client-7e49a2836a88a2e7f0df17495af0ac50bdd01141.tar.gz
org.eclipse.orion.client-7e49a2836a88a2e7f0df17495af0ac50bdd01141.tar.bz2
Bug 407773 - Add hover effects for the wrench buttons in the editor view
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/css/images.css21
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/css/theme.css2
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html2
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js8
4 files changed, 15 insertions, 18 deletions
diff --git a/bundles/org.eclipse.orion.client.ui/web/css/images.css b/bundles/org.eclipse.orion.client.ui/web/css/images.css
index 509356a..e2e5c3b 100644
--- a/bundles/org.eclipse.orion.client.ui/web/css/images.css
+++ b/bundles/org.eclipse.orion.client.ui/web/css/images.css
@@ -5,7 +5,7 @@
Use additional classes in theme.css or layout.css where more treatment is needed.
*/
-.logoFooter{
+.logoFooter {
background: url(../images/orion-logo.png) no-repeat top left;
width: 50px;
height: 28px;
@@ -119,23 +119,16 @@
}
.core-sprite-wrench {
- background: url(../images/wrench.png) no-repeat top left;
- vertical-align: middle;
- display: inline-block;
- margin-top: 4px;
- height: 16px;
- width: 16px;
+ background: url(../images/wrench.png) no-repeat center;
+ height: 21px;
+ width: 20px;
border: none;
- cursor: pointer;
}
.core-sprite-wrench-white {
- background: url(../images/wrench-white.png) no-repeat top left;
- vertical-align: middle;
- display: inline-block;
- margin-top: 4px;
- height: 16px;
- width: 16px;
+ background: url(../images/wrench-white.png) no-repeat center;
+ height: 21px;
+ width: 20px;
border: none;
}
diff --git a/bundles/org.eclipse.orion.client.ui/web/css/theme.css b/bundles/org.eclipse.orion.client.ui/web/css/theme.css
index d420b11..0903e34 100644
--- a/bundles/org.eclipse.orion.client.ui/web/css/theme.css
+++ b/bundles/org.eclipse.orion.client.ui/web/css/theme.css
@@ -235,7 +235,7 @@ a.currentLocation:hover {
.commandImage:hover, .commandImage:focus {
background-color: #e6e6e6;
- border: 1px solid #808080;
+ border: 1px solid #ccc;
}
/* should be used in conjunction with .commandButton when a tool has no icon. */
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html b/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html
index 72276cd..864d599 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html
@@ -1,7 +1,7 @@
<ul class="layoutLeft commandList pageActions" id="pageActions"></ul>
<ul class="layoutLeft commandList pageActions" id="selectionTools"></ul>
<div class="layoutRight" style="padding-left:7px;padding-right:7px;margin-top:4px;" id="settingsTab" style="visibility:hidden;">
- <button class="layoutRight core-sprite-wrench" id="settingsAction" aria-live="off" style="visibility:hidden;"></button>
+ <button class="layoutRight core-sprite-wrench commandImage" id="settingsAction" aria-live="off" style="visibility:hidden;"></button>
</div>
<div class="layoutRight status" id="statusPane" role="status" aria-live="off"></div>
<ul class="layoutRight commandList pageActions" id="pageNavigationActions"></ul>
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
index 870f995..5b6e20f 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
@@ -564,7 +564,9 @@ define(['i18n!orion/nls/messages', 'require', 'orion/commonHTMLFragments', 'orio
settingsNode.style.borderTopRightRadius = BORDER_RADIUS;
settingsNode.style.borderTopLeftRadius = BORDER_RADIUS;
- settingsButton.className = "core-sprite-wrench-white"; //$NON-NLS-0$
+ settingsButton.classList.remove("commandImage"); //$NON-NLS-0$
+ settingsButton.classList.remove("core-sprite-wrench"); //$NON-NLS-0$
+ settingsButton.classList.add("core-sprite-wrench-white"); //$NON-NLS-0$
settingsNode.id = 'settingsNode'; //$NON-NLS-0$
settingsButton.id = 'settingsButton'; //$NON-NLS-0$
@@ -588,7 +590,9 @@ define(['i18n!orion/nls/messages', 'require', 'orion/commonHTMLFragments', 'orio
rightPane.appendChild( panel );
lib.addAutoDismiss([settingsButton, settingsNode, panel], function() {
- settingsButton.className = "core-sprite-wrench"; //$NON-NLS-0$
+ settingsButton.classList.remove("core-sprite-wrench-white"); //$NON-NLS-0$
+ settingsButton.classList.add("core-sprite-wrench"); //$NON-NLS-0$
+ settingsButton.classList.add("commandImage"); //$NON-NLS-0$
settingsNode.style.backgroundColor = 'white'; //$NON-NLS-0$
panel.style.visibility = 'hidden'; //$NON-NLS-0$
CLICKED = false;