diff --git a/main/css/responsive.css b/main/css/responsive.css index 137e910dc2..45f7910173 100644 --- a/main/css/responsive.css +++ b/main/css/responsive.css @@ -19,72 +19,72 @@ @media (max-width: 768px) { - /* Remove any padding from the body */ - body { - padding-top: 0; - } - - #topbar_push { - height: 0px; - } - - /* Removing just for now*/ - #header4{ - display:none; - } - - #header2 { - - } - - /* Subnav */ - .subnav { - border:1px solid #fff; - position: static; - top: auto; - z-index: auto; - width: 100%; - height: auto; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .subnav .nav > li { - float: none; - } - .subnav .nav > li > a { - border: 0; - } - .subnav .nav > li + li > a { - border-top: 1px solid #e5e5e5; - } - .subnav .nav > li:first-child > a, - .subnav .nav > li:first-child > a:hover { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; - } + /* Remove any padding from the body */ + body { + padding-top: 0; + } - /* Popovers */ - .large-bird { - display: none; - } - .popover-well .popover-wrapper { - margin-left: 0; - } + #topbar_push { + height: 0px; + } - /* Space out the show-grid examples */ - .show-grid [class*="span"] { - margin-bottom: 5px; - } + /* Removing just for now*/ + #header4{ + display:none; + } - /* Unfloat the back to top link in footer */ - .footer .pull-right { - float: none; - } - .footer p { - margin-bottom: 9px; - } + #header2 { + + } + + /* Subnav */ + .subnav { + border:1px solid #fff; + position: static; + top: auto; + z-index: auto; + width: 100%; + height: auto; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .subnav .nav > li { + float: none; + } + .subnav .nav > li > a { + border: 0; + } + .subnav .nav > li + li > a { + border-top: 1px solid #e5e5e5; + } + .subnav .nav > li:first-child > a, + .subnav .nav > li:first-child > a:hover { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; + } + + /* Popovers */ + .large-bird { + display: none; + } + .popover-well .popover-wrapper { + margin-left: 0; + } + + /* Space out the show-grid examples */ + .show-grid [class*="span"] { + margin-bottom: 5px; + } + + /* Unfloat the back to top link in footer */ + .footer .pull-right { + float: none; + } + .footer p { + margin-bottom: 9px; + } } @@ -99,9 +99,12 @@ } } - @media (min-width: 768px) and (max-width: 980px) { - + /* fixes tabs */ + #header3 .nav-tabs > li > a, #header3 .nav-pills > li > a { + padding-left: 6px; + padding-right: 6px; + } } diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 3504c2ec54..4e888a714e 100644 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -96,7 +96,8 @@ class Template extends Smarty { function set_actions($actions) { $action_string = ''; if (!empty($actions)) { - foreach($actions as $action) { + foreach($actions as $action) { + $action_string .= $action; } } $this->assign('actions', $actions); @@ -237,15 +238,15 @@ class Template extends Smarty { //Course theme CSS $style_html .= '@import "'.api_get_path(WEB_CSS_PATH).$this->theme.'/course.css";'."\n"; - + + $navigator_info = api_get_navigator(); + if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { $style_html .= 'img, div { behavior: url('.api_get_path(WEB_LIBRARY_PATH).'javascript/iepngfix/iepngfix.htc) } '."\n"; } - $style_html .= '@import "'.api_get_path(WEB_CSS_PATH).'bootstrap-responsive.css";'."\n"; - - $style_html .= '@import "'.api_get_path(WEB_CSS_PATH).'responsive.css";'."\n"; - + $style_html .= '@import "'.api_get_path(WEB_CSS_PATH).'bootstrap-responsive.css";'."\n"; + $style_html .= '@import "'.api_get_path(WEB_CSS_PATH).'responsive.css";'."\n"; $this->assign('css_style', $style_html);