diff --git a/src/game/lib/color/main_color.js b/src/game/lib/color/main_color.js index 13ebd23..47e4166 100644 --- a/src/game/lib/color/main_color.js +++ b/src/game/lib/color/main_color.js @@ -6,14 +6,16 @@ function MainColor() { // CHOCO -MainColor.LIGHT_CHOCO_STRING = "#BF8763"; MainColor.CHOCO_STRING = "#805A42"; +MainColor.DARKER_CHOCO_STRING = "#604031"; MainColor.DARK_CHOCO_STRING = "#402D21"; +MainColor.LIGHT_CHOCO_STRING = "#BF8763"; MainColor.LIGHTER_CHOCO_STRING = "#E6A277"; -MainColor.LIGHT_CHOCO_HEX = 0xBF8763; MainColor.CHOCO_HEX = 0x805A42; +MainColor.DARKER_CHOCO_HEX = 0x604031; MainColor.DARK_CHOCO_HEX = 0x402D21; +MainColor.LIGHT_CHOCO_HEX = 0xBF8763; MainColor.LIGHTER_CHOCO_HEX = 0xE6A277; diff --git a/src/game/lib/flat_button/app_group_tab.js b/src/game/lib/flat_button/app_group_tab.js index bb108bd..a243d67 100644 --- a/src/game/lib/flat_button/app_group_tab.js +++ b/src/game/lib/flat_button/app_group_tab.js @@ -90,9 +90,9 @@ AppGroupTab.loadResources = function() { AppGroupTab.BUTTON_COLOR_OUT_HEX = MainColor.CHOCO_HEX; -AppGroupTab.BUTTON_COLOR_OVER_HEX = MainColor.DARK_CHOCO_HEX; +AppGroupTab.BUTTON_COLOR_OVER_HEX = MainColor.DARKER_CHOCO_HEX; AppGroupTab.BUTTON_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_HEX; -AppGroupTab.BUTTON_COLOR_DISABLED_HEX = MainColor.BLACK_HEX; +AppGroupTab.BUTTON_COLOR_DISABLED_HEX = MainColor.CHOCO_HEX; AppGroupTab.ACTIVE_LINE_COLOR_OUT_HEX = MainColor.DARK_CHOCO_HEX; AppGroupTab.ACTIVE_LINE_COLOR_OVER_HEX = MainColor.CHOCO_HEX; @@ -102,9 +102,9 @@ AppGroupTab.ACTIVE_LINE_COLOR_DISABLED_HEX = MainColor.BLACK_HEX; AppGroupTab.ICON_COLOR_OUT_HEX = MainColor.PAPAYA_WHIP_HEX; // MainColor.LIGHT_CHOCO_HEX; AppGroupTab.ICON_COLOR_OVER_HEX = MainColor.CHOCO_HEX; AppGroupTab.ICON_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_HEX; -AppGroupTab.ICON_COLOR_DISABLED_HEX = MainColor.DARK_CHOCO_HEX; +AppGroupTab.ICON_COLOR_DISABLED_HEX = MainColor.LIGHT_CHOCO_HEX; AppGroupTab.TEXT_COLOR_OUT_STRING = MainColor.BLACK_STRING; -AppGroupTab.TEXT_COLOR_OVER_STRING = MainColor.CHOCO_STRING; +AppGroupTab.TEXT_COLOR_OVER_STRING = MainColor.DARK_CHOCO_STRING; AppGroupTab.TEXT_COLOR_DOWN_STRING = MainColor.CHOCO_STRING; -AppGroupTab.TEXT_COLOR_DISABLED_STRING = MainColor.DARK_CHOCO_STRING; \ No newline at end of file +AppGroupTab.TEXT_COLOR_DISABLED_STRING = MainColor.DARKER_CHOCO_STRING; \ No newline at end of file diff --git a/src/game/lib/flat_button/language_tab.js b/src/game/lib/flat_button/language_tab.js index c972d0a..ce7533c 100644 --- a/src/game/lib/flat_button/language_tab.js +++ b/src/game/lib/flat_button/language_tab.js @@ -94,7 +94,7 @@ LanguageTab.prototype.transformActiveLine = function() { LanguageTab.BUTTON_COLOR_OUT_HEX = MainColor.DARK_CHOCO_HEX; -LanguageTab.BUTTON_COLOR_OVER_HEX = MainColor.CHOCO_HEX; +LanguageTab.BUTTON_COLOR_OVER_HEX = MainColor.DARKER_CHOCO_HEX; LanguageTab.BUTTON_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_HEX; LanguageTab.BUTTON_COLOR_DISABLED_HEX = MainColor.BLACK_HEX; diff --git a/src/game/lib/flat_button/play_app_button.js b/src/game/lib/flat_button/play_app_button.js index 2b9db9f..fff33e2 100644 --- a/src/game/lib/flat_button/play_app_button.js +++ b/src/game/lib/flat_button/play_app_button.js @@ -175,14 +175,14 @@ PlayAppButton.loadResources = function() { PlayAppButton.WIDTH = 150; PlayAppButton.HEIGHT = 180; -PlayAppButton.STROKE_COLOR_OUT_HEX = MainColor.DARK_CHOCO_HEX; -PlayAppButton.STROKE_COLOR_OVER_HEX = MainColor.DARK_CHOCO_HEX; -PlayAppButton.STROKE_COLOR_DOWN_HEX = MainColor.DARK_CHOCO_HEX; -PlayAppButton.STROKE_COLOR_DISABLED_HEX = MainColor.LIGHT_GRAY_HEX; +PlayAppButton.STROKE_COLOR_OUT_HEX = MainColor.LIGHT_CHOCO_HEX; +PlayAppButton.STROKE_COLOR_OVER_HEX = MainColor.LIGHT_CHOCO_HEX; +PlayAppButton.STROKE_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_HEX; +PlayAppButton.STROKE_COLOR_DISABLED_HEX = MainColor.LIGHT_CHOCO_HEX; PlayAppButton.BUTTON_COLOR_OUT_HEX = MainColor.DARK_CHOCO_HEX; -PlayAppButton.BUTTON_COLOR_OVER_HEX = MainColor.LIGHTER_CHOCO_HEX; -PlayAppButton.BUTTON_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_HEX; +PlayAppButton.BUTTON_COLOR_OVER_HEX = MainColor.DARKER_CHOCO_HEX; +PlayAppButton.BUTTON_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_HEX; PlayAppButton.BUTTON_COLOR_DISABLED_HEX = MainColor.LIGHT_GRAY_HEX; PlayAppButton.ICON_COLOR_OUT_HEX = MainColor.WHITE_HEX; @@ -192,5 +192,5 @@ PlayAppButton.ICON_COLOR_DISABLED_HEX = MainColor.LIGHT_GRAY_HEX; PlayAppButton.TEXT_COLOR_OUT_HEX = MainColor.LINEN_STRING; PlayAppButton.TEXT_COLOR_OVER_HEX = MainColor.DARK_CHOCO_STRING; -PlayAppButton.TEXT_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_STRING; -PlayAppButton.TEXT_COLOR_DISABLED_HEX = MainColor.DARK_GRAY_STRING; // MainColor.THISTLE_STRING; \ No newline at end of file +PlayAppButton.TEXT_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_STRING; +PlayAppButton.TEXT_COLOR_DISABLED_HEX = MainColor.DARK_GRAY_STRING; \ No newline at end of file diff --git a/src/game/lib/flat_button/typing_app_button.js b/src/game/lib/flat_button/typing_app_button.js index a12c39c..2a301ec 100644 --- a/src/game/lib/flat_button/typing_app_button.js +++ b/src/game/lib/flat_button/typing_app_button.js @@ -249,17 +249,17 @@ TypingAppButton.HEIGHT = 80; TypingAppButton.KEYBOARD_WIDTH = 100; -TypingAppButton.STROKE_COLOR_OUT_HEX = MainColor.DARK_CHOCO_HEX; -TypingAppButton.STROKE_COLOR_OVER_HEX = MainColor.DARK_CHOCO_HEX; -TypingAppButton.STROKE_COLOR_DOWN_HEX = MainColor.DARK_CHOCO_HEX; -TypingAppButton.STROKE_COLOR_DISABLED_HEX = MainColor.LIGHT_GRAY_HEX; // MainColor.ROSY_BROWN_HEX; +TypingAppButton.STROKE_COLOR_OUT_HEX = MainColor.LIGHT_CHOCO_HEX; +TypingAppButton.STROKE_COLOR_OVER_HEX = MainColor.LIGHT_CHOCO_HEX; +TypingAppButton.STROKE_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_HEX; +TypingAppButton.STROKE_COLOR_DISABLED_HEX = MainColor.LIGHT_CHOCO_HEX; TypingAppButton.BUTTON_COLOR_OUT_HEX = MainColor.DARK_CHOCO_HEX; -TypingAppButton.BUTTON_COLOR_OVER_HEX = MainColor.LIGHTER_CHOCO_HEX; -TypingAppButton.BUTTON_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_HEX; -TypingAppButton.BUTTON_COLOR_DISABLED_HEX = MainColor.LIGHT_GRAY_HEX; // MainColor.ROSY_BROWN_HEX; +TypingAppButton.BUTTON_COLOR_OVER_HEX = MainColor.DARKER_CHOCO_HEX; +TypingAppButton.BUTTON_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_HEX; +TypingAppButton.BUTTON_COLOR_DISABLED_HEX = MainColor.LIGHT_GRAY_HEX; TypingAppButton.TEXT_COLOR_OUT_HEX = MainColor.LINEN_STRING; TypingAppButton.TEXT_COLOR_OVER_HEX = MainColor.DARK_CHOCO_STRING; -TypingAppButton.TEXT_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_STRING; -TypingAppButton.TEXT_COLOR_DISABLED_HEX = MainColor.DARK_GRAY_STRING; // MainColor.THISTLE_STRING; \ No newline at end of file +TypingAppButton.TEXT_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_STRING; +TypingAppButton.TEXT_COLOR_DISABLED_HEX = MainColor.DARK_GRAY_STRING; \ No newline at end of file diff --git a/src/game/lib/flat_button/typing_exam_button.js b/src/game/lib/flat_button/typing_exam_button.js index f7debff..a70cb72 100644 --- a/src/game/lib/flat_button/typing_exam_button.js +++ b/src/game/lib/flat_button/typing_exam_button.js @@ -190,17 +190,17 @@ TypingExamButton.loadResources = function() { TypingExamButton.WIDTH = 400; TypingExamButton.HEIGHT = 80; -TypingExamButton.STROKE_COLOR_OUT_HEX = MainColor.DARK_CHOCO_HEX; -TypingExamButton.STROKE_COLOR_OVER_HEX = MainColor.DARK_CHOCO_HEX; -TypingExamButton.STROKE_COLOR_DOWN_HEX = MainColor.DARK_CHOCO_HEX; -TypingExamButton.STROKE_COLOR_DISABLED_HEX = MainColor.LIGHT_GRAY_HEX; // MainColor.ROSY_BROWN_HEX; +TypingExamButton.STROKE_COLOR_OUT_HEX = MainColor.LIGHT_CHOCO_HEX; +TypingExamButton.STROKE_COLOR_OVER_HEX = MainColor.LIGHT_CHOCO_HEX; +TypingExamButton.STROKE_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_HEX; +TypingExamButton.STROKE_COLOR_DISABLED_HEX = MainColor.LIGHT_CHOCO_HEX; TypingExamButton.BUTTON_COLOR_OUT_HEX = MainColor.DARK_CHOCO_HEX; -TypingExamButton.BUTTON_COLOR_OVER_HEX = MainColor.LIGHTER_CHOCO_HEX; -TypingExamButton.BUTTON_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_HEX; -TypingExamButton.BUTTON_COLOR_DISABLED_HEX = MainColor.LIGHT_GRAY_HEX; // MainColor.ROSY_BROWN_HEX; +TypingExamButton.BUTTON_COLOR_OVER_HEX = MainColor.DARKER_CHOCO_HEX; +TypingExamButton.BUTTON_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_HEX; +TypingExamButton.BUTTON_COLOR_DISABLED_HEX = MainColor.LIGHT_GRAY_HEX; TypingExamButton.TEXT_COLOR_OUT_HEX = MainColor.LINEN_STRING; -TypingExamButton.TEXT_COLOR_OVER_HEX = MainColor.DARK_CHOCO_STRING; -TypingExamButton.TEXT_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_STRING; -TypingExamButton.TEXT_COLOR_DISABLED_HEX = MainColor.DARK_GRAY_STRING; // MainColor.THISTLE_STRING; \ No newline at end of file +TypingExamButton.TEXT_COLOR_OVER_HEX = MainColor.DARK_CHOCO_STRING; +TypingExamButton.TEXT_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_STRING; +TypingExamButton.TEXT_COLOR_DISABLED_HEX = MainColor.DARK_GRAY_STRING; \ No newline at end of file