summaryrefslogtreecommitdiffstats
path: root/client/components/forms
diff options
context:
space:
mode:
Diffstat (limited to 'client/components/forms')
-rw-r--r--client/components/forms/forms.styl23
-rw-r--r--client/components/forms/inlinedform.js7
2 files changed, 7 insertions, 23 deletions
diff --git a/client/components/forms/forms.styl b/client/components/forms/forms.styl
index 1084a4a6..c572863d 100644
--- a/client/components/forms/forms.styl
+++ b/client/components/forms/forms.styl
@@ -229,26 +229,9 @@ textarea
padding-top: 5px
padding-bottom: 5px
- i.fa.fa-times
- font-size: 20px
-
- .option
- border-color: transparent
- border-radius: 3px
- color: #8c8c8c
- display: block
- float: right
- height: 30px
- line-height: 30px
- padding: 0 8px
- margin: 0 2px
-
- &:hover
- background-color: #dbdbdb
- color: #4d4d4d
-
- &:active
- background-color: #ccc
+ .fa-times-thin
+ font-size: 26px
+ margin: 3px 4px
.button-link
background: #fff
diff --git a/client/components/forms/inlinedform.js b/client/components/forms/inlinedform.js
index b84952d2..f2774084 100644
--- a/client/components/forms/inlinedform.js
+++ b/client/components/forms/inlinedform.js
@@ -30,11 +30,12 @@ BlazeComponent.extendComponent({
this.isOpen = new ReactiveVar(false);
},
+ onDestroyed: function() {
+ currentlyOpenedForm.set(null);
+ },
+
open: function() {
// Close currently opened form, if any
- // if (currentlyOpenedForm.get() !== null) {
- // currentlyOpenedForm.get().close();
- // }
EscapeActions.executeLowerThan('inlinedForm');
this.isOpen.set(true);
currentlyOpenedForm.set(this);