Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

Removing old code. Fixes small bug #2140

Merged
merged 1 commit into from
Apr 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions interface/client/styles/animations.import.less
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,12 @@ aside.sidebar {
// ANIMATION
transition: max-width @animationSpeed;
}

}
}

&.full-tabs {
nav > ul > li:not(.selected) {
transform: translate3d(-100%,0,0);
}
nav > ul > li.selected button.slide-out {
transition: none;
}
}
}


// Browser bar
// Browser bar
.browser-bar {
.url-input {
transition: opacity 0.1s;
Expand All @@ -52,7 +42,7 @@ aside.sidebar {
transition-timing-function: ease-out;
transition-timing-function: cubic-bezier(0.000, 1.125, 0.335, 1.650);
height: @gridHeight*1.5;

&>* {
position: absolute;
left: @gridWidth*2;
Expand All @@ -61,11 +51,11 @@ aside.sidebar {
}

.password-repeat {
transform: rotateX( 180deg );
transform: rotateX( 180deg );
}

&.repeat-field {
transform: rotateX( 180deg );
transform: rotateX( 180deg );
}
}
}
}
2 changes: 1 addition & 1 deletion interface/client/templates/layout/sidebar.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template name="layout_sidebar">
<aside class="sidebar {{fullTabs}}">
<aside class="sidebar">
<nav>
<ul class="sidebar-menu">
{{#each tabs}}
Expand Down
48 changes: 3 additions & 45 deletions interface/client/templates/layout/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,24 +117,12 @@ Template['layout_sidebar'].helpers({
@method (isSelected)
*/
'isSelected': function () {
var selected = (LocalStore.get('selectedTab') === (this._id || 'browser')) ? 'selected' : '';

if (this.menuVisible) {
selected += ' slided-out';
}

return selected;
},
/**
Determines if the current tab is visible

@method (fullTabs)
*/
'fullTabs': function () {
return (LocalStore.get('fullTabs')) ? 'full-tabs' : '';
return (LocalStore.get('selectedTab') === (this._id || 'browser')) ? 'selected' : '';
},
/**
It defines which tabs will have a remove button on the interface

@method (tabShouldBeRemovable)
*/
'tabShouldBeRemovable': function () {
return !_.contains(['browser', 'wallet'], this._id);
Expand Down Expand Up @@ -171,36 +159,6 @@ Template['layout_sidebar'].events({
}
},
/**
Slide out

@event button.slide-out
*/
'click button.slide-out': function (e, template) {
var isSelected = (LocalStore.get('selectedTab') === (this._id || 'browser'));

if (isSelected && LocalStore.get('fullTabs')) {
LocalStore.set('fullTabs', false);
} else if (isSelected) {
LocalStore.set('fullTabs', true);
} else {
Tabs.update(this._id, { $set: { menuVisible: !this.menuVisible } });
}
},
/**
See all

@event .see-all button
*/
'click li.see-all > button': function (e, template) {
var isSelected = (LocalStore.get('selectedTab') === (this._id || 'browser'));

if (isSelected && LocalStore.get('fullTabs')) {
LocalStore.set('fullTabs', false);
} else if (isSelected) {
LocalStore.set('fullTabs', true);
}
},
/**
Remove the current selected tab

// TODO show popup before to confirm
Expand Down
1 change: 0 additions & 1 deletion interface/client/templates/popupWindows/connectAccount.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ var pinToSidebar = function () {
redirect: selectedTab.url,
name: selectedTab.name,
menu: {},
menuVisible: false,
position: Tabs.find().count() + 1
});
LocalStore.set('selectedTab', newTabId);
Expand Down