diff options
| author | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
| commit | d9f9a65226dfe26500e82061cc38a7dda302f720 (patch) | |
| tree | 32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /css | |
| parent | 1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff) | |
| parent | 9fe9bc495af74d963fa7061d4d1a479720133a56 (diff) | |
| download | ninja-d9f9a65226dfe26500e82061cc38a7dda302f720.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/hintable.reel/hintable.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'css')
| -rwxr-xr-x | css/ninja.css | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/css/ninja.css b/css/ninja.css index f57ff824..212cf831 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
| @@ -677,7 +677,9 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul | |||
| 677 | 677 | ||
| 678 | .toolOptionsSpacer { margin-right: 9px; } | 678 | .toolOptionsSpacer { margin-right: 9px; } |
| 679 | 679 | ||
| 680 | .toolColorChipCtrl { width: 18px; height: 18px; margin-top: 1px; margin-left: 3px; margin-right: 8px; border: 1px black solid; } | 680 | .toolColorChipCtrl { width: 16px; height: 16px; border: 1px #000 solid; } |
| 681 | |||
| 682 | .toolColorChipContainer { background: url(../../../../../images/colorpanel/transparent.png) repeat; width: 18px; height: 18px; margin-top: 1px; margin-left: 3px; margin-right: 8px; border: 1px #777 solid; } | ||
| 681 | 683 | ||
| 682 | .toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; } | 684 | .toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; } |
| 683 | 685 | ||