diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a5efba50..233a9fad 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,44 +11,142 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -64,178 +162,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -248,11 +227,11 @@ - + - + @@ -272,13 +251,13 @@ - + - + @@ -340,26 +319,29 @@ - + + - - - - - - - + + + + + + + + + @@ -398,7 +380,8 @@ - + + 1602059851601 @@ -498,7 +481,14 @@ - @@ -534,7 +524,8 @@ - @@ -549,11 +540,15 @@ - + - + + + + + @@ -622,19 +617,19 @@ - + - + - + - + diff --git a/img/c/11-category_default.jpg b/img/c/11-category_default.jpg new file mode 100644 index 00000000..cd1fc661 Binary files /dev/null and b/img/c/11-category_default.jpg differ diff --git a/img/c/11-small_default.jpg b/img/c/11-small_default.jpg new file mode 100644 index 00000000..1e63f031 Binary files /dev/null and b/img/c/11-small_default.jpg differ diff --git a/img/c/11.jpg b/img/c/11.jpg new file mode 100644 index 00000000..80f4a4f9 Binary files /dev/null and b/img/c/11.jpg differ diff --git a/img/c/12-category_default.jpg b/img/c/12-category_default.jpg new file mode 100644 index 00000000..cd1fc661 Binary files /dev/null and b/img/c/12-category_default.jpg differ diff --git a/img/c/12-small_default.jpg b/img/c/12-small_default.jpg new file mode 100644 index 00000000..1e63f031 Binary files /dev/null and b/img/c/12-small_default.jpg differ diff --git a/img/c/12.jpg b/img/c/12.jpg new file mode 100644 index 00000000..80f4a4f9 Binary files /dev/null and b/img/c/12.jpg differ diff --git a/img/c/13-category_default.jpg b/img/c/13-category_default.jpg new file mode 100644 index 00000000..eeb101f8 Binary files /dev/null and b/img/c/13-category_default.jpg differ diff --git a/img/c/13-small_default.jpg b/img/c/13-small_default.jpg new file mode 100644 index 00000000..6fce6061 Binary files /dev/null and b/img/c/13-small_default.jpg differ diff --git a/img/c/13.jpg b/img/c/13.jpg new file mode 100644 index 00000000..119ee95d Binary files /dev/null and b/img/c/13.jpg differ diff --git a/img/c/14-category_default.jpg b/img/c/14-category_default.jpg new file mode 100644 index 00000000..9d7189ac Binary files /dev/null and b/img/c/14-category_default.jpg differ diff --git a/img/c/14-small_default.jpg b/img/c/14-small_default.jpg new file mode 100644 index 00000000..f846729a Binary files /dev/null and b/img/c/14-small_default.jpg differ diff --git a/img/c/14.jpg b/img/c/14.jpg new file mode 100644 index 00000000..79940068 Binary files /dev/null and b/img/c/14.jpg differ diff --git a/img/c/15-category_default.jpg b/img/c/15-category_default.jpg new file mode 100644 index 00000000..8718026c Binary files /dev/null and b/img/c/15-category_default.jpg differ diff --git a/img/c/15-small_default.jpg b/img/c/15-small_default.jpg new file mode 100644 index 00000000..0d39b017 Binary files /dev/null and b/img/c/15-small_default.jpg differ diff --git a/img/c/15.jpg b/img/c/15.jpg new file mode 100644 index 00000000..84c59dfd Binary files /dev/null and b/img/c/15.jpg differ diff --git a/img/c/16-category_default.jpg b/img/c/16-category_default.jpg new file mode 100644 index 00000000..e046d25f Binary files /dev/null and b/img/c/16-category_default.jpg differ diff --git a/img/c/16-small_default.jpg b/img/c/16-small_default.jpg new file mode 100644 index 00000000..57b1dd33 Binary files /dev/null and b/img/c/16-small_default.jpg differ diff --git a/img/c/16.jpg b/img/c/16.jpg new file mode 100644 index 00000000..403aad69 Binary files /dev/null and b/img/c/16.jpg differ diff --git a/img/c/21-category_default.jpg b/img/c/21-category_default.jpg new file mode 100644 index 00000000..49a0c0c6 Binary files /dev/null and b/img/c/21-category_default.jpg differ diff --git a/img/c/21-small_default.jpg b/img/c/21-small_default.jpg new file mode 100644 index 00000000..4d466eee Binary files /dev/null and b/img/c/21-small_default.jpg differ diff --git a/img/c/21.jpg b/img/c/21.jpg new file mode 100644 index 00000000..31b0dc6d Binary files /dev/null and b/img/c/21.jpg differ diff --git a/img/c/8-category_default.jpg b/img/c/8-category_default.jpg new file mode 100644 index 00000000..1ad7bfdd Binary files /dev/null and b/img/c/8-category_default.jpg differ diff --git a/img/c/8-small_default.jpg b/img/c/8-small_default.jpg new file mode 100644 index 00000000..c5a9a417 Binary files /dev/null and b/img/c/8-small_default.jpg differ diff --git a/img/c/8.jpg b/img/c/8.jpg new file mode 100644 index 00000000..63429a13 Binary files /dev/null and b/img/c/8.jpg differ diff --git a/img/c/9-category_default.jpg b/img/c/9-category_default.jpg new file mode 100644 index 00000000..7ad8407b Binary files /dev/null and b/img/c/9-category_default.jpg differ diff --git a/img/c/9-small_default.jpg b/img/c/9-small_default.jpg new file mode 100644 index 00000000..7a405e31 Binary files /dev/null and b/img/c/9-small_default.jpg differ diff --git a/img/c/9.jpg b/img/c/9.jpg new file mode 100644 index 00000000..6e1a7f4b Binary files /dev/null and b/img/c/9.jpg differ diff --git a/img/c/ar-default-category_default.jpg b/img/c/ar-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/ar-default-category_default.jpg and /dev/null differ diff --git a/img/c/ar-default-small_default.jpg b/img/c/ar-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/ar-default-small_default.jpg and /dev/null differ diff --git a/img/c/bg-default-category_default.jpg b/img/c/bg-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/bg-default-category_default.jpg and /dev/null differ diff --git a/img/c/bg-default-small_default.jpg b/img/c/bg-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/bg-default-small_default.jpg and /dev/null differ diff --git a/img/c/bn-default-category_default.jpg b/img/c/bn-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/bn-default-category_default.jpg and /dev/null differ diff --git a/img/c/bn-default-small_default.jpg b/img/c/bn-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/bn-default-small_default.jpg and /dev/null differ diff --git a/img/c/br-default-category_default.jpg b/img/c/br-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/br-default-category_default.jpg and /dev/null differ diff --git a/img/c/br-default-small_default.jpg b/img/c/br-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/br-default-small_default.jpg and /dev/null differ diff --git a/img/c/bs-default-category_default.jpg b/img/c/bs-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/bs-default-category_default.jpg and /dev/null differ diff --git a/img/c/bs-default-small_default.jpg b/img/c/bs-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/bs-default-small_default.jpg and /dev/null differ diff --git a/img/c/cs-default-category_default.jpg b/img/c/cs-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/cs-default-category_default.jpg and /dev/null differ diff --git a/img/c/cs-default-small_default.jpg b/img/c/cs-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/cs-default-small_default.jpg and /dev/null differ diff --git a/img/c/da-default-category_default.jpg b/img/c/da-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/da-default-category_default.jpg and /dev/null differ diff --git a/img/c/da-default-small_default.jpg b/img/c/da-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/da-default-small_default.jpg and /dev/null differ diff --git a/img/c/de-default-category_default.jpg b/img/c/de-default-category_default.jpg deleted file mode 100644 index 086b626b..00000000 Binary files a/img/c/de-default-category_default.jpg and /dev/null differ diff --git a/img/c/de-default-small_default.jpg b/img/c/de-default-small_default.jpg deleted file mode 100644 index 229b42a8..00000000 Binary files a/img/c/de-default-small_default.jpg and /dev/null differ diff --git a/img/c/el-default-category_default.jpg b/img/c/el-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/el-default-category_default.jpg and /dev/null differ diff --git a/img/c/el-default-small_default.jpg b/img/c/el-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/el-default-small_default.jpg and /dev/null differ diff --git a/img/c/en-default-category_default.jpg b/img/c/en-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/en-default-category_default.jpg and /dev/null differ diff --git a/img/c/en-default-small_default.jpg b/img/c/en-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/en-default-small_default.jpg and /dev/null differ diff --git a/img/c/es-default-category_default.jpg b/img/c/es-default-category_default.jpg deleted file mode 100644 index 469b60c0..00000000 Binary files a/img/c/es-default-category_default.jpg and /dev/null differ diff --git a/img/c/es-default-small_default.jpg b/img/c/es-default-small_default.jpg deleted file mode 100644 index bc98ba16..00000000 Binary files a/img/c/es-default-small_default.jpg and /dev/null differ diff --git a/img/c/et-default-category_default.jpg b/img/c/et-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/et-default-category_default.jpg and /dev/null differ diff --git a/img/c/et-default-small_default.jpg b/img/c/et-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/et-default-small_default.jpg and /dev/null differ diff --git a/img/c/fa-default-category_default.jpg b/img/c/fa-default-category_default.jpg deleted file mode 100644 index 1942773f..00000000 Binary files a/img/c/fa-default-category_default.jpg and /dev/null differ diff --git a/img/c/fa-default-small_default.jpg b/img/c/fa-default-small_default.jpg deleted file mode 100644 index c172d24c..00000000 Binary files a/img/c/fa-default-small_default.jpg and /dev/null differ diff --git a/img/c/fi-default-category_default.jpg b/img/c/fi-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/fi-default-category_default.jpg and /dev/null differ diff --git a/img/c/fi-default-small_default.jpg b/img/c/fi-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/fi-default-small_default.jpg and /dev/null differ diff --git a/img/c/gl-default-category_default.jpg b/img/c/gl-default-category_default.jpg deleted file mode 100644 index 469b60c0..00000000 Binary files a/img/c/gl-default-category_default.jpg and /dev/null differ diff --git a/img/c/gl-default-small_default.jpg b/img/c/gl-default-small_default.jpg deleted file mode 100644 index bc98ba16..00000000 Binary files a/img/c/gl-default-small_default.jpg and /dev/null differ diff --git a/img/c/he-default-category_default.jpg b/img/c/he-default-category_default.jpg deleted file mode 100644 index 435d3207..00000000 Binary files a/img/c/he-default-category_default.jpg and /dev/null differ diff --git a/img/c/he-default-small_default.jpg b/img/c/he-default-small_default.jpg deleted file mode 100644 index 03083266..00000000 Binary files a/img/c/he-default-small_default.jpg and /dev/null differ diff --git a/img/c/hi-default-category_default.jpg b/img/c/hi-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/hi-default-category_default.jpg and /dev/null differ diff --git a/img/c/hi-default-small_default.jpg b/img/c/hi-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/hi-default-small_default.jpg and /dev/null differ diff --git a/img/c/hr-default-category_default.jpg b/img/c/hr-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/hr-default-category_default.jpg and /dev/null differ diff --git a/img/c/hr-default-small_default.jpg b/img/c/hr-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/hr-default-small_default.jpg and /dev/null differ diff --git a/img/c/hu-default-category_default.jpg b/img/c/hu-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/hu-default-category_default.jpg and /dev/null differ diff --git a/img/c/hu-default-small_default.jpg b/img/c/hu-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/hu-default-small_default.jpg and /dev/null differ diff --git a/img/c/id-default-category_default.jpg b/img/c/id-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/id-default-category_default.jpg and /dev/null differ diff --git a/img/c/id-default-small_default.jpg b/img/c/id-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/id-default-small_default.jpg and /dev/null differ diff --git a/img/c/it-default-category_default.jpg b/img/c/it-default-category_default.jpg deleted file mode 100644 index dbee9535..00000000 Binary files a/img/c/it-default-category_default.jpg and /dev/null differ diff --git a/img/c/it-default-small_default.jpg b/img/c/it-default-small_default.jpg deleted file mode 100644 index d8472698..00000000 Binary files a/img/c/it-default-small_default.jpg and /dev/null differ diff --git a/img/c/ja-default-category_default.jpg b/img/c/ja-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/ja-default-category_default.jpg and /dev/null differ diff --git a/img/c/ja-default-small_default.jpg b/img/c/ja-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/ja-default-small_default.jpg and /dev/null differ diff --git a/img/c/lt-default-category_default.jpg b/img/c/lt-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/lt-default-category_default.jpg and /dev/null differ diff --git a/img/c/lt-default-small_default.jpg b/img/c/lt-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/lt-default-small_default.jpg and /dev/null differ diff --git a/img/c/lv-default-category_default.jpg b/img/c/lv-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/lv-default-category_default.jpg and /dev/null differ diff --git a/img/c/lv-default-small_default.jpg b/img/c/lv-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/lv-default-small_default.jpg and /dev/null differ diff --git a/img/c/mk-default-category_default.jpg b/img/c/mk-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/mk-default-category_default.jpg and /dev/null differ diff --git a/img/c/mk-default-small_default.jpg b/img/c/mk-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/mk-default-small_default.jpg and /dev/null differ diff --git a/img/c/mx-default-category_default.jpg b/img/c/mx-default-category_default.jpg deleted file mode 100644 index 469b60c0..00000000 Binary files a/img/c/mx-default-category_default.jpg and /dev/null differ diff --git a/img/c/mx-default-small_default.jpg b/img/c/mx-default-small_default.jpg deleted file mode 100644 index bc98ba16..00000000 Binary files a/img/c/mx-default-small_default.jpg and /dev/null differ diff --git a/img/c/nl-default-category_default.jpg b/img/c/nl-default-category_default.jpg deleted file mode 100644 index aaa641ae..00000000 Binary files a/img/c/nl-default-category_default.jpg and /dev/null differ diff --git a/img/c/nl-default-small_default.jpg b/img/c/nl-default-small_default.jpg deleted file mode 100644 index 7278bc46..00000000 Binary files a/img/c/nl-default-small_default.jpg and /dev/null differ diff --git a/img/c/no-default-category_default.jpg b/img/c/no-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/no-default-category_default.jpg and /dev/null differ diff --git a/img/c/no-default-small_default.jpg b/img/c/no-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/no-default-small_default.jpg and /dev/null differ diff --git a/img/c/pl-default-category_default.jpg b/img/c/pl-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/pl-default-category_default.jpg and /dev/null differ diff --git a/img/c/pl-default-small_default.jpg b/img/c/pl-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/pl-default-small_default.jpg and /dev/null differ diff --git a/img/c/pt-default-category_default.jpg b/img/c/pt-default-category_default.jpg deleted file mode 100644 index c872df37..00000000 Binary files a/img/c/pt-default-category_default.jpg and /dev/null differ diff --git a/img/c/pt-default-small_default.jpg b/img/c/pt-default-small_default.jpg deleted file mode 100644 index 1be914a4..00000000 Binary files a/img/c/pt-default-small_default.jpg and /dev/null differ diff --git a/img/c/qc-default-category_default.jpg b/img/c/qc-default-category_default.jpg deleted file mode 100644 index ff79195b..00000000 Binary files a/img/c/qc-default-category_default.jpg and /dev/null differ diff --git a/img/c/qc-default-small_default.jpg b/img/c/qc-default-small_default.jpg deleted file mode 100644 index 3a0647a2..00000000 Binary files a/img/c/qc-default-small_default.jpg and /dev/null differ diff --git a/img/c/ro-default-category_default.jpg b/img/c/ro-default-category_default.jpg deleted file mode 100644 index 58a4e10e..00000000 Binary files a/img/c/ro-default-category_default.jpg and /dev/null differ diff --git a/img/c/ro-default-small_default.jpg b/img/c/ro-default-small_default.jpg deleted file mode 100644 index 86bcb8b6..00000000 Binary files a/img/c/ro-default-small_default.jpg and /dev/null differ diff --git a/img/c/ru-default-category_default.jpg b/img/c/ru-default-category_default.jpg deleted file mode 100644 index 7eec73dd..00000000 Binary files a/img/c/ru-default-category_default.jpg and /dev/null differ diff --git a/img/c/ru-default-small_default.jpg b/img/c/ru-default-small_default.jpg deleted file mode 100644 index 6cd3707d..00000000 Binary files a/img/c/ru-default-small_default.jpg and /dev/null differ diff --git a/img/c/si-default-category_default.jpg b/img/c/si-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/si-default-category_default.jpg and /dev/null differ diff --git a/img/c/si-default-small_default.jpg b/img/c/si-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/si-default-small_default.jpg and /dev/null differ diff --git a/img/c/sk-default-category_default.jpg b/img/c/sk-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/sk-default-category_default.jpg and /dev/null differ diff --git a/img/c/sk-default-small_default.jpg b/img/c/sk-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/sk-default-small_default.jpg and /dev/null differ diff --git a/img/c/sr-default-category_default.jpg b/img/c/sr-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/sr-default-category_default.jpg and /dev/null differ diff --git a/img/c/sr-default-small_default.jpg b/img/c/sr-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/sr-default-small_default.jpg and /dev/null differ diff --git a/img/c/sv-default-category_default.jpg b/img/c/sv-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/sv-default-category_default.jpg and /dev/null differ diff --git a/img/c/sv-default-small_default.jpg b/img/c/sv-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/sv-default-small_default.jpg and /dev/null differ diff --git a/img/c/tr-default-category_default.jpg b/img/c/tr-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/tr-default-category_default.jpg and /dev/null differ diff --git a/img/c/tr-default-small_default.jpg b/img/c/tr-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/tr-default-small_default.jpg and /dev/null differ diff --git a/img/c/tw-default-category_default.jpg b/img/c/tw-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/tw-default-category_default.jpg and /dev/null differ diff --git a/img/c/tw-default-small_default.jpg b/img/c/tw-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/tw-default-small_default.jpg and /dev/null differ diff --git a/img/c/uk-default-category_default.jpg b/img/c/uk-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/uk-default-category_default.jpg and /dev/null differ diff --git a/img/c/uk-default-small_default.jpg b/img/c/uk-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/uk-default-small_default.jpg and /dev/null differ diff --git a/img/c/vn-default-category_default.jpg b/img/c/vn-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/vn-default-category_default.jpg and /dev/null differ diff --git a/img/c/vn-default-small_default.jpg b/img/c/vn-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/vn-default-small_default.jpg and /dev/null differ diff --git a/img/c/zh-default-category_default.jpg b/img/c/zh-default-category_default.jpg deleted file mode 100644 index f601fccd..00000000 Binary files a/img/c/zh-default-category_default.jpg and /dev/null differ diff --git a/img/c/zh-default-small_default.jpg b/img/c/zh-default-small_default.jpg deleted file mode 100644 index ec91420a..00000000 Binary files a/img/c/zh-default-small_default.jpg and /dev/null differ diff --git a/img/tmp/PS98K31p b/img/tmp/PS98K31p new file mode 100644 index 00000000..8f6166cd Binary files /dev/null and b/img/tmp/PS98K31p differ diff --git a/img/tmp/PSMBYDX7 b/img/tmp/PSMBYDX7 new file mode 100644 index 00000000..4ac1178c Binary files /dev/null and b/img/tmp/PSMBYDX7 differ diff --git a/img/tmp/PScu8j6T b/img/tmp/PScu8j6T new file mode 100644 index 00000000..8f6166cd Binary files /dev/null and b/img/tmp/PScu8j6T differ diff --git a/img/tmp/manufacturer_10_1.jpg b/img/tmp/manufacturer_10_1.jpg new file mode 100644 index 00000000..d78e62ad Binary files /dev/null and b/img/tmp/manufacturer_10_1.jpg differ diff --git a/img/tmp/manufacturer_11_1.jpg b/img/tmp/manufacturer_11_1.jpg new file mode 100644 index 00000000..29dd92e9 Binary files /dev/null and b/img/tmp/manufacturer_11_1.jpg differ diff --git a/img/tmp/manufacturer_13_1.jpg b/img/tmp/manufacturer_13_1.jpg new file mode 100644 index 00000000..d1242ad9 Binary files /dev/null and b/img/tmp/manufacturer_13_1.jpg differ diff --git a/img/tmp/manufacturer_14_1.jpg b/img/tmp/manufacturer_14_1.jpg new file mode 100644 index 00000000..988097e4 Binary files /dev/null and b/img/tmp/manufacturer_14_1.jpg differ diff --git a/img/tmp/manufacturer_15_1.jpg b/img/tmp/manufacturer_15_1.jpg new file mode 100644 index 00000000..03a84d97 Binary files /dev/null and b/img/tmp/manufacturer_15_1.jpg differ diff --git a/img/tmp/manufacturer_8_1.jpg b/img/tmp/manufacturer_8_1.jpg index 530a6fbc..d51a164f 100644 Binary files a/img/tmp/manufacturer_8_1.jpg and b/img/tmp/manufacturer_8_1.jpg differ diff --git a/img/tmp/manufacturer_9_1.jpg b/img/tmp/manufacturer_9_1.jpg new file mode 100644 index 00000000..c9f1d798 Binary files /dev/null and b/img/tmp/manufacturer_9_1.jpg differ diff --git a/themes/classic-child/assets/css/custom.css b/themes/classic-child/assets/css/custom.css index 07a63163..0442fd1d 100644 --- a/themes/classic-child/assets/css/custom.css +++ b/themes/classic-child/assets/css/custom.css @@ -24,7 +24,6 @@ a { margin-bottom: 20px; } - /* Barre des catégories */ .header-nav { background: white; @@ -55,7 +54,16 @@ a { margin-right: 10px; } +#js-product-list-header { + display: none; +} +.qui-sommes-nous { + width: 100%; + margin-top: .9375rem; + text-align: left; + white-space: nowrap; +} /* Espace au-dessus de la bannière */ #wrapper { @@ -147,6 +155,7 @@ a:hover { .block-categories { background-color: rgba(177,194,90,0.5); box-shadow: none; + padding: 1rem 1.25rem; border-radius: 6px; } .block-categories .category-sub-menu { @@ -170,9 +179,13 @@ a:hover { } .divCategorie { text-align: center; + opacity: 0.75; + margin-top: -15px; } -.imageCategorie { - width:50% +.divCategorie img { + width: 200px; + overflow: hidden; + vertical-align: top; } /******* Pagination ********/ diff --git a/themes/classic-child/modules/ppbrandslider/views/css/ppbrandslider.css b/themes/classic-child/modules/ppbrandslider/views/css/ppbrandslider.css index ac223c0f..79f63d46 100644 --- a/themes/classic-child/modules/ppbrandslider/views/css/ppbrandslider.css +++ b/themes/classic-child/modules/ppbrandslider/views/css/ppbrandslider.css @@ -1,6 +1,6 @@ -h1 { - text-align: center; - display: none; +#section-ppbrandslider > h1 { +text-align: center; +display: none; } .nbs-flexisel-container { @@ -53,8 +53,10 @@ h1 { z-index: 4; top: 50%; transform: translateY(-50%); - background: #1B9BCC; - color: #fff; + /*background: #1B9BCC;*/ + /*color: #fff;*/ + background: #fff; + color: #1B9BCC; } .nbs-flexisel-nav-left { diff --git a/themes/classic-child/modules/ppbrandslider/views/templates/hook/displayHome.tpl b/themes/classic-child/modules/ppbrandslider/views/templates/hook/displayHome.tpl index 2a155513..c3d71ac9 100644 --- a/themes/classic-child/modules/ppbrandslider/views/templates/hook/displayHome.tpl +++ b/themes/classic-child/modules/ppbrandslider/views/templates/hook/displayHome.tpl @@ -7,15 +7,17 @@ {/if} {if $enable_brand_slider} -

Nos marques

-
    -{foreach from=$manufacturers item=manufacturer name=manufacturer_list} -
  • - - -
    • -{/foreach} -
+
+

Nos marques

+
    + {foreach from=$manufacturers item=manufacturer name=manufacturer_list} +
  • + + +
    • + {/foreach} +
+
{/if} diff --git a/themes/classic-child/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl b/themes/classic-child/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl index 6c0b674d..5b052f18 100644 --- a/themes/classic-child/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl +++ b/themes/classic-child/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl @@ -39,7 +39,7 @@
  • {$categories.name}
  • {categories nodes=$categories.children}
    • -
    - {if !empty($category.image.legend)}{$category.image.legend}{/if} -
    + +
    + {if !empty($category.image.legend)}{$category.image.legend}{/if}
    diff --git a/themes/classic-child/templates/_partials/footer.tpl b/themes/classic-child/templates/_partials/footer.tpl index e21a7ac6..e5da4a25 100644 --- a/themes/classic-child/templates/_partials/footer.tpl +++ b/themes/classic-child/templates/_partials/footer.tpl @@ -1,5 +1,6 @@ {extends file='parent:_partials/footer.tpl'} +{*Signature perso de TheCoreDev *} {block name='copyright_link'} {l s='%copyright% %year% - Développé par TheCoreDev' sprintf=['%year%' => 'Y'|date, '%copyright%' => '©'] d='Shop.Theme.Global'} diff --git a/themes/classic-child/templates/_partials/head.tpl b/themes/classic-child/templates/_partials/head.tpl index 7f2a9ce3..544a4f53 100644 --- a/themes/classic-child/templates/_partials/head.tpl +++ b/themes/classic-child/templates/_partials/head.tpl @@ -46,7 +46,7 @@ {/block} {/block} -{* Mes feuilles de style perso *} +{* TheCoreDev : rajout de CSS perso *} {**} diff --git a/themes/classic-child/templates/_partials/header.tpl b/themes/classic-child/templates/_partials/header.tpl index b2adeb97..d4ba2f68 100644 --- a/themes/classic-child/templates/_partials/header.tpl +++ b/themes/classic-child/templates/_partials/header.tpl @@ -5,10 +5,14 @@
    -
    +
    {hook h='displayNav1'}
    -
    +
    +
    + + Qui sommes-nous +
    {hook h='displayNav2'}
    diff --git a/themes/classic-child/templates/catalog/_partials/category-header.tpl b/themes/classic-child/templates/catalog/_partials/category-header.tpl deleted file mode 100644 index 5c43475f..00000000 --- a/themes/classic-child/templates/catalog/_partials/category-header.tpl +++ /dev/null @@ -1,17 +0,0 @@ -{*
    *} -{* {if $listing.pagination.items_shown_from == 1}*} -{*
    *} -{*

    {$category.name}

    *} -{*
    *} -{* {if $category.description}*} -{*
    {$category.description nofilter}
    *} -{* {/if}*} -{* {if $category.image.large.url}*} -{*
    *} -{* {if !empty($category.image.legend)}{$category.image.legend}{else}{$category.name}{/if}*} -{*
    *} -{* {/if}*} -{*
    *} -{*
    *} -{* {/if}*} -{*
    *} diff --git a/themes/classic-child/templates/layouts/layout-both-columns.tpl b/themes/classic-child/templates/layouts/layout-both-columns.tpl deleted file mode 100644 index 4a2ddfbb..00000000 --- a/themes/classic-child/templates/layouts/layout-both-columns.tpl +++ /dev/null @@ -1,112 +0,0 @@ -{** - * 2007-2019 PrestaShop and Contributors - * - * NOTICE OF LICENSE - * - * This source file is subject to the Academic Free License 3.0 (AFL-3.0) - * that is bundled with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * https://opensource.org/licenses/AFL-3.0 - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@prestashop.com so we can send you a copy immediately. - * - * DISCLAIMER - * - * Do not edit or add to this file if you wish to upgrade PrestaShop to newer - * versions in the future. If you wish to customize PrestaShop for your - * needs please refer to https://www.prestashop.com for more information. - * - * @author PrestaShop SA - * @copyright 2007-2019 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA - *} - - - - - {block name='head'} - {include file='_partials/head.tpl'} - {/block} - - - - - {block name='hook_after_body_opening_tag'} - {hook h='displayAfterBodyOpeningTag'} - {/block} - -
    - {block name='product_activation'} - {include file='catalog/_partials/product-activation.tpl'} - {/block} - - - - {block name='notifications'} - {include file='_partials/notifications.tpl'} - {/block} - -
    - {hook h="displayWrapperTop"} -
    - {block name='breadcrumb'} - {include file='_partials/breadcrumb.tpl'} - {/block} - - {block name="left_column"} -
    - {if $page.page_name == 'product'} - {hook h='displayLeftColumnProduct'} - {else} - {hook h="displayLeftColumn"} - {/if} -
    - {/block} - - {block name="content_wrapper"} -
    - {hook h="displayContentWrapperTop"} - {block name="content"} -

    Hello world! This is HTML5 Boilerplate.

    - {/block} - {hook h="displayContentWrapperBottom"} -
    - {/block} - - {block name="right_column"} -
    - {if $page.page_name == 'product'} - {hook h='displayRightColumnProduct'} - {else} - {hook h="displayRightColumn"} - {/if} -
    - {/block} -
    - {hook h="displayWrapperBottom"} -
    - - - -
    - - {block name='javascript_bottom'} - {include file="_partials/javascript.tpl" javascript=$javascript.bottom} - {/block} - - {block name='hook_before_body_closing_tag'} - {hook h='displayBeforeBodyClosingTag'} - {/block} - - -