Feature #1282 - Fixing a syntax error (bad commenting) in some css files.

skala
Ivan Tcholakov 15 years ago
parent 2f7f23f714
commit 2eca0927d1
  1. 4
      main/css/chamilo/default.css
  2. 4
      main/css/chamilo_electric_blue/default.css
  3. 4
      main/css/chamilo_green/default.css
  4. 4
      main/css/chamilo_orange/default.css
  5. 4
      main/css/chamilo_red/default.css
  6. 4
      main/css/medical/images/default.css
  7. 4
      main/css/public_admin/default.css
  8. 4
      main/css/silver_line/default.css
  9. 4
      main/css/sober_brown/default.css
  10. 13
      main/inc/lib/fckeditor/fcktemplates.xml.php

@ -947,8 +947,8 @@ this lets the navigation menu appear to the left:
margin-left: -5%;
}
#toolnav { float: right; width: 180px; padding: 0; margin: 0;
margin-left: -5%; /* the difference to make the left colum appear flush left */
}
margin-left: -5%; /* the difference to make the left colum appear flush left
}*/
/* Hide from IE5-mac. Only IE-win sees this. \*/
* html #toolnav {
margin-right: 0px;

@ -936,8 +936,8 @@ this lets the navigation menu appear to the left:
margin-left: -5%;
}
#toolnav { float: right; width: 180px; padding: 0; margin: 0;
margin-left: -5%; /* the difference to make the left colum appear flush left */
}
margin-left: -5%; /* the difference to make the left colum appear flush left
}*/
/* Hide from IE5-mac. Only IE-win sees this. \*/
* html #toolnav {
margin-right: 0px;

@ -940,8 +940,8 @@ this lets the navigation menu appear to the left:
margin-left: -5%;
}
#toolnav { float: right; width: 180px; padding: 0; margin: 0;
margin-left: -5%; /* the difference to make the left colum appear flush left */
}
margin-left: -5%; /* the difference to make the left colum appear flush left
}*/
/* Hide from IE5-mac. Only IE-win sees this. \*/
* html #toolnav {
margin-right: 0px;

@ -934,8 +934,8 @@ this lets the navigation menu appear to the left:
margin-left: -5%;
}
#toolnav { float: right; width: 180px; padding: 0; margin: 0;
margin-left: -5%; /* the difference to make the left colum appear flush left */
}
margin-left: -5%; /* the difference to make the left colum appear flush left
}*/
/* Hide from IE5-mac. Only IE-win sees this. \*/
* html #toolnav {
margin-right: 0px;

@ -941,8 +941,8 @@ this lets the navigation menu appear to the left:
margin-left: -5%;
}
#toolnav { float: right; width: 180px; padding: 0; margin: 0;
margin-left: -5%; /* the difference to make the left colum appear flush left */
}
margin-left: -5%; /* the difference to make the left colum appear flush left
}*/
/* Hide from IE5-mac. Only IE-win sees this. \*/
* html #toolnav {
margin-right: 0px;

@ -535,8 +535,8 @@ this lets the navigation menu appear to the left:
margin-left: -5%;
}
#toolnav { float: right; width: 180px; padding: 0; margin: 0;
margin-left: -5%; /* the difference to make the left colum appear flush left */
}
margin-left: -5%; /* the difference to make the left colum appear flush left
}*/
/* Hide from IE5-mac. Only IE-win sees this. \*/
* html #toolnav { margin-right: 0px;}

@ -785,8 +785,8 @@ this lets the navigation menu appear to the left:
margin-left: -5%;
}
#toolnav { float: right; width: 180px; padding: 0; margin: 0;
margin-left: -5%; /* the difference to make the left colum appear flush left */
}
margin-left: -5%; /* the difference to make the left colum appear flush left
}*/
/* Hide from IE5-mac. Only IE-win sees this. \*/
* html #toolnav {
margin-right: 0px;

@ -714,8 +714,8 @@ float:right;
margin-left: -5%;
}
#toolnav { float: right; width: 180px; padding: 0; margin: -7px 0 0 -5%;
margin-left: -5%; /* the difference to make the left colum appear flush left */
}
margin-left: -5%; /* the difference to make the left colum appear flush left
}*/
/* Hide from IE5-mac. Only IE-win sees this. \*/
* html #toolnav {
margin-right: 0px;

@ -758,8 +758,8 @@ this lets the navigation menu appear to the left:
margin-left: -5%;
}
#toolnav { float: right; width: 180px; padding: 0; margin: 0;
margin-left: -5%; /* the difference to make the left colum appear flush left */
}
margin-left: -5%; /* the difference to make the left colum appear flush left
}*/
/* Hide from IE5-mac. Only IE-win sees this. \*/
* html #toolnav {
margin-right: 0px;

@ -86,7 +86,18 @@ function loadCSS($css_name) {
// Reseting the body's background color to be in white, see Task #1885 and http://www.chamilo.org/en/node/713
$template_css .= "\n".'body { background: #fff; } /* Resetting the background. */'."\n";
return ' <style type="text/css">'.$template_css.'</style>';
// Removing system-specific styles and cleaning, see task #1282.
$regex = array(
'/\/\*(.+?)\*\//sm' => '', // Removing comments.
'/\r\n/sm' => "\n", // New lines in Unix style.
'/\r/sm' => "\n", // New lines in Unix style.
'/\s*\n/sm' => "\n", // Stripping whitespace from empty lines.
'/\n{2}/sm' => "\n\n" // Removing duplicate empty lines.
);
$template_css = preg_replace(array_keys($regex), $regex, $template_css);
//var_dump($template_css);
return "\n".'<style type="text/css">'.$template_css.'</style>'."\n";
}
/**

Loading…
Cancel
Save