chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix css exercises - refs #2681

Browse Source
pull/2818/head
Alex Aragón 7 years ago
parent b03f6816c2
commit 74e3aa7f65
6 changed files with 80 additions and 269 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 254
      assets/css/base.css
  2. 71
      assets/css/scss/_base.scss
  3. 2
      main/admin/user_list.php
  4. 10
      main/exercise/question.class.php
  5. 4
      main/inc/lib/exercise.lib.php
  6. 4
      src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig

254
assets/css/base.css
Unescape View File

@ -424,97 +424,10 @@
}
/* end chamilo forms fixes */
.actions {
background: #ffffff;
border: 1px solid #dddddd;
padding: 10px;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
margin-bottom: 20px;
}
[dir=rtl] .actions {
background: #efefef;
border: 1px solid #ccc;
margin-bottom: 11px;
padding: 2px 2px 2px 14px;
vertical-align: middle;
float: right;
}
.actions .actions-pagination {
float: right;
margin-top: 2px;
}
.actions .actions-pagination * {
display: inline-block;
float: none;
margin: 0;
padding: 0;
}
.actions .actions-pagination img {
margin: 6px;
padding: 0;
}
.actions .form-group{
margin-bottom: 0;
}
.muted {
color: #999999 !important;
}
.actions .btn-default {
padding: 6px;
border: 1px solid #DDD
}
.actions a {
text-decoration: none;
margin-right: 10px;
}
.actions a:hover {
text-decoration: none;
}
.actions div.text-right {
text-align: left;
}
.actions img {
padding: 3px;
border: 1px solid #dcdcdc;
border-radius: 5px;
background: #ffffff; /* Old browsers */
}
.actions img:hover {
background: #ededed; /* Old browsers */
}
.actions .btn-toolbar {
border: 1px solid #dcdcdc;
border-radius: 5px;
display: inline-block;
padding-left: 5px;
padding-right: 5px;
margin: 0 0 0 5px;
background: #ffffff; /* Old browsers */
}
.actions .btn-toolbar:hover {
background: #ededed; /* Old browsers */
}
.actions .btn-toolbar img {
background: none;
border: none;
}
.separate-action {
padding-top: 10px;
padding-bottom: 10px;
@ -1210,24 +1123,6 @@ div.attendance-calendar-add div.row div.formw, div.attendance-calendar-edit div.
padding: 0;
}
#message {
margin: 0 auto;
text-align: center;
}
#message select {
margin: 10px 0;
width: 220px;
}
#message textarea {
margin: 10px 0;
}
#message td {
padding: 4px;
}
.message-top-title {
float: left;
margin-top: 1px;
@ -1868,42 +1763,6 @@ div.admin_section h4 {
border: 1px dashed #B0B0B0
}
#question_list .header_operations {
margin-bottom: 5px;
clear: both;
background: #F5F5F5;
padding: 2px;
}
#question_list .header_operations:hover {
background: #FFEEAA;
border-color: #FFDE57;
}
#question_list .header_operations .table {
margin: 0;
}
#question_list .header_operations.ui-state-focus {
background: #D9EDF7;
border-color: #bce8f1;
}
#question_list .question-list-description-block .question_options .radio {
min-height: 0;
margin-left: 30px;
margin-top: 0;
}
#question_list .question-list-description-block .question_options .radio p {
padding: 5px 0 0 0;
margin: 0;
}
#question_list .question-list-description-block .lead {
font-size: 18px;
}
.document_preview_container {
border-radius: 5px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
@ -2067,53 +1926,6 @@ div.admin_section h4 {
}
/* Fixes questions list */
.question_options {
min-height: 150px;
}
.question_options label {
margin-bottom: 14px;
display: block;
font-weight: normal;
}
.question_options .radio {
min-height: 18px;
margin-left: 65px;
}
.question_options .checkbox {
margin-left: 65px;
}
.question_options .radio input[type="radio"], .question_options .checkbox input[type="checkbox"] {
float: left;
margin-left: -25px;
}
.question_options input[type="text"] {
padding: 6px 12px;
margin: 2px 2px 2px 0;
vertical-align: middle;
display: inline-block;
height: 34px;
line-height: 1.42857;
border: 1px solid #CCCCCC;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
color: #555555;
font-weight: bold;
background-color: #FCF8D6;
}
.question_options input[type="text"]:focus {
border-color: #66AFE9;
background-color: #ffffff;
outline: 0 none;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px rgba(102, 175, 233, 0.6);
}
.exercise_description {
padding: 0 0 10px 0;
@ -4575,16 +4387,6 @@ i.size-32.icon-new-work {
max-width: 100%;
}
.question_menu {
list-style: none;
margin: 0;
padding: 0;
}
.question_menu li {
display: inline-block;
}
ul.holder {
list-style: none;
margin: 0;
@ -6292,10 +6094,6 @@ div#chat-remote-video video {
border-color: #dedede;
}
.ui-widget {
font-family: "Open Sans", sans-serif;
}
.ui-tabs .ui-widget-content a.btn-success {
color: #fff;
}
@ -8225,19 +8023,6 @@ input.form-control[type="color"] {
}
}
/* Large devices (large desktops, 1200px and up) */
@media (min-width: 1200px) {
}
.badge_sidebar_image {
width: 120px;
}
.badge_sidebar_image_transparency {
opacity: 0.2;
}
/* CSS FormValidator loader */
@-moz-keyframes wobblebar-loader {
0% {
@ -8588,15 +8373,6 @@ input.form-control[type="color"] {
height: auto !important;
}
/* Fixes bootstrap select long text options BT#14082 */
div.dropdown-menu.open {
width: 100%;
}
ul.dropdown-menu.inner > li > a {
white-space: initial;
}
/* start document mp3 preview */
.preview .mejs__container {
background: #aaa;
@ -8613,34 +8389,4 @@ ul.dropdown-menu.inner > li > a {
/* end document mp3 preview */
/* Fix grid with one row and multiples columns. Works for .col-sm-6.col-md-4.col-lg-3 */
.row.clear-rows-6-4-3 {
}
@media (min-width: 768px) {
.clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) {
clear: left;
}
}
@media (min-width: 992px) {
.clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) {
clear: none;
}
.clear-rows-6-4-3 .col-sm-6:nth-child(3n+1) {
clear: left;
}
}
@media (min-width: 1200px) {
.clear-rows-6-4-3 .col-sm-6:nth-child(3n+1) {
clear: none;
}
.clear-rows-6-4-3 .col-sm-6:nth-child(4n+1) {
clear: left;
}
}
/*-------------------------------------------------------------------------------------*/

71
assets/css/scss/_base.scss
Unescape View File

@ -431,7 +431,6 @@ footer {
border: 1px solid rgba(0, 0, 0, 0.125);
border-radius: 0.25rem;
.card-body{
padding: 1.88rem 1.81rem;
.tools{
width: 160px;
height: 160px;
@ -838,3 +837,73 @@ footer {
cursor: pointer;
border-radius: 4px;
}
/********* ACTIONS **********/
.actions {
background: #ffffff;
border: 1px solid #dddddd;
padding: 10px;
border-radius: 4px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
margin-bottom: 10px;
img {
padding: 3px;
border: 1px solid #dcdcdc;
border-radius: 5px;
background: #ffffff;
&:hover {
background: #ededed;
}
}
a {
text-decoration: none;
margin-right: 10px;
&:hover {
text-decoration: none;
}
}
.form-group{
margin-bottom: 0;
}
.btn-toolbar {
border: 1px solid #dcdcdc;
border-radius: 5px;
display: inline-block;
padding-left: 5px;
padding-right: 5px;
margin: 0 0 0 5px;
background: #ffffff;
img {
background: none;
border: none;
}
&:hover {
background: #ededed;
}
}
.actions-pagination {
float: right;
margin-top: 2px;
* {
display: inline-block;
float: none;
margin: 0;
padding: 0;
}
img {
margin: 6px;
padding: 0;
}
}
}
/****** EXERCISE *********/
.card-exercise{
margin-bottom: 20px;
.list-exercise{
list-style: none;
margin: 0;
padding: 0;
li{
display: inline-block;
}
}
}

2
main/admin/user_list.php
Unescape View File

@ -984,7 +984,7 @@ $form->addButtonSearch(get_lang('Search'));
$searchAdvanced = '
<a id="advanced_params" href="javascript://"
class="btn btn-default advanced_options" onclick="display_advanced_search_form();">
class="btn btn-light advanced_options" onclick="display_advanced_search_form();">
<span id="img_plus_and_minus">&nbsp;
'.Display::returnFontAwesomeIcon('arrow-right').' '.get_lang('AdvancedSearch').'
</span>

10
main/exercise/question.class.php
Unescape View File

@ -1781,9 +1781,9 @@ abstract class Question
unset($question_type_custom_list[HOT_SPOT_DELINEATION]);
}
echo '<div class="panel panel-default">';
echo '<div class="panel-body">';
echo '<ul class="question_menu">';
echo '<div class="card card-exercise">';
echo '<div class="card-body">';
echo '<ul class="list-exercise">';
foreach ($question_type_custom_list as $i => $a_type) {
// @todo remove require_once classes are already loaded using composer
// include the class of the type
@ -1793,7 +1793,7 @@ abstract class Question
eval('$img = '.$a_type[1].'::$typePicture;');
eval('$explanation = get_lang('.$a_type[1].'::$explanationLangVar);');
echo '<li>';
echo '<div class="icon-image">';
echo '<div class="icon">';
$icon = '<a href="admin.php?'.api_get_cidreq().'&newQuestion=yes&answerType='.$i.'">'.
Display::return_icon($img, $explanation, null, ICON_SIZE_BIG).'</a>';
@ -1811,7 +1811,7 @@ abstract class Question
}
echo '<li>';
echo '<div class="icon_image_content">';
echo '<div class="content">';
if ($objExercise->exercise_was_added_in_lp == true) {
echo Display::return_icon(
'database_na.png',

4
main/inc/lib/exercise.lib.php
Unescape View File

@ -243,7 +243,7 @@ class ExerciseLib
if ($show_comment) {
$header .= Display::tag('th', get_lang('Feedback'));
}
$s .= '<table class="table table-hover table-striped">';
$s .= '<table class="table table-hover">';
$s .= Display::tag(
'tr',
$header,
@ -428,7 +428,7 @@ class ExerciseLib
if ($exercise->feedback_type == EXERCISE_FEEDBACK_TYPE_END) {
$header .= Display::tag('th', get_lang('Feedback'));
}
$s .= '<table class="table table-hover table-striped">';
$s .= '<table class="table">';
$s .= Display::tag(
'tr',
$header,

4
src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig
Unescape View File

@ -50,11 +50,7 @@
{# Content #}
{% block content %}
<section id="main_content">
<div class="card">
<div class="card-body">
{{ content }}
</div>
</div>
</section>
{% endblock %}
{% endautoescape %}

Write Preview
Loading…
Cancel
Save