summaryrefslogtreecommitdiffstats
path: root/client/components/main
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-06-07 10:30:27 +0200
committerMaxime Quandalle <maxime@quandalle.com>2015-06-07 10:34:19 +0200
commit92dd05d06ddeb2a9434df6038c432e6b167c1c99 (patch)
treeecb93138c1dd0ab0c1fcf2682a6eae600a4bbca9 /client/components/main
parent12919cbfc6c3fd0793624776b3afb70e3a0cdd1a (diff)
downloadwekan-92dd05d06ddeb2a9434df6038c432e6b167c1c99.tar.gz
wekan-92dd05d06ddeb2a9434df6038c432e6b167c1c99.tar.bz2
wekan-92dd05d06ddeb2a9434df6038c432e6b167c1c99.zip
Click on the page to escape the last action
This is a generalization of what we had for closing a popup by clicking outside of it. It now works for inlinedForms and detailsPane as well.
Diffstat (limited to 'client/components/main')
-rw-r--r--client/components/main/header.styl12
-rw-r--r--client/components/main/popup.js5
-rw-r--r--client/components/main/popup.tpl.jade2
3 files changed, 5 insertions, 14 deletions
diff --git a/client/components/main/header.styl b/client/components/main/header.styl
index eaf391f7..76a1bc8c 100644
--- a/client/components/main/header.styl
+++ b/client/components/main/header.styl
@@ -12,16 +12,15 @@
font-size: 12px
display: flex
- #header-user-bar
+ #header-user-bar,
ul li
color: darken(white, 17%)
- a, .fa
+ .fa
color: inherit
- text-decoration: none
- &:hover
- color: white
+ a:hover, a.is-active
+ color: white
ul
flex: 1
@@ -76,9 +75,6 @@
float: left
border-radius: 3px
- &.is-clickable
- cursor: pointer
-
.board-header-btns
display: block
margin-top: 3px
diff --git a/client/components/main/popup.js b/client/components/main/popup.js
index 8672d08a..8cb12dd0 100644
--- a/client/components/main/popup.js
+++ b/client/components/main/popup.js
@@ -18,11 +18,6 @@ function whichTransitionEvent() {
var transitionEvent = whichTransitionEvent();
Popup.template.events({
- click: function(evt) {
- if (evt.originalEvent) {
- evt.originalEvent.clickInPopup = true;
- }
- },
'click .js-back-view': function() {
Popup.back();
},
diff --git a/client/components/main/popup.tpl.jade b/client/components/main/popup.tpl.jade
index be528f46..e6cc982a 100644
--- a/client/components/main/popup.tpl.jade
+++ b/client/components/main/popup.tpl.jade
@@ -1,4 +1,4 @@
-.pop-over(
+.pop-over.js-pop-over(
class="{{#unless title}}miniprofile{{/unless}}"
class=currentBoard.colorClass
class="{{#unless title}}no-title{{/unless}}"