chore: format css (#6373)

* chore: format css

* chore: convert css to templates

* chore: disable clang-formatting geras css

* chore: clang format
This commit is contained in:
Beka Westberg
2022-08-23 18:18:33 +00:00
committed by GitHub
parent d6be01a4da
commit 7f6df7d562
3 changed files with 127 additions and 77 deletions

View File

@@ -1081,32 +1081,77 @@ export class ConstantProvider {
/* eslint-disable indent */
/* clang-format off */
// Text.
selector + ' .blocklyText, ', selector + ' .blocklyFlyoutLabelText {', 'font: ' + this.FIELD_TEXT_FONTWEIGHT + ' ' + this.FIELD_TEXT_FONTSIZE + 'pt ' + this.FIELD_TEXT_FONTFAMILY + ';', '}',
`${selector} .blocklyText, `,
`${selector} .blocklyFlyoutLabelText {`,
`font: ${this.FIELD_TEXT_FONTWEIGHT} ` +
`${this.FIELD_TEXT_FONTSIZE}pt ${this.FIELD_TEXT_FONTFAMILY};`,
`}`,
// Fields.
selector + ' .blocklyText {', 'fill: #fff;', '}', selector + ' .blocklyNonEditableText>rect,', selector + ' .blocklyEditableText>rect {', 'fill: ' + this.FIELD_BORDER_RECT_COLOUR + ';', 'fill-opacity: .6;', 'stroke: none;', '}', selector + ' .blocklyNonEditableText>text,', selector + ' .blocklyEditableText>text {', 'fill: #000;', '}',
`${selector} .blocklyText {`,
`fill: #fff;`,
`}`,
`${selector} .blocklyNonEditableText>rect,`,
`${selector} .blocklyEditableText>rect {`,
`fill: ${this.FIELD_BORDER_RECT_COLOUR};`,
`fill-opacity: .6;`,
`stroke: none;`,
`}`,
`${selector} .blocklyNonEditableText>text,`,
`${selector} .blocklyEditableText>text {`,
`fill: #000;`,
`}`,
// Flyout labels.
selector + ' .blocklyFlyoutLabelText {', 'fill: #000;', '}',
`${selector} .blocklyFlyoutLabelText {`,
`fill: #000;`,
`}`,
// Bubbles.
selector + ' .blocklyText.blocklyBubbleText {', 'fill: #000;', '}',
`${selector} .blocklyText.blocklyBubbleText {`,
`fill: #000;`,
`}`,
// Editable field hover.
selector + ' .blocklyEditableText:not(.editing):hover>rect {', 'stroke: #fff;', 'stroke-width: 2;', '}',
`${selector} .blocklyEditableText:not(.editing):hover>rect {`,
`stroke: #fff;`,
`stroke-width: 2;`,
`}`,
// Text field input.
selector + ' .blocklyHtmlInput {', 'font-family: ' + this.FIELD_TEXT_FONTFAMILY + ';', 'font-weight: ' + this.FIELD_TEXT_FONTWEIGHT + ';', '}', // Selection highlight.
selector + ' .blocklySelected>.blocklyPath {', 'stroke: #fc3;', 'stroke-width: 3px;', '}',
`${selector} .blocklyHtmlInput {`,
`font-family: ${this.FIELD_TEXT_FONTFAMILY};`,
`font-weight: ${this.FIELD_TEXT_FONTWEIGHT};`,
`}`,
// Selection highlight.
`${selector} .blocklySelected>.blocklyPath {`,
`stroke: #fc3;`,
`stroke-width: 3px;`,
`}`,
// Connection highlight.
selector + ' .blocklyHighlightedConnectionPath {', 'stroke: #fc3;', '}',
`${selector} .blocklyHighlightedConnectionPath {`,
`stroke: #fc3;`,
`}`,
// Replaceable highlight.
selector + ' .blocklyReplaceable .blocklyPath {', 'fill-opacity: .5;', '}', selector + ' .blocklyReplaceable .blocklyPathLight,', selector + ' .blocklyReplaceable .blocklyPathDark {', 'display: none;', '}',
`${selector} .blocklyReplaceable .blocklyPath {`,
`fill-opacity: .5;`,
`}`,
`${selector} .blocklyReplaceable .blocklyPathLight,`,
`${selector} .blocklyReplaceable .blocklyPathDark {`,
`display: none;`,
`}`,
// Insertion marker.
selector + ' .blocklyInsertionMarker>.blocklyPath {', 'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';', 'stroke: none;', '}'];
`${selector} .blocklyInsertionMarker>.blocklyPath {`,
`fill-opacity: ${this.INSERTION_MARKER_OPACITY};`,
`stroke: none;`,
`}`,
/* clang-format on */
/* eslint-enable indent */
];
}
}
/* clang-format on */

View File

@@ -46,16 +46,17 @@ export class ConstantProvider extends BaseConstantProvider {
}
override getCSS_(selector: string) {
return super.getCSS_(selector)
.concat(/* eslint-enable indent */
[
/* eslint-disable indent */
// Insertion marker.
selector + ' .blocklyInsertionMarker>.blocklyPathLight,',
selector + ' .blocklyInsertionMarker>.blocklyPathDark {',
'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';',
'stroke: none;',
'}',
]);
return super.getCSS_(selector).concat([
/* eslint-disable indent */
/* clang-format off */
// Insertion marker.
`${selector} .blocklyInsertionMarker>.blocklyPathLight,`,
`${selector} .blocklyInsertionMarker>.blocklyPathDark {`,
`fill-opacity: ${this.INSERTION_MARKER_OPACITY};`,
`stroke: none;`,
'}',
/* clang-format on */
/* eslint-enable indent */
]);
}
}

View File

@@ -780,78 +780,82 @@ export class ConstantProvider extends BaseConstantProvider {
return [
/* eslint-disable indent */
// Text.
selector + ' .blocklyText,',
selector + ' .blocklyFlyoutLabelText {',
'font: ' + this.FIELD_TEXT_FONTWEIGHT + ' ' + this.FIELD_TEXT_FONTSIZE +
'pt ' + this.FIELD_TEXT_FONTFAMILY + ';',
'}',
`${selector} .blocklyText,`,
`${selector} .blocklyFlyoutLabelText {`,
`font: ${this.FIELD_TEXT_FONTWEIGHT} ${this.FIELD_TEXT_FONTSIZE}` +
`pt ${this.FIELD_TEXT_FONTFAMILY};`,
`}`,
// Fields.
selector + ' .blocklyText {',
'fill: #fff;',
'}',
selector + ' .blocklyNonEditableText>rect:not(.blocklyDropdownRect),',
selector + ' .blocklyEditableText>rect:not(.blocklyDropdownRect) {',
'fill: ' + this.FIELD_BORDER_RECT_COLOUR + ';',
'}',
selector + ' .blocklyNonEditableText>text,',
selector + ' .blocklyEditableText>text,',
selector + ' .blocklyNonEditableText>g>text,',
selector + ' .blocklyEditableText>g>text {',
'fill: #575E75;',
'}', // Flyout labels.
selector + ' .blocklyFlyoutLabelText {',
'fill: #575E75;',
'}',
`${selector} .blocklyText {`,
`fill: #fff;`,
`}`,
`${selector} .blocklyNonEditableText>rect:not(.blocklyDropdownRect),`,
`${selector} .blocklyEditableText>rect:not(.blocklyDropdownRect) {`,
`fill: ${this.FIELD_BORDER_RECT_COLOUR};`,
`}`,
`${selector} .blocklyNonEditableText>text,`,
`${selector} .blocklyEditableText>text,`,
`${selector} .blocklyNonEditableText>g>text,`,
`${selector} .blocklyEditableText>g>text {`,
`fill: #575E75;`,
`}`,
// Flyout labels.
`${selector} .blocklyFlyoutLabelText {`,
`fill: #575E75;`,
`}`,
// Bubbles.
selector + ' .blocklyText.blocklyBubbleText {',
'fill: #575E75;',
'}',
`${selector} .blocklyText.blocklyBubbleText {`,
`fill: #575E75;`,
`}`,
// Editable field hover.
selector + ' .blocklyDraggable:not(.blocklyDisabled)',
' .blocklyEditableText:not(.editing):hover>rect,',
selector + ' .blocklyDraggable:not(.blocklyDisabled)',
' .blocklyEditableText:not(.editing):hover>.blocklyPath {',
'stroke: #fff;',
'stroke-width: 2;',
'}',
`${selector} .blocklyDraggable:not(.blocklyDisabled)`,
` .blocklyEditableText:not(.editing):hover>rect,`,
`${selector} .blocklyDraggable:not(.blocklyDisabled)`,
` .blocklyEditableText:not(.editing):hover>.blocklyPath {`,
`stroke: #fff;`,
`stroke-width: 2;`,
`}`,
// Text field input.
selector + ' .blocklyHtmlInput {',
'font-family: ' + this.FIELD_TEXT_FONTFAMILY + ';',
'font-weight: ' + this.FIELD_TEXT_FONTWEIGHT + ';',
'color: #575E75;',
'}',
`${selector} .blocklyHtmlInput {`,
`font-family: ${this.FIELD_TEXT_FONTFAMILY};`,
`font-weight: ${this.FIELD_TEXT_FONTWEIGHT};`,
`color: #575E75;`,
`}`,
// Dropdown field.
selector + ' .blocklyDropdownText {',
'fill: #fff !important;',
'}', // Widget and Dropdown Div
selector + '.blocklyWidgetDiv .goog-menuitem,',
selector + '.blocklyDropDownDiv .goog-menuitem {',
'font-family: ' + this.FIELD_TEXT_FONTFAMILY + ';',
'}',
selector + '.blocklyDropDownDiv .goog-menuitem-content {',
'color: #fff;',
'}',
`${selector} .blocklyDropdownText {`,
`fill: #fff !important;`,
`}`,
// Widget and Dropdown Div
`${selector}.blocklyWidgetDiv .goog-menuitem,`,
`${selector}.blocklyDropDownDiv .goog-menuitem {`,
`font-family: ${this.FIELD_TEXT_FONTFAMILY};`,
`}`,
`${selector}.blocklyDropDownDiv .goog-menuitem-content {`,
`color: #fff;`,
`}`,
// Connection highlight.
selector + ' .blocklyHighlightedConnectionPath {',
'stroke: ' + this.SELECTED_GLOW_COLOUR + ';',
'}',
`${selector} .blocklyHighlightedConnectionPath {`,
`stroke: ${this.SELECTED_GLOW_COLOUR};`,
`}`,
// Disabled outline paths.
selector + ' .blocklyDisabled > .blocklyOutlinePath {',
'fill: url(#blocklyDisabledPattern' + this.randomIdentifier + ')',
'}',
`${selector} .blocklyDisabled > .blocklyOutlinePath {`,
`fill: url(#blocklyDisabledPattern${this.randomIdentifier})`,
`}`,
// Insertion marker.
selector + ' .blocklyInsertionMarker>.blocklyPath {',
'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';',
'stroke: none;',
'}',
`${selector} .blocklyInsertionMarker>.blocklyPath {`,
`fill-opacity: ${this.INSERTION_MARKER_OPACITY};`,
`stroke: none;`,
`}`,
];
}
}