Skip to content

Commit

Permalink
fix: Fix errors in injected CSS (google#5587)
Browse files Browse the repository at this point in the history
  • Loading branch information
moniika authored Oct 7, 2021
1 parent 03e164e commit ca61d8c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
21 changes: 10 additions & 11 deletions core/css.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const CONTENT = [
right: 0;
bottom: 0;
overflow: visible !important;
z-index: 50;', /* Display below toolbox, but above everything else. */
z-index: 50; /* Display below toolbox, but above everything else. */
}`,

`.blocklyBlockCanvas.blocklyCanvasTransitioning,
Expand All @@ -148,7 +148,7 @@ const CONTENT = [
opacity: .9;
padding: 2px;
position: absolute;
z-index: 100000;', /* big value for bootstrap3 compatibility */
z-index: 100000; /* big value for bootstrap3 compatibility */
}`,

`.blocklyDropDownDiv {
Expand All @@ -168,9 +168,8 @@ const CONTENT = [
`.blocklyDropDownDiv.blocklyFocused {
box-shadow: 0 0 6px 1px rgba(0,0,0,.3);
}`,

`.blocklyDropDownContent {
max-height: 300px;', // @todo: spec for maximum height.
max-height: 300px;
overflow: auto;
overflow-x: hidden;
position: relative;
Expand Down Expand Up @@ -392,7 +391,7 @@ const CONTENT = [

`.blocklyMainBackground {
stroke-width: 1;
stroke: #c6c6c6;', /* Equates to #ddd due to border being off-pixel. */
stroke: #c6c6c6; /* Equates to #ddd due to border being off-pixel. */
}`,

`.blocklyMutatorBackground {
Expand Down Expand Up @@ -498,20 +497,20 @@ const CONTENT = [
overflow-y: auto;
overflow-x: hidden;
max-height: 100%;
z-index: 20000;', /* Arbitrary, but some apps depend on it... */
z-index: 20000; /* Arbitrary, but some apps depend on it... */
}`,

`.blocklyWidgetDiv .blocklyMenu.blocklyFocused {
box-shadow: 0 0 6px 1px rgba(0,0,0,.3);
}`,

`.blocklyDropDownDiv .blocklyMenu {
background: inherit;', /* Compatibility with gapi, reset from goog-menu */
border: inherit;', /* Compatibility with gapi, reset from goog-menu */
background: inherit; /* Compatibility with gapi, reset from goog-menu */
border: inherit; /* Compatibility with gapi, reset from goog-menu */
font: normal 13px "Helvetica Neue", Helvetica, sans-serif;
outline: none;
position: relative;', /* Compatibility with gapi, reset from goog-menu */
z-index: 20000;', /* Arbitrary, but some apps depend on it... */
position: relative; /* Compatibility with gapi, reset from goog-menu */
z-index: 20000; /* Arbitrary, but some apps depend on it... */
}`,

/* State: resting. */
Expand Down Expand Up @@ -549,7 +548,7 @@ const CONTENT = [
background: url(<<<PATH>>>/sprites.png) no-repeat -48px -16px;
float: left;
margin-left: -24px;
position: static;', /* Scroll with the menu. */
position: static; /* Scroll with the menu. */
}`,

`.blocklyMenuItemRtl .blocklyMenuItemCheckbox {
Expand Down
2 changes: 1 addition & 1 deletion core/toolbox/category.js
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ Css.register([
padding-right: 0;
}`,

`.blocklyTreeIcon {',
`.blocklyTreeIcon {
background-image: url(<<<PATH>>>/sprites.png);
height: 16px;
vertical-align: middle;
Expand Down
2 changes: 1 addition & 1 deletion core/zoom_controls.js
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ Css.register([
}`,

`.blocklyZoom>image:active, .blocklyZoom>svg>image:active {
'opacity: .8;
opacity: .8;
}`
]);

Expand Down

0 comments on commit ca61d8c

Please sign in to comment.