From 2644962783246e9c1cc6e21f18c46618e8bd98ab Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Tue, 9 Jan 2018 11:01:01 +0400 Subject: [PATCH] Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 --- .../Core/Configuration/RegistryFormManipulator.php | 2 +- resources/www/admin/styles/main.scss | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php index a0eb3f01a2..377b07fd4d 100644 --- a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php +++ b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php @@ -110,7 +110,7 @@ class RegistryFormManipulator 'thumb-substitution' => true, 'anonymous-report' => false, ], - 'actions' => [ + 'actions' => [ 'download-max-size' => 120, 'validation-reminder-days' => 2, 'validation-expiration-days' => 10, diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index 71bb7f4d9a..f35c14f8dd 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -538,10 +538,10 @@ span.simplecolorpicker.picker { .top-bar-shadow { margin-top: 1px; 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: -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: linear-gradient(to bottom, #aaa8a5 , rgba(255, 255, 255, 0.15)); /* Standard syntax */ + 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: -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 */ height: 4px; } .ui-tabs-active {