diff --git a/Makefile b/Makefile index 162e266248..d644c078c7 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ install: make install_assets install_composer: - composer install --ignore-platform-reqs + composer install_asset_dependencies: npm install diff --git a/package.json b/package.json index b2ced5c32c..40372d7f1c 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,6 @@ }, "dependencies": { "alchemy-embed-medias": "^0.4.4", - "phraseanet-production-client": "~0.32.2" + "phraseanet-production-client": "../Phraseanet-production-client" } } diff --git a/resources/www/_shared/styles/_main-menu.scss b/resources/www/_shared/styles/_main-menu.scss index be666e273d..64d3ab17ab 100644 --- a/resources/www/_shared/styles/_main-menu.scss +++ b/resources/www/_shared/styles/_main-menu.scss @@ -1,9 +1,9 @@ // @import 'variables'; $mainMenuHeight: 40px !default; $mainMenuLineHeight: 36px !default; -$mainMenuBackgroundColor: #fceb3f !default; +$mainMenuBackgroundColor: #ffe000 !default; $mainMenuLinkColor: #000000 !default; -$mainMenuLinkHoverColor: #fffbcd !default; +$mainMenuLinkHoverColor: #f2f0e9 !default; $mainMenuLinkActiveColor: #FFFFFF !default; $mainMenuLinkBackgroundHoverColor: transparent !default; $mainMenuLinkHoverColor: #000000 !default; diff --git a/resources/www/admin/styles/_databases.scss b/resources/www/admin/styles/_databases.scss index a9a7b04e33..28461acc01 100644 --- a/resources/www/admin/styles/_databases.scss +++ b/resources/www/admin/styles/_databases.scss @@ -5,7 +5,7 @@ } .db_exception { margin-top: 10px; - background-color: #fceb3f; + background-color: #ffe000; } .db_infos { width: 100%; @@ -38,7 +38,7 @@ div[id$="_indexed_bar"] { height: 15px; position: absolute; z-index: 6; - background: #e5d4a0; + background: #dbd8cc; } div[id$="_indexed_percent"] { width: 198px; diff --git a/resources/www/admin/styles/_fields.scss b/resources/www/admin/styles/_fields.scss index 3f39371279..4903ac1e62 100644 --- a/resources/www/admin/styles/_fields.scss +++ b/resources/www/admin/styles/_fields.scss @@ -233,6 +233,7 @@ #admin-field-app .save-all{ padding: 15px; + margin-bottom: 8px; } #admin-field-app .overlay { diff --git a/resources/www/admin/styles/_tables.scss b/resources/www/admin/styles/_tables.scss index 99ac491150..257debf40f 100644 --- a/resources/www/admin/styles/_tables.scss +++ b/resources/www/admin/styles/_tables.scss @@ -19,7 +19,7 @@ table.whoisTable tr { border: #cccccc 1px solid; } table.whoisTable tr:hover { - background-color: #fffbcd; + background-color: #f2f0e9; } table.whoisTable td { padding: 3px; @@ -47,10 +47,10 @@ table.admintable tr { vertical-align: middle; } table.admintable tr.selected:hover { - background-color: #faa732; + background-color: #aaa8a5; } table.admintable thead { - background-color: #e5d4a0; + background-color: #dbd8cc; } table.admintable thead th { padding: 3px; @@ -58,13 +58,13 @@ table.admintable thead th { font-weight: bold; } table.admintable tbody tr.even { - background-color: #fffbcd; + background-color: #f2f0e9; } table.admintable tbody tr.selected { - background-color: #faa732; + background-color: #aaa8a5; } table.admintable tbody tr:hover { - background-color: #faa732; + background-color: #aaa8a5; cursor: pointer; } table.admintable tbody td { @@ -87,10 +87,10 @@ table.admintable .centered { display: none; } #users th.sortable.hover { - background-color: #faa732; + background-color: #aaa8a5; } #users th.sortable.sorted { - background-color: #faa732; + background-color: #aaa8a5; } #users th.sortable.sorted span.ord_notifier { display: inline; @@ -125,8 +125,8 @@ td.users_col.options { font-weight: bold; } #tooltip-usr #tabledescexp td.tooltip-title { - background-color: #faa732; - border: 1px solid #f39106; + background-color: #aaa8a5; + border: 1px solid #aaa8a5; margin: 10px auto; font-weight: bold; font-size: 14px; diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index f7570b2c95..0ffe631229 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -87,12 +87,12 @@ select { } li.selected, div.selected { - background-color: #faa732; + background-color: #aaa8a5; color: #ffffff; } li.selected a, div.selected a { - background-color: #faa732; + background-color: #aaa8a5; color: #ffffff; } .treeview ul { @@ -114,7 +114,7 @@ div.finder div.content div.title { /******* MAIN MENU ************************************************************/ -$mainMenuBackgroundColor: #fceb3f; +$mainMenuBackgroundColor: #ffe000; $mainMenuLinkColor: #333333; $mainMenuLinkHoverColor: #000000; $mainMenuLinkActiveColor: #000000; @@ -128,14 +128,14 @@ $mainMenuLinkBackgroundHoverColor: transparent; /******* LEFT SIDE ************************************************************/ #left { - background-color: #fffbcd; + background-color: #f2f0e9; overflow: auto; } #FNDR { overflow: auto; } #FNDR li.selected { - background-color: #faa732; + background-color: #aaa8a5; color: #ffffff; } #FNDR a { @@ -256,7 +256,7 @@ div.switch_right.unchecked { background-size: 16px; } .board_section div[class="section"] ul.setup li:hover { - background-color: #fffbcd; + background-color: #f2f0e9; } /******* PUBLICATIONS *********************************************************/ #pub_icon { diff --git a/templates/web/admin/collection/collection.html.twig b/templates/web/admin/collection/collection.html.twig index 52ab8be189..35af4790cb 100644 --- a/templates/web/admin/collection/collection.html.twig +++ b/templates/web/admin/collection/collection.html.twig @@ -55,7 +55,7 @@
- +
diff --git a/templates/web/admin/dashboard.html.twig b/templates/web/admin/dashboard.html.twig index 2018626663..ac3e0ee0d6 100644 --- a/templates/web/admin/dashboard.html.twig +++ b/templates/web/admin/dashboard.html.twig @@ -108,14 +108,14 @@ {% endfor %} - +
{{ 'setup:: Reinitialisation des droits admins' | trans }} - +
@@ -127,7 +127,7 @@ {{ 'setup::Tests d\'envois d\'emails' | trans }}
- +
@@ -143,7 +143,7 @@
{% trans %}Reset cache{% endtrans %} - +
diff --git a/templates/web/admin/databox/cgus.html.twig b/templates/web/admin/databox/cgus.html.twig index 5c684aa4a6..548b3ae8e3 100644 --- a/templates/web/admin/databox/cgus.html.twig +++ b/templates/web/admin/databox/cgus.html.twig @@ -8,7 +8,7 @@ {{ 'admin::CGU Les utilisateurs doivent imperativement revalider ces conditions' | trans }} - +
- + {{ 'boutton::annuler' | trans }}
diff --git a/templates/web/admin/publications/list.html.twig b/templates/web/admin/publications/list.html.twig index 095c36cb8f..846bcc0ef3 100644 --- a/templates/web/admin/publications/list.html.twig +++ b/templates/web/admin/publications/list.html.twig @@ -42,7 +42,7 @@
- +
diff --git a/templates/web/admin/setup.html.twig b/templates/web/admin/setup.html.twig index a3b5d671ca..5b4190d83f 100644 --- a/templates/web/admin/setup.html.twig +++ b/templates/web/admin/setup.html.twig @@ -53,7 +53,7 @@ {% endfor %}
- +
{{ form_end(form) }} diff --git a/templates/web/admin/users.html.twig b/templates/web/admin/users.html.twig index 2f10642b9c..ba53842983 100644 --- a/templates/web/admin/users.html.twig +++ b/templates/web/admin/users.html.twig @@ -73,7 +73,7 @@
- +
@@ -248,7 +248,7 @@ {% endif %} - +