Browse Source

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

Angel Fernando Quiroz Campos 8 years ago
parent
commit
d8a484d8f9
2 changed files with 6 additions and 13 deletions
  1. 5 12
      app/Resources/public/css/scorm.css
  2. 1 1
      main/lp/learnpath.class.php

+ 5 - 12
app/Resources/public/css/scorm.css

@@ -112,11 +112,7 @@ See https://support.chamilo.org/issues/6976
 }
 .level_0 {
     margin: 0;
-<<<<<<< HEAD
-    padding-left: 20px;
-=======
     padding-left: 30px;
->>>>>>> 3466fc2... fix padding items scorm
 }
 .level_1 {
     margin: 0 0.5em 0 20px;
@@ -129,6 +125,10 @@ See https://support.chamilo.org/issues/6976
 .level_3 {
     margin: 0 0.5em 0 60px;
     padding-left: 30px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    padding-right: 5px;
+    line-height: 14px;
 }
 .level_4 {
     margin: 0 0.5em 0 70px;
@@ -242,11 +242,7 @@ See https://support.chamilo.org/issues/6976
   color: #009AB8;
 }
 .scorm_highlight.scorm_completed .item{
-<<<<<<< HEAD
-  background:url("../../main/img/scorm/scorm_current.png") no-repeat left center !important;
-=======
   background:url("../../main/img/scorm/scorm_current.png") no-repeat 10px center !important;
->>>>>>> 3466fc2... fix padding items scorm
 }
 .scorm_highlight.scorm_failed .item{
     background:url("../../main/img/scorm/scorm_failed.png") no-repeat 10px center !important;
@@ -255,12 +251,9 @@ See https://support.chamilo.org/issues/6976
   color: #FFFFFF !important;
 }
 .scorm_item_normal.scorm_highlight{
-    background-color: #00AAD4;
+    background-color: #00829C;
 }
-
 /* END SCORM CSS BASE*/
-
-
 #scorm-info{
     padding: 10px;
     margin-bottom: 5px;

+ 1 - 1
main/lp/learnpath.class.php

@@ -2487,7 +2487,7 @@ class learnpath
     {
         $text = $percentage . $text_add;
         $output = '<div class="progress">
-                        <div id="progress_bar_value" class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="' .$percentage. '" aria-valuemin="0" aria-valuemax="100" style="width: '.$text.';">
+                        <div id="progress_bar_value" class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="' .$percentage. '" aria-valuemin="0" aria-valuemax="100" style="width: '.$text.';">
                         '. $text .'
                         </div>
                     </div>';