hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 06:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix color with skin

Browse Source
This commit is contained in:
aynsix
2021-12-15 11:47:30 +03:00
parent 629d507e25
commit ff564c9b42
14 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Phraseanet-production-client/config/config.js
View File

@@ -13,5 +13,5 @@ module.exports = {
setupDir: _root + 'tests/setup/node.js', setupDir: _root + 'tests/setup/node.js',
karmaConf: _root + 'config/karma.conf.js', karmaConf: _root + 'config/karma.conf.js',
// change this version when you change JS file for lazy loading // change this version when you change JS file for lazy loading
assetFileVersion: 34 assetFileVersion: 35
}; };

2
Phraseanet-production-client/dist/authenticate.js vendored
View File

@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=34"; /******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=35";
/******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete; /******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() { /******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/authenticate.min.js vendored
View File

@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=34"; /******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=35";
/******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete; /******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() { /******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/commons.js vendored
View File

@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=34"; /******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=35";
/******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete; /******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() { /******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/commons.min.js vendored
View File

@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=34"; /******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=35";
/******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete; /******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() { /******/ function onScriptComplete() {

4
Phraseanet-production-client/dist/skin-000000.css vendored
View File

@@ -3204,6 +3204,10 @@ h3.metadatas-title:after {
line-height: 26px; line-height: 26px;
} }
#proposals #collapseOne {
background: #292929;
}
.ui-dialog .ui-dialog-content.loading, .ui-dialog .ui-dialog-content.loading,
.loading { .loading {
background-image: url("/assets/common/images/icons/loading.svg"); background-image: url("/assets/common/images/icons/loading.svg");

2
Phraseanet-production-client/dist/skin-000000.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
Phraseanet-production-client/dist/skin-959595.css vendored
View File

@@ -3219,6 +3219,10 @@ h3.metadatas-title:after {
line-height: 26px; line-height: 26px;
} }
#proposals #collapseOne {
background: #c9c9c9;
}
.ui-dialog .ui-dialog-content.loading, .ui-dialog .ui-dialog-content.loading,
.loading { .loading {
background-image: url("/assets/common/images/icons/loading.svg"); background-image: url("/assets/common/images/icons/loading.svg");

2
Phraseanet-production-client/dist/skin-959595.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
Phraseanet-production-client/dist/skin-FFFFFF.css vendored
View File

@@ -3221,6 +3221,10 @@ h3.metadatas-title:after {
line-height: 26px; line-height: 26px;
} }
#proposals #collapseOne {
background: #f8f8f8;
}
.ui-dialog .ui-dialog-content.loading, .ui-dialog .ui-dialog-content.loading,
.loading { .loading {
background-image: url("/assets/common/images/icons/loading.svg"); background-image: url("/assets/common/images/icons/loading.svg");

2
Phraseanet-production-client/dist/skin-FFFFFF.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
Phraseanet-production-client/src/skins/style/skin-shared.scss
View File

@@ -1310,6 +1310,10 @@ h3.metadatas-title {
} }
} }
#proposals #collapseOne {
background: $feedback;
}
@import 'ui-components/jquery-ui'; @import 'ui-components/jquery-ui';
@import 'ui-components/context-menu'; @import 'ui-components/context-menu';
@import 'ui-components/forms'; @import 'ui-components/forms';

2
lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
View File

@@ -59,7 +59,7 @@ class PhraseanetExtension extends \Twig_Extension
{ {
return [ return [
// change this version when you change JS file to force the navigation to reload js file // change this version when you change JS file to force the navigation to reload js file
'assetFileVersion' => 34 'assetFileVersion' => 35
]; ];
} }

6
templates/web/prod/index.html.twig
View File

@@ -228,7 +228,7 @@
</button> </button>
</h5> </h5>
</div> </div>
<div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion" style="background:#292929"> <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
<div class="card-body"> <div class="card-body">
<div class="left-facet-filter facet-filter"> <div class="left-facet-filter facet-filter">
<h4>{{ 'index::advance_search: facet-order' | trans }}</h4> <h4>{{ 'index::advance_search: facet-order' | trans }}</h4>
@@ -265,7 +265,7 @@
<div style="padding-left: 5px;"> <div style="padding-left: 5px;">
{% set facetFilter = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'facet') %} {% set facetFilter = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'facet') %}
{% set _empty_facetFilter = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'show__empty__facet') %} {% set _empty_facetFilter = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'show_unset_field_facet') %}
<h5 style="font-size:13px;">{{ 'index::advance_search: facet' | trans }}</h5> <h5 style="font-size:13px;">{{ 'index::advance_search: facet' | trans }}</h5>
<label class="checkbox inline" for="ADVSRCH_FILTER_FACET" style="margin-bottom: 1em;font-size:13px;"> <label class="checkbox inline" for="ADVSRCH_FILTER_FACET" style="margin-bottom: 1em;font-size:13px;">
@@ -274,7 +274,7 @@
</label> </label>
<br/> <br/>
<label class="checkbox inline" for="ADVSRCH_UNSET_FIELD_FACET" style="margin-bottom: 1em;font-size:13px;"> <label class="checkbox inline" for="ADVSRCH_UNSET_FIELD_FACET" style="margin-bottom: 1em;font-size:13px;">
<input id="ADVSRCH_UNSET_FIELD_FACET" type="checkbox" name="show_unset_field_facet" {% if _empty_facetFilter == 'true' %}checked="checked"{% endif %}> <input id="ADVSRCH_UNSET_FIELD_FACET" type="checkbox" name="show_unset_field_facet" {% if _empty_facetFilter == '1' %}checked="checked"{% endif %}>
{{ 'index::advance_search: show-unset-field-facet' | trans }} {{ 'index::advance_search: show-unset-field-facet' | trans }}
</label> </label>