Skip to content

Commit

Permalink
Additional undos for AdminThemeReno. Sidebar will still get additiona…
Browse files Browse the repository at this point in the history
…l tweaks to be determined.
  • Loading branch information
ryancramerdesign committed Sep 19, 2014
1 parent c4e0942 commit 511b94b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 25 deletions.
11 changes: 6 additions & 5 deletions wire/modules/AdminTheme/AdminThemeReno/scripts/main.js
Expand Up @@ -60,16 +60,16 @@ var ProcessWireAdminTheme = {

///////////////////////////////////////////////////////////////////

function closeOpenSections() {
function closeOpenQuicklinks() {
$("#main-nav > li > a.open:not(.hover-temp):not(.just-clicked)").each(function() {
// close sections that are currently open
var $t = $(this);
var $u = $t.next('ul:visible');
if($u.length > 0) {
if($u.find('.quicklinks-open').length > 0) $u.find('.quicklink-close').click();
$u.slideUp('fast');
//$u.slideUp('fast');
}
$(this).removeClass('open').removeClass('current');
//$(this).removeClass('open').removeClass('current');
});
}

Expand All @@ -88,7 +88,7 @@ var ProcessWireAdminTheme = {
if(numClicks === 1) {
clickTimer = setTimeout(function() {
// single click occurred
closeOpenSections();
closeOpenQuicklinks();
$a.toggleClass('open').next('ul').slideToggle('fast', function() {
$a.removeClass('just-clicked');
});
Expand Down Expand Up @@ -155,6 +155,7 @@ var ProcessWireAdminTheme = {
var quicklinkTimer = null;

$(".quicklink-open").click(function(event){
closeOpenQuicklinks();

var $this = $(this);
$this.parent().addClass('quicklinks-open');
Expand Down Expand Up @@ -182,7 +183,7 @@ var ProcessWireAdminTheme = {
// populate the retrieved items
$.each(data.list, function(n) {
var icon = '';
if(this.icon) icon = "<i class='fa fa-fw fa-" + this.icon + "'></i>";
// if(this.icon) icon = "<i class='fa fa-fw fa-" + this.icon + "'></i>";
var $li = $("<li><a style='white-space:nowrap' href='" + data.url + this.url + "'>" + icon + this.label + "</a></li>");
$ul.append($li);
});
Expand Down
5 changes: 4 additions & 1 deletion wire/modules/AdminTheme/AdminThemeReno/styles/_common.scss
Expand Up @@ -11,7 +11,7 @@

$wide-screen-width: 1200px;
$mainnav-width: 210px;
$mainnav-width-wide: 260px;
$mainnav-width-wide: 230px; // bigger sidebar for wide screen?

/***********************************************************************************************
* GENERAL
Expand Down Expand Up @@ -492,7 +492,10 @@ body.id-23 {

span {
@media only screen and (min-width: $wide-screen-width) {
// icon indentation
/*
padding-left: 28px;
*/
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion wire/modules/AdminTheme/AdminThemeReno/styles/blue.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wire/modules/AdminTheme/AdminThemeReno/styles/classic.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wire/modules/AdminTheme/AdminThemeReno/styles/main.css

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions wire/modules/System/SystemUpdater/SystemUpdate8.php

This file was deleted.

0 comments on commit 511b94b

Please sign in to comment.