diff --git a/core/css.js b/core/css.js index 53a71f9d8..6e7d26e46 100644 --- a/core/css.js +++ b/core/css.js @@ -419,13 +419,40 @@ Blockly.Css.CONTENT = [ 'stroke-width: 1;', 'stroke: #c6c6c6;', /* Equates to #ddd due to border being off-pixel. */ '}', - + '.blocklyContextMenuBackground,', '.blocklyMutatorBackground {', 'fill: #fff;', 'stroke: #ddd;', 'stroke-width: 1;', '}', - + '.blocklyContextMenuOptions>.blocklyMenuDiv,', + '.blocklyContextMenuOptions>.blocklyMenuDivDisabled,', + '.blocklyDropdownMenuOptions>.blocklyMenuDiv {', + ' fill: #fff;', + '}', + '.blocklyContextMenuOptions>.blocklyMenuDiv:hover>rect,', + '.blocklyDropdownMenuOptions>.blocklyMenuDiv:hover>rect {', + ' fill: #57e;', + '}', + '.blocklyMenuSelected>rect {', + ' fill: #57e;', + '}', + '.blocklyMenuText {', + ' cursor: default !important;', + ' font-family: sans-serif;', + ' font-size: 15px; /* All context menu sizes are based on pixels. */', + ' fill: #000;', + '}', + '.blocklyContextMenuOptions>.blocklyMenuDiv:hover>.blocklyMenuText,', + '.blocklyDropdownMenuOptions>.blocklyMenuDiv:hover>.blocklyMenuText {', + ' fill: #fff;', + '}', + '.blocklyMenuSelected>.blocklyMenuText {', + ' fill: #fff;', + '}', + '.blocklyMenuDivDisabled>.blocklyMenuText {', + ' fill: #ccc;', + '}', '.blocklyFlyoutBackground {', 'fill: #ddd;', 'fill-opacity: .8;', diff --git a/core/css.js.rej b/core/css.js.rej deleted file mode 100644 index 21e26c1a6..000000000 --- a/core/css.js.rej +++ /dev/null @@ -1,56 +0,0 @@ -*************** -*** 355,367 **** - ' outline: none;', - ' width: 100%', - '}', -- - '.blocklyMutatorBackground {', - ' fill: #fff;', - ' stroke-width: 1;', - ' stroke: #ddd;', - '}', -- - '.blocklyFlyoutBackground {', - ' fill: #ddd;', - ' fill-opacity: .8;', ---- 438,477 ---- - ' outline: none;', - ' width: 100%', - '}', -+ '.blocklyContextMenuBackground,', - '.blocklyMutatorBackground {', - ' fill: #fff;', - ' stroke-width: 1;', - ' stroke: #ddd;', - '}', -+ '.blocklyContextMenuOptions>.blocklyMenuDiv,', -+ '.blocklyContextMenuOptions>.blocklyMenuDivDisabled,', -+ '.blocklyDropdownMenuOptions>.blocklyMenuDiv {', -+ ' fill: #fff;', -+ '}', -+ '.blocklyContextMenuOptions>.blocklyMenuDiv:hover>rect,', -+ '.blocklyDropdownMenuOptions>.blocklyMenuDiv:hover>rect {', -+ ' fill: #57e;', -+ '}', -+ '.blocklyMenuSelected>rect {', -+ ' fill: #57e;', -+ '}', -+ '.blocklyMenuText {', -+ ' cursor: default !important;', -+ ' font-family: sans-serif;', -+ ' font-size: 15px; /* All context menu sizes are based on pixels. */', -+ ' fill: #000;', -+ '}', -+ '.blocklyContextMenuOptions>.blocklyMenuDiv:hover>.blocklyMenuText,', -+ '.blocklyDropdownMenuOptions>.blocklyMenuDiv:hover>.blocklyMenuText {', -+ ' fill: #fff;', -+ '}', -+ '.blocklyMenuSelected>.blocklyMenuText {', -+ ' fill: #fff;', -+ '}', -+ '.blocklyMenuDivDisabled>.blocklyMenuText {', -+ ' fill: #ccc;', -+ '}', - '.blocklyFlyoutBackground {', - ' fill: #ddd;', - ' fill-opacity: .8;',