Commit 9f75f9d8 authored by Melissa Draper's avatar Melissa Draper Committed by Gerrit Code Review
Browse files

Merge changes Id8e34cda,I34a72348,I090d6f66,Iaa7aa713

* changes:
  Fix instiutution selector on statistics page
  Responsive Design: hide html editing for mobile device,
  Fix the profile block height
  Fix a few theme issues
parents ba2809eb c39ca0e8
......@@ -3031,9 +3031,9 @@ function mahara_log($logname, $string) {
*/
function is_html_editor_enabled () {
global $USER;
return (!get_config('wysiwyg') && ($USER->get_account_preference('wysiwyg') || defined('PUBLIC'))) ||
get_config('wysiwyg') == 'enable';
global $USER, $SESSION;
return ((!get_config('wysiwyg') && ($USER->get_account_preference('wysiwyg') || defined('PUBLIC'))) ||
get_config('wysiwyg') == 'enable') && $SESSION->get('mobile') == false;
}
/**
......
......@@ -495,6 +495,10 @@ div.sideblock ul ul {
#user-profileicon img {
border: 0;
}
#sb-profile .sidebar-content {
min-height: 60px;
}
/* Side Quota Bar */
#quota_used {
color: #00AEF1;
......
......@@ -738,7 +738,10 @@ form#uploadcsv {
#usertypeselect_institution_container td,
#institutionselect_institution_container td {
padding: 0 0 5px 0 !important;
font-size: 1.5em;
}
#usertypeselect_institution_container td select,
#institutionselect_institution_container td select {
max-width: 100%;
}
#institutionusers table #institutionusers_users_container th {
width: 120px;
......
......@@ -871,6 +871,10 @@ a.btn-big-del {
border: 1px solid #454545;
background: #e2e2e2 url(../images/btn-bkgd-small.png) repeat-x bottom left;
}
.ie7 #postlist form {
width: auto;
overflow: hidden;
}
.postbtns .btn {
font-size: 1em;
line-height: 2.3333em;
......@@ -1562,6 +1566,9 @@ div.sideblock ul li {
#user-profileicon img {
border: 1px solid #FFFFFF;
}
#sb-profile .sidebar-content {
min-height: 30px;
}
#sb-profile .sideblock-content > ul {
padding: 0;
list-style: none;
......@@ -1815,7 +1822,7 @@ a.tag {
margin: 0 auto;
color: #D1D1D1;
}
#micro #footer-wrap {
#micro #footer {
background: url(../images/powered-by-mahara-small.png) no-repeat 10px 5px;
min-height: 35px;
}
......@@ -2544,7 +2551,7 @@ form#files .foldernav {
margin-left: 10px;
}
#bloglist span.newentry {
margin: 1px 5px 0;
margin: 0 1px 0 5px;
float: left;
display: block;
}
......@@ -2553,6 +2560,16 @@ form#files .foldernav {
margin: 0;
padding: 0 3px 1px 3px !important;
}
.ie7 #bloglist span.newentry a {
display: block;
padding: 0 3px !important;
}
.ie8 #bloglist span.newentry a {
padding: 0 3px !important;
}
.ie9 #bloglist span.newentry a {
padding: 0 3px 2px 3px !important;
}
/* My Groups / My Friends */
ul.groupuserstatus {
float: right;
......
{include file="header.tpl"}
{if $candeleteself}<div class="rbuttons"><a href="{$WWWROOT}account/delete.php" class="btn">{str tag=deleteaccount section=account}</a></div>{/if}
{if $candeleteself}<div class="message"><a href="{$WWWROOT}account/delete.php" class="btn">{str tag=deleteaccount section=account}</a></div>{/if}
{$form|safe}
{include file="footer.tpl"}
......@@ -363,6 +363,9 @@ ul.edit-view-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.ed
#main-column-container {
background: #FFF;
}
.ie7 .main-column-narrow {
padding-right: 10px;
}
/**************** SIDEBAR *********/
div.sideblock {
......@@ -391,6 +394,9 @@ div.sideblock h3 a:active {
#sb-profile ul ul a:active {
color: #8E1901;
}
#sb-profile .sidebar-content {
min-height: 60px;
}
/* Side Quota Bar */
#quota_used {
......
......@@ -349,6 +349,9 @@ ul.edit-view-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.ed
#main-column-container {
background: #FFF;
}
.ie7 .main-column-narrow {
padding-right: 10px;
}
/* system messages between nav and main content */
/* different message types */
#messages .ok,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment