Browse Source

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

Julio Montoya 6 years ago
parent
commit
a2b78ea31c

File diff suppressed because it is too large
+ 65 - 5
app/Resources/public/assets/flag-icon-css/flags/1x1/ae.svg


File diff suppressed because it is too large
+ 65 - 5
app/Resources/public/assets/flag-icon-css/flags/4x3/ae.svg


+ 30 - 5
app/Resources/public/css/base.css

@@ -5482,19 +5482,37 @@ div#chat-remote-video video {
     display: none;
 }
 
-.forum-post {
-    border-color: #dddddd !important;
-}
-
 .forum-post .thumbnail {
     margin-bottom: 5px;
+    text-align: center;
+    border: none;
+}
+.forum-post .thumbnail img{
+    border-radius: 50%;
+    border: 2px solid #dddddd;
+    width: 85px;
 }
 
 .forum-post .title-username {
     text-align: center;
-    font-size: 16px;
+    font-size: 14px;
     margin-bottom: 5px;
     margin-top: 0;
+    font-weight: bold;
+    padding-top: 5px;
+}
+.forum-post .user-type.text-center {
+    border-radius: 50%;
+    position: absolute;
+    top: 25%;
+    right: 17%;
+    border: 2px solid #dddddd;
+    padding: 5px;
+    background-color: #fff;
+}
+
+.forum-post {
+    border-color: #dddddd !important;
 }
 
 .forum-post .post-date {
@@ -8432,6 +8450,13 @@ ul#toolnavbox-two li a.btn {
     border-color: #dd853d;
     color: #ffffff;
 }
+.checkbox input[type=checkbox],
+.checkbox-inline input[type=checkbox],
+.radio input[type=radio],
+.radio-inline input[type=radio]{
+    position: relative;
+    margin-left: 10px;
+}
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {
     .sidebar-scorm {

+ 1 - 1
main/exercise/admin.php

@@ -384,7 +384,7 @@ if ($inATest) {
     if ($objExercise->random > 0) {
         $alert .= '<br />'.sprintf(get_lang('OnlyXQuestionsPickedRandomly'), $objExercise->random);
     }
-    echo Display::return_message($alert);
+    echo Display::return_message($alert, 'normal', false);
 } elseif (isset($_GET['newQuestion'])) {
     // we are in create a new question from question pool not in a test
     echo '<div class="actions">';

+ 1 - 1
main/forum/viewthread.php

@@ -347,7 +347,7 @@ foreach ($posts as $post) {
             }
         }
 
-        $post['user_data'] .= '<div class="text-center">'.$iconStatus.'</div>';
+        $post['user_data'] .= '<div class="user-type text-center">'.$iconStatus.'</div>';
     } else {
         if ($allowUserImageForum) {
             $post['user_data'] .= '<div class="thumbnail">'.

Some files were not shown because too many files changed in this diff