test/functional/context_menu/test_theme.html @@ -61,7 +61,7 @@ </head> <body> <div id="contextArea">Desktop Theme</div> - <div id="contextAreaMacOsX">Mac OS X Theme</div> + <div id="contextAreaMacOsX">Aqua Theme</div> <ul id="options"> <li> <label for="showEffect">showEffect</label> test/functional/context_menu/test_context_menu.html @@ -64,7 +64,7 @@ <h2>Context Menu</h2> <ul> <li><a href="context_menu/test_context_menu.html" target="test">Context Menu test</a></li> - <li><a href="context_menu/test_leopard_theme.html" target="test">Leopard Theme test</a></li> + <li><a href="context_menu/test_theme.html" target="test">Theme test</a></li> </ul> <h2>DataGrid</h2> <ul> test/functional/index.html @@ -1,17 +1,17 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>Event.simulateMouse</title> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - - <script src="../../lib/prototype.js" type="text/javascript"></script> - <script src="../lib/unittest.js" type="text/javascript"></script> - <script src="../lib/event_simulate_mouse.js" type="text/javascript"></script> - - <link rel="stylesheet" href="../assets/test.css" type="text/css" /> - -</head> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>Event.simulateMouse</title> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> + + <script src="../../lib/prototype.js" type="text/javascript"></script> + <script src="../lib/unittest.js" type="text/javascript"></script> + <script src="../lib/event_simulate_mouse.js" type="text/javascript"></script> + + <link rel="stylesheet" href="../assets/test.css" type="text/css" /> + +</head> <body> <div id="content"> @@ -21,260 +21,260 @@ <p> This file tests drag methods from <strong>../lib/event_simulate_mouse.js</strong>. </p> - </div> - - <div id="dummy"></div> - -  - <div id="testlog"> </div> -</div> - -<script type="text/javascript" language="javascript" charset="utf-8"> -// <![CDATA[ - - var WAIT_TIME = 300, - EVENTS = $w('click dblclick mousedown mouseup mousemove mouseover mouseout contextmenu'); - - function getRandomInt(min, max) { - return Math.floor(Math.random() * (max - min + 1)) + min; - } - - var dummy = $('dummy'), - originalStyle = { - width: '50px', - height: '20px', - background: '#bbf' - }; - - dummy.setStyle(originalStyle); - - new Test.Unit.Runner({ - - // stripping observers, resetting styles - teardown: function() { with(this) { - dummy.stopObserving(); - dummy.setStyle(originalStyle); - }}, - - testClick: function(){ with(this) { - var value = getRandomInt(10, 100); - $('dummy').observe('click', function(){ this.setStyle({width: value + 'px'}) }); - Event.simulateMouse('dummy', 'click'); - wait(WAIT_TIME, function() { - assertEqual(value, dummy.getWidth()); - }) - }}, - - testDblClick: function(){ with(this) { - var value = getRandomInt(10, 100); - $('dummy').observe('dblclick', function(){ this.setStyle({width: value + 'px'}) }); - Event.simulateMouse('dummy', 'dblclick'); - wait(WAIT_TIME, function() { - assertEqual(value, dummy.getWidth()); - }) - }}, - - testMouseDown: function() { with(this) { - var value = getRandomInt(10, 100); - $('dummy').observe('mousedown', function(){ this.setStyle({width: value + 'px'}) }); - Event.simulateMouse('dummy', 'mousedown'); - wait(WAIT_TIME, function(){ - assertEqual(value, dummy.getWidth()); - }) - }}, - - testMouseUp: function() { with(this) { - var value = getRandomInt(10, 100); - $('dummy').observe('mouseup', function(){ this.setStyle({width: value + 'px'}) }); - Event.simulateMouse('dummy', 'mouseup'); - wait(WAIT_TIME, function() { - assertEqual(value, dummy.getWidth()); - }) - }}, - - testMouseOver: function() { with(this) { - var value = getRandomInt(10, 100); - $('dummy').observe('mouseover', function(){ this.setStyle({width: value + 'px'}) }); - Event.simulateMouse('dummy', 'mouseover'); - wait(WAIT_TIME, function(){ - assertEqual(value, dummy.getWidth()); - }) - }}, - - testMouseMove: function() { with(this) { - var value = getRandomInt(10, 100); - $('dummy').observe('mousemove', function(){ this.setStyle({width: value + 'px'}) }); - Event.simulateMouse('dummy', 'mousemove'); - wait(WAIT_TIME, function() { - assertEqual(value, dummy.getWidth()); - }) - }}, - - testMouseOut: function() { with(this) { - var value = getRandomInt(10, 100); - $('dummy').observe('mouseout', function(){ this.setStyle({width: value + 'px'}) }); - Event.simulateMouse('dummy', 'mouseout'); - wait(WAIT_TIME, function() { - assertEqual(value, dummy.getWidth()); - }) - }}, - - // Misc events - testContextMenu: function() { with(this) { - var value = getRandomInt(10, 100); - $('dummy').observe('contextmenu', function(){ this.setStyle({width: value + 'px'}) }); - Event.simulateMouse('dummy', 'contextmenu'); - wait(WAIT_TIME, function() { - assertEqual(value, dummy.getWidth()); - }) - }}, - - // Event properties - testCtrlKeyTrue: function() { with(this) { - var value = getRandomInt(10, 100), - key = null; - $('dummy').observe('click', function(e){ - this.setStyle({width: value + 'px'}); - key = e.ctrlKey; - }) - Event.simulateMouse('dummy', 'click', {ctrlKey: true}); - wait(WAIT_TIME, function(){ - assertEqual(value, dummy.getWidth()); - assertIdentical(true, key); - }) - }}, - - testCtrlKeyFalse: function() { with(this) { - var value = getRandomInt(10, 100), - key = null; - $('dummy').observe('click', function(e){ - this.setStyle({width: value + 'px'}); - key = e.ctrlKey; - }) - Event.simulateMouse('dummy', 'click', {ctrlKey: false}); - wait(WAIT_TIME, function(){ - assertEqual(value, dummy.getWidth()); - assertIdentical(false, key); - }) - }}, - - testAltKeyTrue: function() { with(this) { - var value = getRandomInt(10, 100), - key = null; - $('dummy').observe('click', function(e){ - this.setStyle({width: value + 'px'}); - key = e.altKey; - }) - Event.simulateMouse('dummy', 'click', {altKey: true}); - wait(WAIT_TIME, function(){ - assertEqual(value, dummy.getWidth()); - assertIdentical(true, key); - }) - }}, - - testAltKeyFalse: function() { with(this) { - var value = getRandomInt(10, 100), - key = null; - $('dummy').observe('click', function(e){ - this.setStyle({width: value + 'px'}); - key = e.altKey; - }) - Event.simulateMouse('dummy', 'click', {altKey: false}); - wait(WAIT_TIME, function(){ - assertEqual(value, dummy.getWidth()); - assertIdentical(false, key); - }) - }}, - - testShiftKeyTrue: function() { with(this) { - var value = getRandomInt(10, 100), - key = null; - $('dummy').observe('click', function(e){ - this.setStyle({width: value + 'px'}); - key = e.shiftKey; - }) - Event.simulateMouse('dummy', 'click', {shiftKey: true}); - wait(WAIT_TIME, function(){ - assertEqual(value, dummy.getWidth()); - assertIdentical(true, key); - }) - }}, - - testShiftKeyFalse: function() { with(this) { - var value = getRandomInt(10, 100), - key = null; - $('dummy').observe('click', function(e){ - this.setStyle({width: value + 'px'}); - key = e.shiftKey; - }) - Event.simulateMouse('dummy', 'click', {shiftKey: false}); - wait(WAIT_TIME, function(){ - assertEqual(value, dummy.getWidth()); - assertIdentical(false, key); - }) - }}, - - testMetaKeyTrue: function() { with(this) { - var value = getRandomInt(10, 100), - key = null; - $('dummy').observe('click', function(e){ - this.setStyle({width: value + 'px'}); - key = e.metaKey; - }) - Event.simulateMouse('dummy', 'click', {metaKey: true}); - wait(WAIT_TIME, function(){ - assertEqual(value, dummy.getWidth()); - assertIdentical(true, key); - }) - }}, - - testMetaKeyFalse: function() { with(this) { - var value = getRandomInt(10, 100), - key = null; - $('dummy').observe('click', function(e){ - this.setStyle({width: value + 'px'}); - key = e.metaKey; - }) - Event.simulateMouse('dummy', 'click', {metaKey: false}); - wait(WAIT_TIME, function(){ - assertEqual(value, dummy.getWidth()); - assertIdentical(false, key); - }) - }}, - - testPointerXPointerY: function() { with(this) { - var value = getRandomInt(10, 100), - x = null, - y = null; - $('dummy').observe('click', function(e){ - this.setStyle({width: value + 'px'}); - x = e.pointerX(); - y = e.pointerY(); - }) - Event.simulateMouse('dummy', 'click', {pointerX: 50, pointerY: 60}); - wait(WAIT_TIME, function(){ - assertEqual(value, dummy.getWidth()); - assertEqual(50, x); - assertEqual(60, y); - }) - }}, - - testElement: function() { with(this) { - var value = getRandomInt(10, 100), - element = null; - $('dummy').observe('click', function(e){ - this.setStyle({width: value + 'px'}); - element = e.element(); - }) - wait(WAIT_TIME, function(){ - Event.simulateMouse('dummy', 'click'); - assertEqual(value, dummy.getWidth()); - assertEqual(element, dummy); - }) - }} -}); - -// ]]> -</script> -</body> + </div> + + <div id="dummy"></div> + +  + <div id="testlog"> </div> +</div> + +<script type="text/javascript" language="javascript" charset="utf-8"> +// <![CDATA[ + + var WAIT_TIME = 300, + EVENTS = $w('click dblclick mousedown mouseup mousemove mouseover mouseout contextmenu'); + + function getRandomInt(min, max) { + return Math.floor(Math.random() * (max - min + 1)) + min; + } + + var dummy = $('dummy'), + originalStyle = { + width: '50px', + height: '20px', + background: '#bbf' + }; + + dummy.setStyle(originalStyle); + + new Test.Unit.Runner({ + + // stripping observers, resetting styles + teardown: function() { with(this) { + dummy.stopObserving(); + dummy.setStyle(originalStyle); + }}, + + testClick: function(){ with(this) { + var value = getRandomInt(10, 100); + $('dummy').observe('click', function(){ this.setStyle({width: value + 'px'}) }); + Event.simulateMouse('dummy', 'click'); + wait(WAIT_TIME, function() { + assertEqual(value, dummy.getWidth()); + }) + }}, + + testDblClick: function(){ with(this) { + var value = getRandomInt(10, 100); + $('dummy').observe('dblclick', function(){ this.setStyle({width: value + 'px'}) }); + Event.simulateMouse('dummy', 'dblclick'); + wait(WAIT_TIME, function() { + assertEqual(value, dummy.getWidth()); + }) + }}, + + testMouseDown: function() { with(this) { + var value = getRandomInt(10, 100); + $('dummy').observe('mousedown', function(){ this.setStyle({width: value + 'px'}) }); + Event.simulateMouse('dummy', 'mousedown'); + wait(WAIT_TIME, function(){ + assertEqual(value, dummy.getWidth()); + }) + }}, + + testMouseUp: function() { with(this) { + var value = getRandomInt(10, 100); + $('dummy').observe('mouseup', function(){ this.setStyle({width: value + 'px'}) }); + Event.simulateMouse('dummy', 'mouseup'); + wait(WAIT_TIME, function() { + assertEqual(value, dummy.getWidth()); + }) + }}, + + testMouseOver: function() { with(this) { + var value = getRandomInt(10, 100); + $('dummy').observe('mouseover', function(){ this.setStyle({width: value + 'px'}) }); + Event.simulateMouse('dummy', 'mouseover'); + wait(WAIT_TIME, function(){ + assertEqual(value, dummy.getWidth()); + }) + }}, + + testMouseMove: function() { with(this) { + var value = getRandomInt(10, 100); + $('dummy').observe('mousemove', function(){ this.setStyle({width: value + 'px'}) }); + Event.simulateMouse('dummy', 'mousemove'); + wait(WAIT_TIME, function() { + assertEqual(value, dummy.getWidth()); + }) + }}, + + testMouseOut: function() { with(this) { + var value = getRandomInt(10, 100); + $('dummy').observe('mouseout', function(){ this.setStyle({width: value + 'px'}) }); + Event.simulateMouse('dummy', 'mouseout'); + wait(WAIT_TIME, function() { + assertEqual(value, dummy.getWidth()); + }) + }}, + + // Misc events + testContextMenu: function() { with(this) { + var value = getRandomInt(10, 100); + $('dummy').observe('contextmenu', function(){ this.setStyle({width: value + 'px'}) }); + Event.simulateMouse('dummy', 'contextmenu'); + wait(WAIT_TIME, function() { + assertEqual(value, dummy.getWidth()); + }) + }}, + + // Event properties + testCtrlKeyTrue: function() { with(this) { + var value = getRandomInt(10, 100), + key = null; + $('dummy').observe('click', function(e){ + this.setStyle({width: value + 'px'}); + key = e.ctrlKey; + }) + Event.simulateMouse('dummy', 'click', {ctrlKey: true}); + wait(WAIT_TIME, function(){ + assertEqual(value, dummy.getWidth()); + assertIdentical(true, key); + }) + }}, + + testCtrlKeyFalse: function() { with(this) { + var value = getRandomInt(10, 100), + key = null; + $('dummy').observe('click', function(e){ + this.setStyle({width: value + 'px'}); + key = e.ctrlKey; + }) + Event.simulateMouse('dummy', 'click', {ctrlKey: false}); + wait(WAIT_TIME, function(){ + assertEqual(value, dummy.getWidth()); + assertIdentical(false, key); + }) + }}, + + testAltKeyTrue: function() { with(this) { + var value = getRandomInt(10, 100), + key = null; + $('dummy').observe('click', function(e){ + this.setStyle({width: value + 'px'}); + key = e.altKey; + }) + Event.simulateMouse('dummy', 'click', {altKey: true}); + wait(WAIT_TIME, function(){ + assertEqual(value, dummy.getWidth()); + assertIdentical(true, key); + }) + }}, + + testAltKeyFalse: function() { with(this) { + var value = getRandomInt(10, 100), + key = null; + $('dummy').observe('click', function(e){ + this.setStyle({width: value + 'px'}); + key = e.altKey; + }) + Event.simulateMouse('dummy', 'click', {altKey: false}); + wait(WAIT_TIME, function(){ + assertEqual(value, dummy.getWidth()); + assertIdentical(false, key); + }) + }}, + + testShiftKeyTrue: function() { with(this) { + var value = getRandomInt(10, 100), + key = null; + $('dummy').observe('click', function(e){ + this.setStyle({width: value + 'px'}); + key = e.shiftKey; + }) + Event.simulateMouse('dummy', 'click', {shiftKey: true}); + wait(WAIT_TIME, function(){ + assertEqual(value, dummy.getWidth()); + assertIdentical(true, key); + }) + }}, + + testShiftKeyFalse: function() { with(this) { + var value = getRandomInt(10, 100), + key = null; + $('dummy').observe('click', function(e){ + this.setStyle({width: value + 'px'}); + key = e.shiftKey; + }) + Event.simulateMouse('dummy', 'click', {shiftKey: false}); + wait(WAIT_TIME, function(){ + assertEqual(value, dummy.getWidth()); + assertIdentical(false, key); + }) + }}, + + testMetaKeyTrue: function() { with(this) { + var value = getRandomInt(10, 100), + key = null; + $('dummy').observe('click', function(e){ + this.setStyle({width: value + 'px'}); + key = e.metaKey; + }) + Event.simulateMouse('dummy', 'click', {metaKey: true}); + wait(WAIT_TIME, function(){ + assertEqual(value, dummy.getWidth()); + assertIdentical(true, key); + }) + }}, + + testMetaKeyFalse: function() { with(this) { + var value = getRandomInt(10, 100), + key = null; + $('dummy').observe('click', function(e){ + this.setStyle({width: value + 'px'}); + key = e.metaKey; + }) + Event.simulateMouse('dummy', 'click', {metaKey: false}); + wait(WAIT_TIME, function(){ + assertEqual(value, dummy.getWidth()); + assertIdentical(false, key); + }) + }}, + + testPointerXPointerY: function() { with(this) { + var value = getRandomInt(10, 100), + x = null, + y = null; + $('dummy').observe('click', function(e){ + this.setStyle({width: value + 'px'}); + x = e.pointerX(); + y = e.pointerY(); + }) + Event.simulateMouse('dummy', 'click', {pointerX: 50, pointerY: 60}); + wait(WAIT_TIME, function(){ + assertEqual(value, dummy.getWidth()); + assertEqual(50, x); + assertEqual(60, y); + }) + }}, + + testElement: function() { with(this) { + var value = getRandomInt(10, 100), + element = null; + $('dummy').observe('click', function(e){ + this.setStyle({width: value + 'px'}); + element = e.element(); + }) + wait(WAIT_TIME, function(){ + Event.simulateMouse('dummy', 'click'); + assertEqual(value, dummy.getWidth()); + assertEqual(element, dummy); + }) + }} +}); + +// ]]> +</script> +</body> </html> \ No newline at end of file test/unit/event_simulate_mouse_test.html @@ -1,30 +1,28 @@ -/* MAC OS X STYLES */ - -.aqua_ui_menu { +.ui-context_menu__aqua { width: 12em; background: url(aqua/bg.png) repeat; } -.aqua_ui_menu ul { +.ui-context_menu__aqua ul { border: 1px solid #c3c3c3; padding: 2px 0; } -.aqua_ui_menu a { +.ui-context_menu__aqua a { color: #555; padding: 2px 15px; margin: 0 2px; } -.aqua_ui_menu a:hover { +.ui-context_menu__aqua a:hover { background: #3875D7; color: #fff; } -.aqua_ui_menu a.disabled { +.ui-context_menu__aqua a.disabled { color: #bbb; } -.aqua_ui_menu a.disabled:hover { +.ui-context_menu__aqua a.disabled:hover { background: url(aqua/bg.png) repeat; color: #bbb; } -.aqua_ui_menu .separator { +.ui-context_menu__aqua .separator { background: url(aqua/separator.png) repeat-x; height: 2px; margin: 2px; themes/context_menu/aqua.css @@ -1,32 +1,30 @@ -/* GENERAL STYLES */ - -.ui_menu { +.ui-context_menu { position: absolute; top: 0; left: 0; font-family: verdana; } -.ui_menu a { +.ui-context_menu a { display: block; text-decoration: none; cursor: default; outline: none; font-size: 11px; } -.ui_menu .separator { +.ui-context_menu .separator { height: 1px; padding: 0; overflow: hidden; display: block; } -.ui_menu ul, .ui_menu li { +.ui-context_menu ul, .ui-context_menu li { margin: 0; padding: 0; list-style: none; } -.ui_menu .submenu { +.ui-context_menu .submenu { position: relative; } -.ui_menu .submenu .ui_menu { +.ui_menu-context .submenu .ui-context_menu { position: absolute; } \ No newline at end of file themes/context_menu/context_menu.css @@ -1,35 +1,33 @@ -/* DESKTOP STYLES */ - -.desktop_ui_menu { - width: 14em; - background: #f9f8f7; -} -.desktop_ui_menu ul{ - border: 1px solid #666; - padding: 1px 0; -} -.desktop_ui_menu a { - color: #555; - padding: 3px 0 3px 25px; - margin: 0 1px; - border: 1px solid #f9f8f7; - cursor: pointer; -} -.desktop_ui_menu a.disabled { - color: #bbb; - cursor: default; -} -.desktop_ui_menu .separator { - border-bottom: 1px solid #fff; - background: #999; - margin: 2px 4px; -} -.desktop_ui_menu a:hover { - background-color: #b6bdd2; - border: 1px solid #0a246a; -} -.desktop_ui_menu a.disabled:hover { - background: #f9f8f7; - color: #bbb; - border: 1px solid #f9f8f7; +.ui-context_menu__desktop { + width: 14em; + background: #f9f8f7; +} +.ui-context_menu__desktop ul{ + border: 1px solid #666; + padding: 1px 0; +} +.ui-context_menu__desktop a { + color: #555; + padding: 3px 0 3px 25px; + margin: 0 1px; + border: 1px solid #f9f8f7; + cursor: pointer; +} +.ui-context_menu__desktop a.disabled { + color: #bbb; + cursor: default; +} +.ui-context_menu__desktop .separator { + border-bottom: 1px solid #fff; + background: #999; + margin: 2px 4px; +} +.ui-context_menu__desktop a:hover { + background-color: #b6bdd2; + border: 1px solid #0a246a; +} +.ui-context_menu__desktop a.disabled:hover { + background: #f9f8f7; + color: #bbb; + border: 1px solid #f9f8f7; } \ No newline at end of file themes/context_menu/desktop.css @@ -1,34 +1,32 @@ -/* FIREFOX STYLES */ - -.firefox_ui_menu { - width: 12em; - background: #F4F5EB; -} -.firefox_ui_menu ul { - border-top: 1px solid #ddd; - border-left: 1px solid #ddd; - border-right: 1px solid #666; - border-bottom: 1px solid #666; - padding: 2px 0; -} -.firefox_ui_menu a { - color: #555; - padding: 4px 15px; - margin: 0 2px; -} -.firefox_ui_menu a:hover { - background: #006; - color: #fff; -} -.firefox_ui_menu a.disabled { - color: #bbb; -} -.firefox_ui_menu a.disabled:hover { - background: #F4F5EB; - color: #bbb; -} -.firefox_ui_menu .separator { - border-bottom: 1px solid #fff; - background: #999; - margin: 2px 4px; +.ui-context_menu__firefox { + width: 12em; + background: #F4F5EB; +} +.ui-context-menu__firefox ul { + border-top: 1px solid #ddd; + border-left: 1px solid #ddd; + border-right: 1px solid #666; + border-bottom: 1px solid #666; + padding: 2px 0; +} +.ui-context-menu__firefox a { + color: #555; + padding: 4px 15px; + margin: 0 2px; +} +.ui-context-menu__firefox a:hover { + background: #006; + color: #fff; +} +.ui-context-menu__firefox a.disabled { + color: #bbb; +} +.ui-context_menu__firefox a.disabled:hover { + background: #F4F5EB; + color: #bbb; +} +.ui-context_menu__firefox .separator { + border-bottom: 1px solid #fff; + background: #999; + margin: 2px 4px; } \ No newline at end of file themes/context_menu/firefox.css @@ -1,32 +1,30 @@ -/* GOOGLE STYLES */ - -.google_ui_menu { - width: 10.5em; - background: #fff; -} -.google_ui_menu ul { - border-top: 1px solid #ccc; - border-left: 1px solid #ccc; - border-bottom: 1px solid #676767; - border-right: 1px solid #676767; -} -.google_ui_menu a { - color: #00c; - text-decoration: none; - padding: 2px 5px; - cursor: pointer; - font-size: 12px; -} -.google_ui_menu a:hover { - background: #D3E3FE; -} -.google_ui_menu a.disabled { - color: #bbb; -} -.google_ui_menu a.disabled:hover { - background: #fff; - color: #bbb; -} -.google_ui_menu .separator { - background: #ccc; +.ui-context_menu__google { + width: 10.5em; + background: #fff; +} +.ui-context_menu__google ul { + border-top: 1px solid #ccc; + border-left: 1px solid #ccc; + border-bottom: 1px solid #676767; + border-right: 1px solid #676767; +} +.ui-context_menu__google a { + color: #00c; + text-decoration: none; + padding: 2px 5px; + cursor: pointer; + font-size: 12px; +} +.ui-context_menu__google a:hover { + background: #D3E3FE; +} +.ui-context_menu__google a.disabled { + color: #bbb; +} +.ui-context_menu__google a.disabled:hover { + background: #fff; + color: #bbb; +} +.ui-context_menu__google .separator { + background: #ccc; } \ No newline at end of file themes/context_menu/google.css @@ -1,13 +1,11 @@ -/* MAC OS X STYLES */ - -.osx_ui_menu { +.ui-context_menu__osx { width: 12em; background:#FFF; } -.osx_ui_menu ul { +.ui-context_menu__osx ul { padding: 2px 0; } -.osx_ui_menu a { +.ui-context_menu__osx a { color: #333; padding: 0px 15px; margin: 0 0px; @@ -16,18 +14,18 @@ height:22px; line-height:22px; } -.osx_ui_menu a:hover { +.ui-context_menu__osx a:hover { background: url(osx/selected_bg.png); color: #fff; } -.osx_ui_menu a.disabled { +.ui-context_menu__osx a.disabled { color: #bbb; } -.osx_ui_menu a.disabled:hover { +.ui-context_menu__osx a.disabled:hover { background: #FFF; color: #bbb; } -.osx_ui_menu .separator { +.ui-context_menu__osx .separator { background: #e2e4e3; height: 1px; margin: 2px; themes/context_menu/osx.css 3f109b0c5023bdd1049d5485200026fa91df495e 05e4d7d16c97939b488ec166db9d2bda1cc55020 Sven G. Brönstrup broenstrup@spom.net http://github.com/starpeak/prototypeui/commit/ea63108fb4a2ec10cefcba7f4b90ff514eabcce4 ea63108fb4a2ec10cefcba7f4b90ff514eabcce4

2008-07-13T10:26:59-07:00

Merge branch 'master' of git://github.com/charettes/prototypeui Conflicts: themes/context_menu/osx.css 12a71c36548f7adafe511c318905d905b56709b9 Sven G. Brönstrup broenstrup@spom.net