From 26079013c52ed05ab68d129e031f7ce3ecd72d62 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Tue, 16 Aug 2016 11:17:37 +0200 Subject: [PATCH] Review styles --- default_dark.style | 71 -------------- .../styles/{dark.style => default_dark.style} | 21 +++- .../styles/default_light.style | 0 styler/styles/light.style | 98 ------------------- 4 files changed, 16 insertions(+), 174 deletions(-) delete mode 100644 default_dark.style rename styler/styles/{dark.style => default_dark.style} (95%) rename default_light.style => styler/styles/default_light.style (100%) delete mode 100644 styler/styles/light.style diff --git a/default_dark.style b/default_dark.style deleted file mode 100644 index a7c243d..0000000 --- a/default_dark.style +++ /dev/null @@ -1,71 +0,0 @@ -BUTTON_DEFAULT_BORDER_COLOR (Color){ 63, 75, 78, 255 } -BUTTON_DEFAULT_INSIDE_COLOR (Color){ 52, 63, 65, 255 } -BUTTON_HOVER_BORDER_COLOR (Color){ 71, 89, 95, 255 } -BUTTON_HOVER_INSIDE_COLOR (Color){ 51, 79, 89, 255 } -BUTTON_CLICK_BORDER_COLOR (Color){ 81, 129, 163, 255 } -BUTTON_CLICK_INSIDE_COLOR (Color){ 173, 216, 233, 255 } -BUTTON_PRESSED_BORDER_COLOR (Color){ 95, 154, 167, 255 } -BUTTON_PRESSED_INSIDE_COLOR (Color){ 51, 79, 89, 255 } -BUTTON_DEFAULT_TEXT_COLOR (Color){ 144, 171, 181, 255 } -BUTTON_PRESSED_TEXT_COLOR (Color){ 95, 154, 167, 255 } -BUTTON_BORDER_WIDTH 2 -GLOBAL_TEXT_FONTSIZE 10 -BUTTON_TEXT_PADDING 20 - -LABEL_TEXT_PADDING 20 -LABEL_BORDER_WIDTH 1 -LABEL_TEXT_COLOR (Color){ 144, 171, 181, 255 } - -TOGGLE_DEFAULT_BORDER_COLOR (Color){ 63, 75, 78, 255 } -TOGGLE_DEFAULT_INSIDE_COLOR (Color){ 52, 63, 65, 255 } -TOGGLE_HOVER_BORDER_COLOR (Color){ 71, 89, 95, 255 } -TOGGLE_HOVER_INSIDE_COLOR (Color){ 51, 79, 89, 255 } -TOGGLE_CLICK_BORDER_COLOR (Color){ 147, 199, 99, 255 } -TOGGLE_CLICK_INSIDE_COLOR (Color){ 51, 79, 89, 255 } -TOGGLE_CLICK_TEXT_COLOR (Color){ 147, 199, 99, 255 } -TOGGLE_DEFAULT_TEXT_COLOR GRAY -TOGGLE_PRESSED_BORDER_COLOR (Color){ 95, 154, 167, 255 } -TOGGLE_PRESSED_INSIDE_COLOR (Color){ 51, 79, 89, 255 } -TOGGLE_PRESSED_TEXT_COLOR (Color){ 95, 154, 167, 255 } -TOGGLE_TEXT_PADDING 20 -TOGGLE_BORDER_WIDTH 1 - -TOGGLEGROUP_PADDING 3 - -COMBOBOX_PADDING 1 -COMBOBOX_BUTTON_WIDTH 30 -COMBOBOX_BUTTON_HEIGHT 30 -COMBOBOX_DEFAULT_BORDER_COLOR (Color){ 63, 75, 78, 255 } -COMBOBOX_DEFAULT_INSIDE_COLOR (Color){ 52, 63, 65, 255 } -COMBOBOX_HOVER_BORDER_COLOR (Color){ 71, 89, 95, 255 } -COMBOBOX_HOVER_INSIDE_COLOR (Color){ 51, 79, 89, 255 } -COMBOBOX_PRESSED_BORDER_COLOR (Color){ 95, 154, 167, 255 } -COMBOBOX_PRESSED_INSIDE_COLOR (Color){ 51, 79, 89, 255 } -COMBOBOX_PRESSED_LIST_BORDER_COLOR (Color){ 147, 199, 99, 255 } -COMBOBOX_PRESSED_LIST_INSIDE_COLOR (Color){ 51, 79, 89, 255 } -COMBOBOX_DEFAULT_TEXT_COLOR (Color){ 95, 154, 167, 255 } -COMBOBOX_TEXT_LIST_COLOR (Color){ 147, 199, 99, 255 } - -CHECKBOX_DEFAULT_BORDER_COLOR GRAY -CHECKBOX_DEFAULT_INSIDE_COLOR WHITE -CHECKBOX_HOVER_BORDER_COLOR LIGHTGRAY -CHECKBOX_HOVER_INSIDE_COLOR WHITE -CHECKBOX_CLICK_BORDER_COLOR (Color){ 102, 231, 255, 255 } -CHECKBOX_CLICK_INSIDE_COLOR (Color){ 102, 231, 255, 255 } -CHECKBOX_STATUS_ACTIVE_COLOR (Color){ 0, 120, 172, 255 } -CHECKBOX_INSIDE_WIDTH 3 - -SLIDER_BORDER_WIDTH 1 -SLIDER_BUTTON_BORDER_WIDTH 1 -SLIDER_DEFAULT_COLOR (Color){ 147, 199, 99, 255 } -SLIDER_HOVER_COLOR (Color){ 195, 224, 168, 255 } -SLIDER_CLICK_COLOR WHITE - -PROGRESSBAR_BORDER_COLOR GRAY -PROGRESSBAR_INSIDE_COLOR LIGHTGRAY -PROGRESSBAR_PROGRESS_COLOR (Color){ 188, 236, 255, 255 } -PROGRESSBAR_BORDER_WIDTH 2 - -TEXTBOX_BORDER_WIDTH 1 -TEXTBOX_BORDER_COLOR GRAY -TEXTBOX_INSIDE_COLOR RAYWHITE \ No newline at end of file diff --git a/styler/styles/dark.style b/styler/styles/default_dark.style similarity index 95% rename from styler/styles/dark.style rename to styler/styles/default_dark.style index 3bfea4f..bb7fc53 100644 --- a/styler/styles/dark.style +++ b/styler/styles/default_dark.style @@ -3,10 +3,13 @@ GLOBAL_BORDER_COLOR 0xf5f5f5ff GLOBAL_TEXT_COLOR 0xf5f5f5ff GLOBAL_TEXT_FONTSIZE 0xa GLOBAL_BORDER_WIDTH 0x1 + BACKGROUND_COLOR 0x293235ff + LABEL_BORDER_WIDTH 0x0 LABEL_TEXT_COLOR 0x90acb4ff LABEL_TEXT_PADDING 0x0 + BUTTON_BORDER_WIDTH 0x2 BUTTON_TEXT_PADDING 0x0 BUTTON_DEFAULT_BORDER_COLOR 0x3e4a4fff @@ -18,8 +21,9 @@ BUTTON_HOVER_TEXT_COLOR 0x90acb4ff BUTTON_PRESSED_BORDER_COLOR 0x5f9aa4ff BUTTON_PRESSED_INSIDE_COLOR 0x334f59ff BUTTON_PRESSED_TEXT_COLOR 0x5f9aa8ff -TOGGLE_TEXT_PADDING 0x0 -TOGGLE_BORDER_WIDTH 0x2 + +TOGGLE_TEXT_PADDING 20 +TOGGLE_BORDER_WIDTH 1 TOGGLE_DEFAULT_BORDER_COLOR 0x3e4b4dff TOGGLE_DEFAULT_INSIDE_COLOR 0x344041ff TOGGLE_DEFAULT_TEXT_COLOR 0x828282ff @@ -32,7 +36,9 @@ TOGGLE_PRESSED_TEXT_COLOR 0x5f9aa8ff TOGGLE_ACTIVE_BORDER_COLOR 0x92c763ff TOGGLE_ACTIVE_INSIDE_COLOR 0x334f59ff TOGGLE_ACTIVE_TEXT_COLOR 0x92c763ff + TOGGLEGROUP_PADDING 0x3 + SLIDER_BORDER_WIDTH 0x1 SLIDER_BUTTON_BORDER_WIDTH 0x0 SLIDER_BORDER_COLOR 0x828282ff @@ -40,16 +46,19 @@ SLIDER_INSIDE_COLOR 0x3e4b4dff SLIDER_DEFAULT_COLOR 0x92c763ff SLIDER_HOVER_COLOR 0xc3e0a9ff SLIDER_ACTIVE_COLOR 0xffffffff + SLIDERBAR_BORDER_COLOR 0x828282ff SLIDERBAR_INSIDE_COLOR 0x344041ff SLIDERBAR_DEFAULT_COLOR 0x92c763ff SLIDERBAR_HOVER_COLOR 0xc3e0a9ff SLIDERBAR_ACTIVE_COLOR 0xffffffff SLIDERBAR_ZERO_LINE_COLOR 0x828282ff + PROGRESSBAR_BORDER_COLOR 0x828282ff PROGRESSBAR_INSIDE_COLOR 0x3e4b4dff PROGRESSBAR_PROGRESS_COLOR 0x92c763ff PROGRESSBAR_BORDER_WIDTH 0x1 + SPINNER_LABEL_BORDER_COLOR 0x3e4b4dff SPINNER_LABEL_INSIDE_COLOR 0x344041ff SPINNER_DEFAULT_BUTTON_BORDER_COLOR 0x3e4b4dff @@ -64,9 +73,10 @@ SPINNER_PRESSED_BUTTON_BORDER_COLOR 0x92c763ff SPINNER_PRESSED_BUTTON_INSIDE_COLOR 0x334f59ff SPINNER_PRESSED_SYMBOL_COLOR 0x92c763ff SPINNER_PRESSED_TEXT_COLOR 0x92c763ff + COMBOBOX_PADDING 0x1 -COMBOBOX_BUTTON_WIDTH 0x28 -COMBOBOX_BUTTON_HEIGHT 0xa +COMBOBOX_BUTTON_WIDTH 30 +COMBOBOX_BUTTON_HEIGHT 20 COMBOBOX_BORDER_WIDTH 0x1 COMBOBOX_DEFAULT_BORDER_COLOR 0x3e4b4dff COMBOBOX_DEFAULT_INSIDE_COLOR 0x344041ff @@ -90,9 +100,10 @@ CHECKBOX_CLICK_BORDER_COLOR 0x5f9aa8ff CHECKBOX_CLICK_INSIDE_COLOR 0x334f59ff CHECKBOX_STATUS_ACTIVE_COLOR 0x92c763ff CHECKBOX_INSIDE_WIDTH 0x2 + TEXTBOX_BORDER_WIDTH 0x1 TEXTBOX_BORDER_COLOR 0x47595fff TEXTBOX_INSIDE_COLOR 0x828282ff TEXTBOX_TEXT_COLOR 0xff TEXTBOX_LINE_COLOR 0xff -TEXTBOX_TEXT_FONTSIZE 0xa +TEXTBOX_TEXT_FONTSIZE 0xa \ No newline at end of file diff --git a/default_light.style b/styler/styles/default_light.style similarity index 100% rename from default_light.style rename to styler/styles/default_light.style diff --git a/styler/styles/light.style b/styler/styles/light.style deleted file mode 100644 index 267f30d..0000000 --- a/styler/styles/light.style +++ /dev/null @@ -1,98 +0,0 @@ -GLOBAL_BASE_COLOR 0xff -GLOBAL_BORDER_COLOR 0xf5f5f5ff -GLOBAL_TEXT_COLOR 0xff -GLOBAL_TEXT_FONTSIZE 0xa -GLOBAL_BORDER_WIDTH 0x0 -BACKGROUND_COLOR 0xf5f5f5ff -LABEL_BORDER_WIDTH 0x1 -LABEL_TEXT_COLOR 0xff -LABEL_TEXT_PADDING 0x0 -BUTTON_BORDER_WIDTH 0x1 -BUTTON_TEXT_PADDING 0x0 -BUTTON_DEFAULT_BORDER_COLOR 0x828282ff -BUTTON_DEFAULT_INSIDE_COLOR 0xc8c8c8ff -BUTTON_DEFAULT_TEXT_COLOR 0x828282ff -BUTTON_HOVER_BORDER_COLOR 0xc8c8c8ff -BUTTON_HOVER_INSIDE_COLOR 0xffffffff -BUTTON_HOVER_TEXT_COLOR 0x828282ff -BUTTON_PRESSED_BORDER_COLOR 0xa078e2ff -BUTTON_PRESSED_INSIDE_COLOR 0xea8fbdff -BUTTON_PRESSED_TEXT_COLOR 0x9178aaff -TOGGLE_TEXT_PADDING 0x0 -TOGGLE_BORDER_WIDTH 0x1 -TOGGLE_DEFAULT_BORDER_COLOR 0x828282ff -TOGGLE_DEFAULT_INSIDE_COLOR 0xc8c8c8ff -TOGGLE_DEFAULT_TEXT_COLOR 0x828282ff -TOGGLE_HOVER_BORDER_COLOR 0x828282ff -TOGGLE_HOVER_INSIDE_COLOR 0xf5f5f5ff -TOGGLE_HOVER_TEXT_COLOR 0x828282ff -TOGGLE_PRESSED_BORDER_COLOR 0xa078e2ff -TOGGLE_PRESSED_INSIDE_COLOR 0xea8fbdff -TOGGLE_PRESSED_TEXT_COLOR 0x9178aaff -TOGGLE_ACTIVE_BORDER_COLOR 0xa078e2ff -TOGGLE_ACTIVE_INSIDE_COLOR 0xf0d2faff -TOGGLE_ACTIVE_TEXT_COLOR 0x9178aaff -TOGGLEGROUP_PADDING 0x3 -SLIDER_BORDER_WIDTH 0x1 -SLIDER_BUTTON_BORDER_WIDTH 0x0 -SLIDER_BORDER_COLOR 0x828282ff -SLIDER_INSIDE_COLOR 0xc8c8c8ff -SLIDER_DEFAULT_COLOR 0x828282ff -SLIDER_HOVER_COLOR 0xf5f5f5ff -SLIDER_ACTIVE_COLOR 0xea8fbdff -SLIDERBAR_BORDER_COLOR 0x828282ff -SLIDERBAR_INSIDE_COLOR 0xc8c8c8ff -SLIDERBAR_DEFAULT_COLOR 0x828282ff -SLIDERBAR_HOVER_COLOR 0xf5f5f5ff -SLIDERBAR_ACTIVE_COLOR 0xea8fbdff -SLIDERBAR_ZERO_LINE_COLOR 0xff -PROGRESSBAR_BORDER_COLOR 0x828282ff -PROGRESSBAR_INSIDE_COLOR 0xc8c8c8ff -PROGRESSBAR_PROGRESS_COLOR 0x828282ff -PROGRESSBAR_BORDER_WIDTH 0x1 -SPINNER_LABEL_BORDER_COLOR 0x828282ff -SPINNER_LABEL_INSIDE_COLOR 0xc8c8c8ff -SPINNER_DEFAULT_BUTTON_BORDER_COLOR 0x828282ff -SPINNER_DEFAULT_BUTTON_INSIDE_COLOR 0xc8c8c8ff -SPINNER_DEFAULT_SYMBOL_COLOR 0x828282ff -SPINNER_DEFAULT_TEXT_COLOR 0x828282ff -SPINNER_HOVER_BUTTON_BORDER_COLOR 0x828282ff -SPINNER_HOVER_BUTTON_INSIDE_COLOR 0xf5f5f5ff -SPINNER_HOVER_SYMBOL_COLOR 0x828282ff -SPINNER_HOVER_TEXT_COLOR 0x828282ff -SPINNER_PRESSED_BUTTON_BORDER_COLOR 0xa078e2ff -SPINNER_PRESSED_BUTTON_INSIDE_COLOR 0xea8fbdff -SPINNER_PRESSED_SYMBOL_COLOR 0x9178aaff -SPINNER_PRESSED_TEXT_COLOR 0x9178aaff -COMBOBOX_PADDING 0x2 -COMBOBOX_BUTTON_WIDTH 0x23 -COMBOBOX_BUTTON_HEIGHT 0xa -COMBOBOX_BORDER_WIDTH 0x2 -COMBOBOX_DEFAULT_BORDER_COLOR 0x828282ff -COMBOBOX_DEFAULT_INSIDE_COLOR 0xc8c8c8ff -COMBOBOX_DEFAULT_TEXT_COLOR 0x828282ff -COMBOBOX_DEFAULT_LIST_TEXT_COLOR 0x828282ff -COMBOBOX_HOVER_BORDER_COLOR 0x828282ff -COMBOBOX_HOVER_INSIDE_COLOR 0xf5f5f5ff -COMBOBOX_HOVER_TEXT_COLOR 0x828282ff -COMBOBOX_HOVER_LIST_TEXT_COLOR 0x828282ff -COMBOBOX_PRESSED_BORDER_COLOR 0xa078e2ff -COMBOBOX_PRESSED_INSIDE_COLOR 0xea8fbdff -COMBOBOX_PRESSED_TEXT_COLOR 0x9178aaff -COMBOBOX_PRESSED_LIST_BORDER_COLOR 0xa078e2ff -COMBOBOX_PRESSED_LIST_INSIDE_COLOR 0xea8fbdff -COMBOBOX_PRESSED_LIST_TEXT_COLOR 0x9178aaff -CHECKBOX_DEFAULT_BORDER_COLOR 0x828282ff -CHECKBOX_DEFAULT_INSIDE_COLOR 0xc8c8c8ff -CHECKBOX_HOVER_BORDER_COLOR 0x828282ff -CHECKBOX_HOVER_INSIDE_COLOR 0xf5f5f5ff -CHECKBOX_CLICK_BORDER_COLOR 0xa078e2ff -CHECKBOX_CLICK_INSIDE_COLOR 0xea8fbdff -CHECKBOX_STATUS_ACTIVE_COLOR 0xa078e2ff -CHECKBOX_INSIDE_WIDTH 0x3 -TEXTBOX_BORDER_WIDTH 0x1 -TEXTBOX_BORDER_COLOR 0x828282ff -TEXTBOX_INSIDE_COLOR 0xc8c8c8ff -TEXTBOX_TEXT_COLOR 0xff -TEXTBOX_LINE_COLOR 0xff -TEXTBOX_TEXT_FONTSIZE 0xa