Merge branch 'masterpiece' of ssh://kong:/1TBHDD/ikong/taobin_project into masterpiece
BIN
image/event/apple_farm_festival/apple_farm_festival_banner.png
Normal file
|
After Width: | Height: | Size: 477 KiB |
BIN
image/event/happy_trios/happy_trios_2.png
Normal file
|
After Width: | Height: | Size: 450 KiB |
|
|
@ -1 +1 @@
|
|||
normal_thai=ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png
|
||||
normal_thai=ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
normal_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
normal_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
press_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
press_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
disable_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
disable_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
|
||||
normal_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
|
||||
normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
|
||||
press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
|
||||
press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
|
||||
disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
|
||||
disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png
|
||||
BIN
image/feature/test_color/Blue.png
Normal file
|
After Width: | Height: | Size: 3 KiB |
BIN
image/feature/test_color/BlueP.png
Normal file
|
After Width: | Height: | Size: 3.7 KiB |
BIN
image/feature/test_color/Green.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
BIN
image/feature/test_color/GreenP.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
image/feature/test_color/Indigo.png
Normal file
|
After Width: | Height: | Size: 3.5 KiB |
BIN
image/feature/test_color/IndigoP.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
image/feature/test_color/Orange.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
image/feature/test_color/OrangeP.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
image/feature/test_color/Red.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
BIN
image/feature/test_color/RedP.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
image/feature/test_color/Violet.png
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
BIN
image/feature/test_color/VioletP.png
Normal file
|
After Width: | Height: | Size: 4.3 KiB |
BIN
image/feature/test_color/White.png
Normal file
|
After Width: | Height: | Size: 3.4 KiB |
BIN
image/feature/test_color/WhiteP.png
Normal file
|
After Width: | Height: | Size: 4.2 KiB |
BIN
image/feature/test_color/Yellow.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
image/feature/test_color/YellowP.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
image/feature/test_color/bn_off.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
BIN
image/feature/test_color/bn_on.png
Normal file
|
After Width: | Height: | Size: 3 KiB |
BIN
image/feature/test_color/bp_off.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
BIN
image/feature/test_color/bp_on.png
Normal file
|
After Width: | Height: | Size: 3 KiB |
BIN
image/feature/test_color/btn_toggle_off.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
image/feature/test_color/btn_toggle_on.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
image/feature/test_color/overview.png
Normal file
|
After Width: | Height: | Size: 410 KiB |
BIN
image/page2/bn_soda_20B.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
BIN
image/page2/bp_soda_20B.png
Normal file
|
After Width: | Height: | Size: 21 KiB |
BIN
image/page2_en/page2/bn_soda_20B.png
Normal file
|
After Width: | Height: | Size: 21 KiB |
BIN
image/page2_en/page2/bp_soda_20B.png
Normal file
|
After Width: | Height: | Size: 21 KiB |
BIN
image/page2_inter/bn_soda_20B_EN.png
Normal file
|
After Width: | Height: | Size: 21 KiB |
BIN
image/page2_inter/bn_soda_20B_TH.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
BIN
image/page2_inter/bp_soda_20B_EN.png
Normal file
|
After Width: | Height: | Size: 21 KiB |
BIN
image/page2_inter/bp_soda_20B_TH.png
Normal file
|
After Width: | Height: | Size: 21 KiB |
BIN
image/page3_2/bn_20_baht.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
image/page3_2/bp_20_baht.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
image/page3_2_en/bn_20_baht.png
Normal file
|
After Width: | Height: | Size: 2.1 KiB |
BIN
image/page3_2_en/bp_20_baht.png
Normal file
|
After Width: | Height: | Size: 2.1 KiB |
BIN
image/page3_2_v2/bn_20_baht.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
image/page3_2_v2/bp_20_baht.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
image/page3_2_v2_en/bn_20_baht.png
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
image/page3_2_v2_en/bp_20_baht.png
Normal file
|
After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 34 KiB |
BIN
image/page_doing/txt_66.png
Normal file
|
After Width: | Height: | Size: 22 KiB |
BIN
image/page_doing/txt_66_en.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
image/page_drink_disable_n2/bn_Apple_Americano.png
Normal file
|
After Width: | Height: | Size: 67 KiB |
BIN
image/page_drink_disable_n2/bn_Apple_Frop_Longback.png
Normal file
|
After Width: | Height: | Size: 66 KiB |
BIN
image/page_drink_disable_n2/bn_Apple_Ginger.png
Normal file
|
After Width: | Height: | Size: 66 KiB |
BIN
image/page_drink_disable_n2/bn_Apple_Jasmine_Tea.png
Normal file
|
After Width: | Height: | Size: 66 KiB |
BIN
image/page_drink_disable_n2/bn_Apple_Juice.png
Normal file
|
After Width: | Height: | Size: 66 KiB |
BIN
image/page_drink_disable_n2/bn_Apple_Oolong.png
Normal file
|
After Width: | Height: | Size: 68 KiB |
BIN
image/page_drink_disable_n2/bn_Apple_Oreo_Volcano.png
Normal file
|
After Width: | Height: | Size: 67 KiB |
BIN
image/page_drink_disable_n2/bn_Apple_Punch_Drink.png
Normal file
|
After Width: | Height: | Size: 66 KiB |
BIN
image/page_drink_disable_n2/bn_Apple_Pure_matcha.png
Normal file
|
After Width: | Height: | Size: 66 KiB |
BIN
image/page_drink_disable_n2/bn_Apple_Soda.png
Normal file
|
After Width: | Height: | Size: 66 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 75 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 75 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 43 KiB |
BIN
image/page_drink_disable_n2/bn_Pepsi_Caramel.png
Normal file
|
After Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 67 KiB |
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 75 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 73 KiB |
BIN
image/page_drink_n/bn_Apple_Americano.png
Normal file
|
After Width: | Height: | Size: 74 KiB |
BIN
image/page_drink_n/bn_Apple_Frop_Longback.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
BIN
image/page_drink_n/bn_Apple_Ginger.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
BIN
image/page_drink_n/bn_Apple_Jasmine_Tea.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
BIN
image/page_drink_n/bn_Apple_Juice.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
BIN
image/page_drink_n/bn_Apple_Oolong.png
Normal file
|
After Width: | Height: | Size: 74 KiB |
BIN
image/page_drink_n/bn_Apple_Oreo_Volcano.png
Normal file
|
After Width: | Height: | Size: 74 KiB |
BIN
image/page_drink_n/bn_Apple_Punch_Drink.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
BIN
image/page_drink_n/bn_Apple_Pure_matcha.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
BIN
image/page_drink_n/bn_Apple_Soda.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 48 KiB |
BIN
image/page_drink_n/bn_Pepsi_Caramel.png
Normal file
|
After Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 80 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 78 KiB |
BIN
image/page_drink_picture2_n/bn_Apple_Americano.png
Normal file
|
After Width: | Height: | Size: 19 KiB |
BIN
image/page_drink_picture2_n/bn_Apple_Frop_Longback.png
Normal file
|
After Width: | Height: | Size: 19 KiB |
BIN
image/page_drink_picture2_n/bn_Apple_Ginger.png
Normal file
|
After Width: | Height: | Size: 21 KiB |
BIN
image/page_drink_picture2_n/bn_Apple_Jasmine_Tea.png
Normal file
|
After Width: | Height: | Size: 24 KiB |
BIN
image/page_drink_picture2_n/bn_Apple_Juice.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
image/page_drink_picture2_n/bn_Apple_Oolong.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
image/page_drink_picture2_n/bn_Apple_Oreo_Volcano.png
Normal file
|
After Width: | Height: | Size: 28 KiB |