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

Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336

Browse Source
This commit is contained in:
Mike Ng
2018-01-09 11:01:01 +04:00
parent 4f518c605d
commit 2644962783
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
View File

@@ -110,7 +110,7 @@ class RegistryFormManipulator
'thumb-substitution' => true, 'thumb-substitution' => true,
'anonymous-report' => false, 'anonymous-report' => false,
], ],
'actions' => [ 'actions' => [
'download-max-size' => 120, 'download-max-size' => 120,
'validation-reminder-days' => 2, 'validation-reminder-days' => 2,
'validation-expiration-days' => 10, 'validation-expiration-days' => 10,

8
resources/www/admin/styles/main.scss
View File

@@ -538,10 +538,10 @@ span.simplecolorpicker.picker {
.top-bar-shadow { .top-bar-shadow {
margin-top: 1px; margin-top: 1px;
background: #aaa8a5; /* For browsers that do not support gradients */ background: #aaa8a5; /* For browsers that do not support gradients */
background: -webkit-linear-gradient(bottom, #aaa8a5 , rgba(255, 255, 255, 0.15)); /* For Safari 5.1 to 6.0 */ background: -webkit-linear-gradient(bottom, #aaa8a5, rgba(255, 255, 255, 0.15)); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(bottom, #aaa8a5 , rgba(255, 255, 255, 0.15)); /* For Opera 11.1 to 12.0 */ background: -o-linear-gradient(bottom, #aaa8a5, rgba(255, 255, 255, 0.15)); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(bottom, #aaa8a5 , rgba(255, 255, 255, 0.15)); /* For Firefox 3.6 to 15 */ background: -moz-linear-gradient(bottom, #aaa8a5, rgba(255, 255, 255, 0.15)); /* For Firefox 3.6 to 15 */
background: linear-gradient(to bottom, #aaa8a5 , rgba(255, 255, 255, 0.15)); /* Standard syntax */ background: linear-gradient(to bottom, #aaa8a5, rgba(255, 255, 255, 0.15)); /* Standard syntax */
height: 4px; height: 4px;
} }
.ui-tabs-active { .ui-tabs-active {