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

PHRAS-2544 #comment update fix on grey and white theme #time 8h

Browse Source
This commit is contained in:
Harrys Ravalomanana
2019-07-01 17:41:01 +04:00
parent 22e3605153
commit 63a89521b6
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -1,5 +1,5 @@
<div> <div>
<button class="tools-accordion"><span>Actions<i class="fa fa-chevron-right rotate"></i></span></button> <button class="tools-accordion">Actions</button>
<div class="tools-panel"> <div class="tools-panel">
<button class="ui-corner-all TOOL_disktt_btn basket_window" data-selection-source="basket"> <button class="ui-corner-all TOOL_disktt_btn basket_window" data-selection-source="basket">
<img src="/assets/common/images/icons/disktt_history.png"/> <img src="/assets/common/images/icons/disktt_history.png"/>

6
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -33,7 +33,7 @@
/> />
</td> </td>
<td> <td>
<a class="contextMenuTrigger"></a> <a class="contextMenuTrigger icon-display-grid" href="#"></a>
</td> </td>
</tr> </tr>
</table> </table>
@@ -127,7 +127,7 @@
{% endif %} {% endif %}
--> -->
<td> <td>
<a class="contextMenuTrigger"></a> <a class="contextMenuTrigger icon-display-grid" href="#"></a>
</td> </td>
</tr> </tr>
</table> </table>
@@ -230,7 +230,7 @@
<table> <table>
<tr> <tr>
<td> <td>
<a class="contextMenuTrigger"></a> <a class="contextMenuTrigger icon-display-grid" href="#"></a>
</td> </td>
</tr> </tr>
</table> </table>

28
templates/web/prod/preview/popularity.html.twig
View File

@@ -75,10 +75,20 @@
data.addColumn('number', '{{ 'preview::visualisation' | trans }}'); data.addColumn('number', '{{ 'preview::visualisation' | trans }}');
data.addRows(arrayViews); data.addRows(arrayViews);
var $color = "#FFFFFF";
if ($('body').hasClass('000000')) {
$color = "#FFFFFF";
}
if ($('body').hasClass('FFFFFF')) {
$color = "#000000";
}
/*if ($('body').hasClass('959595')) {
$color = "#000000";
}*/
var options = { var options = {
titleTextStyle: { titleTextStyle: {
color: 'white', color: $color,
fontSize: 13 fontSize: 13
}, },
colors: ['#FF9900'], colors: ['#FF9900'],
@@ -87,28 +97,28 @@
hAxis: { hAxis: {
title: '{{ 'preview::date' | trans }}', title: '{{ 'preview::date' | trans }}',
titleTextStyle: { titleTextStyle: {
color: 'white', color: $color,
fontSize: 11 fontSize: 11
}, },
textStyle:{color: '#FFF'}, textStyle:{color: $color},
format: 'd/M/yy', format: 'd/M/yy',
gridlines: {color: 'none'}, gridlines: {color: 'none'},
min: new Date(statistics.from), min: new Date(statistics.from),
max: new Date(statistics.to), max: new Date(statistics.to),
baselineColor: '#FFF' baselineColor: $color
}, },
vAxis: { vAxis: {
title: '{{ 'preview::visualisation' | trans }}', title: '{{ 'preview::visualisation' | trans }}',
titleTextStyle: { titleTextStyle: {
color: 'white', color: $color,
fontSize: 11 fontSize: 11
}, },
textStyle:{color: '#FFF'}, textStyle:{color: $color},
minValue: 0, minValue: 0,
maxValue: maxValue, maxValue: maxValue,
baselineColor: '#FFF' baselineColor: $color
}, },
legend: {position: 'top', textStyle: {color: 'white'}}, legend: {position: 'top', textStyle: {color: $color}},
}; };
var chart = new google.visualization.ColumnChart( var chart = new google.visualization.ColumnChart(
@@ -199,4 +209,4 @@
}); });
</script> </script>