diff --git a/mocodo/__init__.py b/mocodo/__init__.py index 181b5788..c76f3c6d 100644 --- a/mocodo/__init__.py +++ b/mocodo/__init__.py @@ -1,7 +1,7 @@ from pathlib import Path from importlib import import_module -__version__ = "4.2.11" +__version__ = "4.2.12" SCRIPT_DIRECTORY = Path(__file__).resolve().parent diff --git a/mocodo/resources/colors/dark-desert.json b/mocodo/resources/colors/dark-desert.json new file mode 100644 index 00000000..22776325 --- /dev/null +++ b/mocodo/resources/colors/dark-desert.json @@ -0,0 +1,23 @@ +{ + "association_attribute_text_color": "#D3B08C", + "association_cartouche_color": "#4E3925", + "association_cartouche_text_color": "#D3B08C", + "association_color": "#624A32", + "association_stroke_color": "#C6A664", + "background_color": "#2E2B22", + "card_text_color": "#D4C2A1", + "constraint_background_color": "#4E3925", + "constraint_stroke_color": "#C6A664", + "constraint_text_color": "#D3B08C", + "entity_attribute_text_color": "#E3D5B3", + "entity_cartouche_color": "#5F3C14", + "entity_cartouche_text_color": "#E3D5B3", + "entity_color": "#7C5020", + "entity_stroke_color": "#E5A04B", + "id_gutter_color": "#7C5020", + "id_gutter_text_color": "#E3D5B3", + "leg_stroke_color": "#C6A664", + "note_color": "#2D271E", + "note_opacity": 0.8, + "note_text_color": "#D4C49A" + } diff --git a/mocodo/resources/colors/dark-ocean.json b/mocodo/resources/colors/dark-ocean.json new file mode 100644 index 00000000..b9f21193 --- /dev/null +++ b/mocodo/resources/colors/dark-ocean.json @@ -0,0 +1,23 @@ +{ + "association_attribute_text_color": "#b4c8a1", + "association_cartouche_color": "#2d3b22", + "association_cartouche_text_color": "#d9e5c3", + "association_color": "#3a4a28", + "association_stroke_color": "#a6b792", + "background_color": "#1a1f1a", + "card_text_color": "#b0aabb", + "constraint_background_color": "#2d3b22", + "constraint_stroke_color": "#a6b792", + "constraint_text_color": "#d9e5c3", + "entity_attribute_text_color": "#e6e5ea", + "entity_cartouche_color": "#1a223a", + "entity_cartouche_text_color": "#d9e5c3", + "entity_color": "#2a3866", + "entity_stroke_color": "#83a5ff", + "id_gutter_color": "#2a3866", + "id_gutter_text_color": "#e6e5ea", + "leg_stroke_color": "#a6b792", + "note_color": "#131517", + "note_opacity": 0.8, + "note_text_color": "#d9e5c3" + } diff --git a/mocodo/resources/colors/dark-pond.json b/mocodo/resources/colors/dark-pond.json new file mode 100644 index 00000000..4e811627 --- /dev/null +++ b/mocodo/resources/colors/dark-pond.json @@ -0,0 +1,23 @@ +{ + "association_attribute_text_color": "#A7BEC1", + "association_cartouche_color": "#31572E", + "association_cartouche_text_color": "#A7BEC1", + "association_color": "#3F5F4E", + "association_stroke_color": "#B4D877", + "background_color": "#1A2622", + "card_text_color": "#C1D9DC", + "constraint_background_color": "#31572E", + "constraint_stroke_color": "#B4D877", + "constraint_text_color": "#A7BEC1", + "entity_attribute_text_color": "#C4F1D8", + "entity_cartouche_color": "#295943", + "entity_cartouche_text_color": "#C4F1D8", + "entity_color": "#387F59", + "entity_stroke_color": "#6AD1A0", + "id_gutter_color": "#387F59", + "id_gutter_text_color": "#C4F1D8", + "leg_stroke_color": "#B4D877", + "note_color": "#1E3932", + "note_opacity": 0.8, + "note_text_color": "#C7F7E1" + } diff --git a/mocodo/resources/colors/dark.json b/mocodo/resources/colors/dark.json new file mode 100644 index 00000000..1ed53a93 --- /dev/null +++ b/mocodo/resources/colors/dark.json @@ -0,0 +1,23 @@ +{ + "association_attribute_text_color": "#FFFFFF", + "association_cartouche_color": "#444444", + "association_cartouche_text_color": "#FFFFFF", + "association_color": "#333333", + "association_stroke_color": "#AAAAAA", + "background_color": "#222222", + "card_text_color": "#FFFFFF", + "constraint_background_color": "#444444", + "constraint_stroke_color": "#AAAAAA", + "constraint_text_color": "#FFFFFF", + "entity_attribute_text_color": "#FFFFFF", + "entity_cartouche_color": "#444444", + "entity_cartouche_text_color": "#FFFFFF", + "entity_color": "#333333", + "entity_stroke_color": "#AAAAAA", + "id_gutter_color": "#444444", + "id_gutter_text_color": "#FFFFFF", + "leg_stroke_color": "#AAAAAA", + "note_color": "#444444", + "note_opacity": 0.8, + "note_text_color": "#FFFFFF" + } diff --git a/web/mocodo.js b/web/mocodo.js index ac23eb0e..24803354 100644 --- a/web/mocodo.js +++ b/web/mocodo.js @@ -663,7 +663,7 @@ $().ready(function () { }); editor.renderer.updateFull(); var default_color = "brewer" + "+-"[Math.floor(Math.random() * 2)] + (Math.floor(Math.random() * 9) + 1); - createOptions("colors", ["blank", "bw", "bw-alpha", "desert", "keepsake", "mondrian", "ocean", "pond", "wb", "xinnian", "brewer+1", "brewer-1", "brewer+2", "brewer-2", "brewer+3", "brewer-3", "brewer+4", "brewer-4", "brewer+5", "brewer-5", "brewer+6", "brewer-6", "brewer+7", "brewer-7", "brewer+8", "brewer-8", "brewer+9", "brewer-9"], default_color); + createOptions("colors", ["blank", "bw", "bw-alpha", "desert", "dark", "dark-desert", "dark-ocean", "dark-pond", "keepsake", "mondrian", "ocean", "pond", "wb", "xinnian", "brewer+1", "brewer-1", "brewer+2", "brewer-2", "brewer+3", "brewer-3", "brewer+4", "brewer-4", "brewer+5", "brewer-5", "brewer+6", "brewer-6", "brewer+7", "brewer-7", "brewer+8", "brewer-8", "brewer+9", "brewer-9"], default_color); createOptions("shapes", ["arial", "copperplate", "georgia", "mondrian", "sans", "serif", "times", "trebuchet", "verdana", "xinnian"], "verdana"); createCheckboxes(conversions, "conversions"); createCheckboxes(knowledge, "knowledge");