Merge pull request #611 from aragonc/bootstrap

fix responsive effects scorm mobile CT#9615
1.10.x
Yannick Warnier 11 years ago
commit 5c54d87f91
  1. 36
      main/css/base.css
  2. 18
      main/newscorm/lp_view.php

@ -5633,19 +5633,38 @@ ul.holder li.bit-box a.closebutton{
width: 25.66666667%; width: 25.66666667%;
} }
.content-scorm{ .content-scorm{
width: 74.33333333%; width: 76.33333333%;
} }
.total{ .total{
width: 100%; width: 100%;
} }
#learning_path_right_zone{
width: 68%;
display: block;
padding-left: 0;
padding-right: 0;
}
#learning_path_right_zone.total{
width: 100%;
visibility: visible;
padding-left: 15px;
padding-right: 15px;
}
} }
/* Portrait tablet to landscape and desktop - Escritorio pequeño o Tablet */ /* Portrait tablet to landscape and desktop - Escritorio pequeño o Tablet */
@media (min-width: 768px) and (max-width: 979px) { @media (min-width: 768px) and (max-width: 979px) {
#learning_path_right_zone{
width: 58%;
display: block;
padding-left: 0;
padding-right: 0;
}
#learning_path_right_zone.total{
width: 100%;
padding-left: 15px;
padding-right: 15px;
visibility: visible;
} }
/* Landscape phone to portrait tablet - Tablet o Smartphone Horizontal */
@media (max-width: 767px) {
} }
/* Landscape phones and down - Solo Smartphone*/ /* Landscape phones and down - Solo Smartphone*/
@media only screen and (min-device-width : 320px) and (max-device-width : 480px) { @media only screen and (min-device-width : 320px) and (max-device-width : 480px) {
@ -5684,8 +5703,15 @@ ul.holder li.bit-box a.closebutton{
.content-scorm{ .content-scorm{
visibility: hidden; visibility: hidden;
} }
#control-bottom.well{
padding: 10px;
}
.total{ .total{
width: 100%; width: 100%;
visibility: visible; visibility: visible;
} }
#learning_path_left_zone{
width: 100%;
display: block;
}
} }

@ -474,7 +474,7 @@ if ($is_allowed_to_edit) {
var IE = window.navigator.appName.match(/microsoft/i); var IE = window.navigator.appName.match(/microsoft/i);
/* Identified new height */ /* Identified new height */
var heightControl = ($('#control').is(':visible'))? $('#control').height() : 0 ; var heightControl = $('#control-bottom').height();
var heightBreadcrumb = ($('#learning_path_breadcrumb_zone').height())? $('#learning_path_breadcrumb_zone').height() : 0 ; var heightBreadcrumb = ($('#learning_path_breadcrumb_zone').height())? $('#learning_path_breadcrumb_zone').height() : 0 ;
var heightScormInfo = $('#scorm-info').height(); var heightScormInfo = $('#scorm-info').height();
@ -483,18 +483,20 @@ if ($is_allowed_to_edit) {
//heightTop = (heightTop > 300)? heightTop : 300; //heightTop = (heightTop > 300)? heightTop : 300;
var innerHeight = $(window).height();
//var innerHeight = (IE) ? document.body.clientHeight : window.innerHeight ; var innerHeight = $(window).height();
if(innerHeight<=640){
$('#inner_lp_toc').css('height', innerHeight - heightTop + "px");
$('#content_id').css('height', innerHeight - heightControl + "px");
}else{
$('#inner_lp_toc').css('height', innerHeight - heightBreadcrumb - heightTop + "px"); $('#inner_lp_toc').css('height', innerHeight - heightBreadcrumb - heightTop + "px");
if ($('#content_id')) { $('#content_id').css('height', innerHeight - heightControl + "px");
$('#content_id').css('height', innerHeight - heightBreadcrumb - heightControl + "px");
}
if ($('#hide_bar')) {
$('#hide_bar').css('height', innerHeight - heightBreadcrumb - heightControl + "px");
} }
//var innerHeight = (IE) ? document.body.clientHeight : window.innerHeight ;
// Loads the glossary library. // Loads the glossary library.
<?php <?php
$glossaryExtraTools = api_get_setting('show_glossary_in_extra_tools'); $glossaryExtraTools = api_get_setting('show_glossary_in_extra_tools');

Loading…
Cancel
Save