Commit 7e6a5b7c authored by yPhil's avatar yPhil
Browse files

Merge branch 'dev'

parents 60b44b7f 39766ced
......@@ -417,11 +417,6 @@ i.dangerous:hover {
/* top: 50%; */
}
.arrow {
background-image: url("/static/images/feed-toggle-triangle-000.png");
}
#tabs {
white-space: nowrap;
overflow: hidden;
......
......@@ -278,14 +278,6 @@ div.wiki i:hover {
color: green;
}
.arrow {
background-image: url("/static/images/feed-toggle-triangle-000.png") !important;
}
.generic {
background-image: url("/static/images/feed-generic-rss.png") !important;
}
i.feedIcon {
background-image:url("/static/images/feed-generic-rss.png");
}
......@@ -128,7 +128,7 @@ MOB.dialog = {
$guessSpinner = $dialog.find('button#feedGuess > i'),
$guessField = $dialog.find('input#feedGuess'),
$okButton = $('.ui-dialog-buttonpane'),
$helpButton = $('<button type="button" class="ui-button ui-corner-all ui-widget ui-button-icon-only ui-dialog-titlebar-close ui-dialog-titlebar-help" title="Help"><span class="ui-button-icon ui-icon ui-icon-info"></span><span class="ui-button-icon-space"> </span>Help</button>');
$helpButton = $('<button type="button" class="ui-button ui-corner-all ui-widget ui-button-icon-only ui-dialog-titlebar-close ui-dialog-titlebar-help" title="Help"><span class="ui-button-icon ui-icon ui-icon-help"></span><span class="ui-button-icon-space"> </span>Help</button>');
$dialog.parent().find('.ui-dialog-titlebar').append($helpButton);
......
......@@ -39,28 +39,28 @@ MOB.feed = {
$feedToggle.click(function() {
$(this).toggleClass("down");
$(this).parent().parent().parent().children('div.feedBody').slideToggle(200);
return false;
// return false;
});
$feedSelect.click(function() {
$(this).parent().parent().parent().parent().toggleClass('selected ui-state-hover');
$(this).toggleClass('icon-ok').toggleClass('icon-check-empty-1');
return false;
// return false;
});
$feedDelete.click(function() {
MOB.dialog.killFeed($(this));
return false;
// return false;
});
$feedPrefs.click(function() {
MOB.dialog.feedPrefs($(this));
return false;
// return false;
});
$feedReload.click(function() {
MOB.feed.populate($(this), progress);
return false;
// return false;
});
var $feedBody = $('<div>')
......@@ -83,10 +83,9 @@ MOB.feed = {
$feedToggle.appendTo($toggleDiv);
$controlsToggleDiv.click(function() {
console.log('click: (%s)', $(this).parent().attr('class'));
// $(this).parent().animate({'left': '0'}, 1000);
// $('.feedControls').removeClass('openControls');
$(this).parent().toggleClass('openControls');
var $controls = $(this).parent();
$('.feedControls').not($controls).removeClass('openControls');
$controls.toggleClass('openControls');
});
$header.hover (
......
......@@ -16,10 +16,11 @@
<link rel="stylesheet" href="/static/css/fontello.css" media="none" onload="this.media='all';">
<link rel="stylesheet" id="mobStyle" href="/static/css/themes/day.css">
<link rel="stylesheet" href="/static/css/mob-ui.css" media="none" onload="this.media='all';">
<link rel="stylesheet" href="/static/css/petrolette.css" media="none" onload="this.media='all';">
<link rel="stylesheet" id="mobStyle" href="/static/css/themes/day.css">
<link rel="stylesheet" media="screen" href="https://fontlibrary.org/face/grobe-deutschmeister" type="text/css"/>
<link rel="stylesheet" href="/bower/fancybox/dist/jquery.fancybox.min.css" />
......@@ -80,7 +81,7 @@
items: '> li:not(#newTabButton)',
stop: function() {
$tabs.tabs('refresh');
Tab.saveTabs();
MOB.tab.saveTabs();
}
});
......
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