From 2b6b89dc5456e10d3ce910c0d170613752be8436 Mon Sep 17 00:00:00 2001 From: alschmiedt Date: Tue, 13 Jul 2021 13:31:27 -0700 Subject: [PATCH] Remove themes that were moved to blockly samples (#5041) --- blockly_uncompressed.js | 7 +-- core/requires.js | 5 -- core/theme/dark.js | 33 ---------- core/theme/deuteranopia.js | 104 -------------------------------- core/theme/highcontrast.js | 119 ------------------------------------- core/theme/modern.js | 108 --------------------------------- core/theme/tritanopia.js | 103 -------------------------------- 7 files changed, 1 insertion(+), 478 deletions(-) delete mode 100644 core/theme/dark.js delete mode 100644 core/theme/deuteranopia.js delete mode 100644 core/theme/highcontrast.js delete mode 100644 core/theme/modern.js delete mode 100644 core/theme/tritanopia.js diff --git a/blockly_uncompressed.js b/blockly_uncompressed.js index 9a52ca263..86f6dfcb5 100644 --- a/blockly_uncompressed.js +++ b/blockly_uncompressed.js @@ -165,17 +165,12 @@ goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['B goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']); goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']); goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']); -goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Themes.Dark', 'Blockly.Themes.Deuteranopia', 'Blockly.Themes.HighContrast', 'Blockly.Themes.Tritanopia', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']); +goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']); goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']); goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']); goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object']); goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']); goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']); -goog.addDependency('../../core/theme/dark.js', ['Blockly.Themes.Dark'], ['Blockly.Theme']); -goog.addDependency('../../core/theme/deuteranopia.js', ['Blockly.Themes.Deuteranopia'], ['Blockly.Theme']); -goog.addDependency('../../core/theme/highcontrast.js', ['Blockly.Themes.HighContrast'], ['Blockly.Theme']); -goog.addDependency('../../core/theme/modern.js', ['Blockly.Themes.Modern'], ['Blockly.Theme']); -goog.addDependency('../../core/theme/tritanopia.js', ['Blockly.Themes.Tritanopia'], ['Blockly.Theme']); goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']); goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme']); goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'}); diff --git a/core/requires.js b/core/requires.js index f08286ec4..2ca295441 100644 --- a/core/requires.js +++ b/core/requires.js @@ -82,8 +82,3 @@ goog.require('Blockly.zelos.Renderer'); // Blockly Themes. // Classic is the default theme. goog.require('Blockly.Themes.Classic'); -goog.require('Blockly.Themes.Dark'); -goog.require('Blockly.Themes.Deuteranopia'); -goog.require('Blockly.Themes.HighContrast'); -goog.require('Blockly.Themes.Tritanopia'); -// goog.require('Blockly.Themes.Modern'); diff --git a/core/theme/dark.js b/core/theme/dark.js deleted file mode 100644 index 398497660..000000000 --- a/core/theme/dark.js +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @license - * Copyright 2019 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @fileoverview Dark theme. - * @author samelh@google.com (Sam El-Husseini) - */ -'use strict'; - -goog.provide('Blockly.Themes.Dark'); - -goog.require('Blockly.Theme'); - -Blockly.Themes.Dark = Blockly.Theme.defineTheme('dark', { - 'base': Blockly.Themes.Classic, - 'componentStyles': { - 'workspaceBackgroundColour': '#1e1e1e', - 'toolboxBackgroundColour': 'blackBackground', - 'toolboxForegroundColour': '#fff', - 'flyoutBackgroundColour': '#252526', - 'flyoutForegroundColour': '#ccc', - 'flyoutOpacity': 1, - 'scrollbarColour': '#797979', - 'insertionMarkerColour': '#fff', - 'insertionMarkerOpacity': 0.3, - 'scrollbarOpacity': 0.4, - 'cursorColour': '#d0d0d0', - 'blackBackground': '#333' - } -}); diff --git a/core/theme/deuteranopia.js b/core/theme/deuteranopia.js deleted file mode 100644 index 94deac221..000000000 --- a/core/theme/deuteranopia.js +++ /dev/null @@ -1,104 +0,0 @@ -/** - * @license - * Copyright 2019 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @fileoverview Deuteranopia theme. - * A colour palette for people that have deuteranopia (the inability to perceive - * green light). This can also be used for people that have protanopia (the - * inability to perceive red light). - */ -'use strict'; - -goog.provide('Blockly.Themes.Deuteranopia'); - -goog.require('Blockly.Theme'); - - -// Temporary holding object. -Blockly.Themes.Deuteranopia = {}; - -Blockly.Themes.Deuteranopia.defaultBlockStyles = { - "colour_blocks": { - "colourPrimary": "#f2a72c", - "colourSecondary": "#f1c172", - "colourTertiary": "#da921c" - }, - "list_blocks": { - "colourPrimary": "#7d65ab", - "colourSecondary": "#a88be0", - "colourTertiary": "#66518e" - }, - "logic_blocks": { - "colourPrimary": "#9fd2f1", - "colourSecondary": "#c0e0f4", - "colourTertiary": "#74bae5" - }, - "loop_blocks": { - "colourPrimary": "#795a07", - "colourSecondary": "#ac8726", - "colourTertiary": "#c4a03f" - }, - "math_blocks": { - "colourPrimary": "#e6da39", - "colourSecondary": "#f3ec8e", - "colourTertiary": "#f2eeb7" - }, - "procedure_blocks": { - "colourPrimary": "#590721", - "colourSecondary": "#8c475d", - "colourTertiary": "#885464" - }, - "text_blocks": { - "colourPrimary": "#058863", - "colourSecondary": "#5ecfaf", - "colourTertiary": "#04684c" - }, - "variable_blocks": { - "colourPrimary": "#47025a", - "colourSecondary": "#820fa1", - "colourTertiary": "#8e579d" - }, - "variable_dynamic_blocks": { - "colourPrimary": "#47025a", - "colourSecondary": "#820fa1", - "colourTertiary": "#8e579d" - } -}; - -Blockly.Themes.Deuteranopia.categoryStyles = { - "colour_category": { - "colour": "#f2a72c" - }, - "list_category": { - "colour": "#7d65ab" - }, - "logic_category": { - "colour": "#9fd2f1" - }, - "loop_category": { - "colour": "#795a07" - }, - "math_category": { - "colour": "#e6da39" - }, - "procedure_category": { - "colour": "#590721" - }, - "text_category": { - "colour": "#058863" - }, - "variable_category": { - "colour": "#47025a" - }, - "variable_dynamic_category": { - "colour": "#47025a" - } -}; - -Blockly.Themes.Deuteranopia = - new Blockly.Theme('deuteranopia', - Blockly.Themes.Deuteranopia.defaultBlockStyles, - Blockly.Themes.Deuteranopia.categoryStyles); diff --git a/core/theme/highcontrast.js b/core/theme/highcontrast.js deleted file mode 100644 index b38077474..000000000 --- a/core/theme/highcontrast.js +++ /dev/null @@ -1,119 +0,0 @@ -/** - * @license - * Copyright 2018 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @fileoverview High contrast theme. - * Darker colours to contrast the white font. - */ -'use strict'; - -goog.provide('Blockly.Themes.HighContrast'); - -goog.require('Blockly.Theme'); - - -// Temporary holding object. -Blockly.Themes.HighContrast = {}; - -Blockly.Themes.HighContrast.defaultBlockStyles = { - "colour_blocks": { - "colourPrimary": "#a52714", - "colourSecondary": "#FB9B8C", - "colourTertiary": "#FBE1DD" - }, - "list_blocks": { - "colourPrimary": "#4a148c", - "colourSecondary": "#AD7BE9", - "colourTertiary": "#CDB6E9" - }, - "logic_blocks": { - "colourPrimary": "#01579b", - "colourSecondary": "#64C7FF", - "colourTertiary": "#C5EAFF" - }, - "loop_blocks": { - "colourPrimary": "#33691e", - "colourSecondary": "#9AFF78", - "colourTertiary": "#E1FFD7" - }, - "math_blocks": { - "colourPrimary": "#1a237e", - "colourSecondary": "#8A9EFF", - "colourTertiary": "#DCE2FF" - }, - "procedure_blocks": { - "colourPrimary": "#006064", - "colourSecondary": "#77E6EE", - "colourTertiary": "#CFECEE" - }, - "text_blocks": { - "colourPrimary": "#004d40", - "colourSecondary": "#5ae27c", - "colourTertiary": "#D2FFDD" - }, - "variable_blocks": { - "colourPrimary": "#880e4f", - "colourSecondary": "#FF73BE", - "colourTertiary": "#FFD4EB" - }, - "variable_dynamic_blocks": { - "colourPrimary": "#880e4f", - "colourSecondary": "#FF73BE", - "colourTertiary": "#FFD4EB" - }, - "hat_blocks": { - "colourPrimary": "#880e4f", - "colourSecondary": "#FF73BE", - "colourTertiary": "#FFD4EB", - "hat": "cap" - } -}; - -Blockly.Themes.HighContrast.categoryStyles = { - "colour_category": { - "colour": "#a52714" - }, - "list_category": { - "colour": "#4a148c" - }, - "logic_category": { - "colour": "#01579b" - }, - "loop_category": { - "colour": "#33691e" - }, - "math_category": { - "colour": "#1a237e" - }, - "procedure_category": { - "colour": "#006064" - }, - "text_category": { - "colour": "#004d40" - }, - "variable_category": { - "colour": "#880e4f" - }, - "variable_dynamic_category": { - "colour": "#880e4f" - } -}; - -// This style is still being fleshed out and may change. -Blockly.Themes.HighContrast = - new Blockly.Theme('highcontrast', - Blockly.Themes.HighContrast.defaultBlockStyles, - Blockly.Themes.HighContrast.categoryStyles); - -Blockly.Themes.HighContrast.setComponentStyle('selectedGlowColour', '#000000'); -Blockly.Themes.HighContrast.setComponentStyle('selectedGlowSize', 1); -Blockly.Themes.HighContrast.setComponentStyle('replacementGlowColour', '#000000'); - -Blockly.Themes.HighContrast.setFontStyle({ - 'family': null, // Use default font-family. - 'weight': null, // Use default font-weight. - 'size': 16 -}); diff --git a/core/theme/modern.js b/core/theme/modern.js deleted file mode 100644 index 2ed8a6845..000000000 --- a/core/theme/modern.js +++ /dev/null @@ -1,108 +0,0 @@ -/** - * @license - * Copyright 2018 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @fileoverview Modern theme. - * Same colours as classic, but single coloured border. - */ -'use strict'; - -goog.provide('Blockly.Themes.Modern'); - -goog.require('Blockly.Theme'); - - -// Temporary holding object. -Blockly.Themes.Modern = {}; - -Blockly.Themes.Modern.defaultBlockStyles = { - "colour_blocks": { - "colourPrimary": "#a5745b", - "colourSecondary": "#dbc7bd", - "colourTertiary": "#845d49" - }, - "list_blocks": { - "colourPrimary": "#745ba5", - "colourSecondary": "#c7bddb", - "colourTertiary": "#5d4984" - }, - "logic_blocks": { - "colourPrimary": "#5b80a5", - "colourSecondary": "#bdccdb", - "colourTertiary": "#496684" - }, - "loop_blocks": { - "colourPrimary": "#5ba55b", - "colourSecondary": "#bddbbd", - "colourTertiary": "#498449" - }, - "math_blocks": { - "colourPrimary": "#5b67a5", - "colourSecondary": "#bdc2db", - "colourTertiary": "#495284" - }, - "procedure_blocks": { - "colourPrimary": "#995ba5", - "colourSecondary": "#d6bddb", - "colourTertiary": "#7a4984" - }, - "text_blocks": { - "colourPrimary": "#5ba58c", - "colourSecondary": "#bddbd1", - "colourTertiary": "#498470" - }, - "variable_blocks": { - "colourPrimary": "#a55b99", - "colourSecondary": "#dbbdd6", - "colourTertiary": "#84497a" - }, - "variable_dynamic_blocks": { - "colourPrimary": "#a55b99", - "colourSecondary": "#dbbdd6", - "colourTertiary": "#84497a" - }, - "hat_blocks": { - "colourPrimary": "#a55b99", - "colourSecondary": "#dbbdd6", - "colourTertiary": "#84497a", - "hat": "cap" - } -}; - -Blockly.Themes.Modern.categoryStyles = { - "colour_category": { - "colour": "#a5745b" - }, - "list_category": { - "colour": "#745ba5" - }, - "logic_category": { - "colour": "#5b80a5" - }, - "loop_category": { - "colour": "#5ba55b" - }, - "math_category": { - "colour": "#5b67a5" - }, - "procedure_category": { - "colour": "#995ba5" - }, - "text_category": { - "colour": "#5ba58c" - }, - "variable_category": { - "colour": "#a55b99" - }, - "variable_dynamic_category": { - "colour": "#a55b99" - } -}; - -// This style is still being fleshed out and may change. -Blockly.Themes.Modern = - new Blockly.Theme('modern', Blockly.Themes.Modern.defaultBlockStyles, - Blockly.Themes.Modern.categoryStyles); diff --git a/core/theme/tritanopia.js b/core/theme/tritanopia.js deleted file mode 100644 index aa53cb0f9..000000000 --- a/core/theme/tritanopia.js +++ /dev/null @@ -1,103 +0,0 @@ -/** - * @license - * Copyright 2019 Google LLC - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @fileoverview Tritanopia theme. - * A colour palette for people that have tritanopia (the inability to perceive - * blue light). - */ -'use strict'; - -goog.provide('Blockly.Themes.Tritanopia'); - -goog.require('Blockly.Theme'); - - -// Temporary holding object. -Blockly.Themes.Tritanopia = {}; - -Blockly.Themes.Tritanopia.defaultBlockStyles = { - "colour_blocks": { - "colourPrimary": "#05427f", - "colourSecondary": "#2974c0", - "colourTertiary": "#2d74bb" - }, - "list_blocks": { - "colourPrimary": "#b69ce8", - "colourSecondary": "#ccbaef", - "colourTertiary": "#9176c5" - }, - "logic_blocks": { - "colourPrimary": "#9fd2f1", - "colourSecondary": "#c0e0f4", - "colourTertiary": "#74bae5" - }, - "loop_blocks": { - "colourPrimary": "#aa1846", - "colourSecondary": "#d36185", - "colourTertiary": "#7c1636" - }, - "math_blocks": { - "colourPrimary": "#e6da39", - "colourSecondary": "#f3ec8e", - "colourTertiary": "#f2eeb7" - }, - "procedure_blocks": { - "colourPrimary": "#590721", - "colourSecondary": "#8c475d", - "colourTertiary": "#885464" - }, - "text_blocks": { - "colourPrimary": "#058863", - "colourSecondary": "#5ecfaf", - "colourTertiary": "#04684c" - }, - "variable_blocks": { - "colourPrimary": "#4b2d84", - "colourSecondary": "#816ea7", - "colourTertiary": "#83759e" - }, - "variable_dynamic_blocks": { - "colourPrimary": "#4b2d84", - "colourSecondary": "#816ea7", - "colourTertiary": "#83759e" - } -}; - -Blockly.Themes.Tritanopia.categoryStyles = { - "colour_category": { - "colour": "#05427f" - }, - "list_category": { - "colour": "#b69ce8" - }, - "logic_category": { - "colour": "#9fd2f1" - }, - "loop_category": { - "colour": "#aa1846" - }, - "math_category": { - "colour": "#e6da39" - }, - "procedure_category": { - "colour": "#590721" - }, - "text_category": { - "colour": "#058863" - }, - "variable_category": { - "colour": "#4b2d84" - }, - "variable_dynamic_category": { - "colour": "#4b2d84" - } -}; - -Blockly.Themes.Tritanopia = - new Blockly.Theme('tritanopia', - Blockly.Themes.Tritanopia.defaultBlockStyles, - Blockly.Themes.Tritanopia.categoryStyles);