diff options
author | Eric Guzman | 2012-08-21 10:25:14 -0700 |
---|---|---|
committer | Eric Guzman | 2012-08-21 10:25:14 -0700 |
commit | b3567811595f33f8fa8bcf36cd5aaf749120334d (patch) | |
tree | d6cb3cef8015cefc8b607cf43b39f2333e6e4a60 | |
parent | 1e9d019867ff90840735ec531af5ebec9c7962e6 (diff) | |
download | ninja-b3567811595f33f8fa8bcf36cd5aaf749120334d.tar.gz |
Tools - Removed transition on tool button hover to prevent flicker
-rwxr-xr-x | css/ninja.css | 2 | ||||
-rwxr-xr-x | scss/imports/scss/_toolbar.scss | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/css/ninja.css b/css/ninja.css index 8e1666c2..82cda121 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -845,7 +845,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
845 | 845 | ||
846 | .toolsList hr { border: 0px; border-top: 1px solid #232323; border-bottom: 1px solid #3A3A3A; margin: 2px; width: 100%; } | 846 | .toolsList hr { border: 0px; border-top: 1px solid #232323; border-bottom: 1px solid #3A3A3A; margin: 2px; width: 100%; } |
847 | 847 | ||
848 | .toolbutton { width: 29px; height: 29px; background-position: center center; background-repeat: no-repeat; border-radius: 3px; opacity: 1; margin-bottom: 2px; -webkit-transform: scale(0.8); -webkit-transition: 0.15s all cubic-bezier(0.44, 0.19, 0, 0.99); } | 848 | .toolbutton { width: 29px; height: 29px; background-position: center center; background-repeat: no-repeat; border-radius: 3px; opacity: 1; margin-bottom: 2px; -webkit-transform: scale(0.8); } |
849 | 849 | ||
850 | .toolbutton:hover, .toolbutton.active { box-shadow: 0px 0px 2px 2px #999; -webkit-transform: scale(1); opacity: 1; } | 850 | .toolbutton:hover, .toolbutton.active { box-shadow: 0px 0px 2px 2px #999; -webkit-transform: scale(1); opacity: 1; } |
851 | 851 | ||
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss index 98b43535..54ea2aee 100755 --- a/scss/imports/scss/_toolbar.scss +++ b/scss/imports/scss/_toolbar.scss | |||
@@ -65,7 +65,6 @@ | |||
65 | opacity: 1; | 65 | opacity: 1; |
66 | margin-bottom: 2px; | 66 | margin-bottom: 2px; |
67 | -webkit-transform: scale(0.8); | 67 | -webkit-transform: scale(0.8); |
68 | -webkit-transition: 0.15s all cubic-bezier(.44,.19,0,.99); | ||
69 | } | 68 | } |
70 | 69 | ||
71 | .toolbutton:hover, .toolbutton.active { | 70 | .toolbutton:hover, .toolbutton.active { |