Commit 68bc80f6 authored by yPhil's avatar yPhil
Browse files

Merge branch 'layout' into dev

parents 846c4e7c 23e44b89
......@@ -517,30 +517,58 @@ button > i {
.mobHeader .feedControls {
position:relative;
left:100px;
cursor:pointer;
flex: 0 0 auto;
display: flex;
text-align:right;
background-color: red !important;
padding:.2rem;
/* padding:.2rem; */
/* min-width:80px; */
/* align-items:flex-start; */
/* align-content:flex-start; */
/* justify-content: flex-end; */
/* padding:0; */
transition: all 800ms ease 0s;
}
.openControls {
background-color: blue !important;
left:0 !important;
}
.mobHeader .feedControls .controlsToggle {
position:relative;
display: inline-block;
width:26px;
height:26px;
margin:0;
}
.mobHeader .feedControls .controlsToggle:before {
content: '';
position: absolute;
top: 0; left: 0;
border-bottom: 26px solid #E9E9E9;
border-right: 18px solid red;
width: 0;
}
.mobHeader .feedControls div {
margin:1px 1px 1px 0;
flex: 1 100%;
}
.feedControl {
font-size: 1em !important;
font-size: 16pt !important;
}
.mobHeader .ui-button {
padding: 0 !important;
margin: 0 0 0 .2em !important;
}
.mobHeader .feedControls div i.ui-button:first-child {
......
......@@ -177,12 +177,8 @@ li.feed {
/* Item */
.feedTitle {
font-size: 1em !important;
}
li.feedItem {
font-size: 10pt !important;
font-size: 10pt !important;
}
li.feedItem a:not(.error) {
......
......@@ -73,6 +73,7 @@ MOB.feed = {
var $header = $('<div class="mobHeader ui-widget-header">');
var $toggleDiv = $('<div class="feedToggle">');
var $controlsToggleDiv = $('<div class="controlsToggle">');
var $selectDiv = $('<div class="feedSelect">').button();
var $deleteDiv = $('<div class="feedDelete">').button();
var $titleDiv = $('<div class="feedTitle truncate" data-content="">');
......@@ -81,12 +82,19 @@ MOB.feed = {
$feedToggle.appendTo($toggleDiv);
$controlsToggleDiv.click(function() {
console.log('click: (%s)', $(this).parent().attr('class'));
// $(this).parent().animate({'left': '0'}, 1000);
$(this).parent().toggleClass('openControls');
});
$header.hover (
function() {
// $(this).find('.feedControls').slideDown('fast');
// $(this).find('.feedControls').show('slide', {direction: 'right'}, 100);
$(this).find('.feedControls').animate({'left': '0'}, 1000);
// $(this).find('.feedControls').animate({'left': '0'}, 1000);
var iconImg = $feedToggle.css('background-image');
......@@ -96,7 +104,7 @@ MOB.feed = {
},
function() {
// $(this).find('.feedControls').hide('slide', {direction: 'right'}, 600);
$(this).find('.feedControls').animate({'left': '80px'}, 1000);
// $(this).find('.feedControls').animate({'left': '80px'}, 1000);
$feedToggle.removeClass('arrow');
......@@ -116,6 +124,7 @@ MOB.feed = {
$toggleDiv.appendTo($header);
$titleDiv.appendTo($header);
$controlsToggleDiv.appendTo($feedControls);
$selectDiv.appendTo($feedControls);
$deleteDiv.appendTo($feedControls);
$prefsDiv.appendTo($feedControls);
......
Supports Markdown
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