Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

app/Resources/public/css/base.css

@@ -4849,7 +4849,7 @@ div#chat-remote-video video {
 	padding: 0;
 }
 .grid-courses .items .image {
-    min-height: 225px;
+    /* min-height: 175px; */
     position: relative;
 }
 .grid-courses .items .image .pin{

main/inc/local.inc.php

@@ -1509,6 +1509,6 @@ if ((isset($cas_login) && $cas_login && exist_firstpage_parameter()) ||
 
 Redirect::session_request_uri($logging_in, $user_id);
 
-if (!ChamiloApi::isAjaxRequest() && api_get_configuration_value('survey_answered_at_field')) {
+if (!ChamiloApi::isAjaxRequest() && api_get_configuration_value('allow_mandatory_survey')) {
     SurveyManager::protectByMandatory();
 }