CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-10 02:17:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] Merge css.js

Browse Source
This commit is contained in:
Evan W. Patton
2016-09-28 20:21:02 -04:00
parent 890d274735
commit a44c6c5688
2 changed files with 29 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/css.js
View File

@@ -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;',

56
core/css.js.rej
View File

@@ -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;',