From c5e7a4384b884626e95b7b4a6667a5b10a5689ce Mon Sep 17 00:00:00 2001 From: Juan Tejada Date: Thu, 19 May 2016 16:12:36 -0700 Subject: [PATCH] fix(mail-merge): Prevent send button from being pressed multiple times --- src/pro | 2 +- static/buttons.less | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/pro b/src/pro index ee1020c3b..72bebf596 160000 --- a/src/pro +++ b/src/pro @@ -1 +1 @@ -Subproject commit ee1020c3b7c469df2fa401a3b9a1c2e0e7189fba +Subproject commit 72bebf59688605610fd657a36022638daa68d311 diff --git a/static/buttons.less b/static/buttons.less index a95ef7516..b87e330dd 100644 --- a/static/buttons.less +++ b/static/buttons.less @@ -99,6 +99,14 @@ body.platform-win32 { img.content-mask { background-color:@btn-action-text-color; } } + &.btn-disabled { + color: fadeout(@btn-default-text-color, 40%); + background: fadeout(@btn-default-bg-color, 15%); + &:active { + background: fadeout(@btn-default-bg-color, 15%); + } + } + &.btn-emphasis { position: relative; color: @btn-emphasis-text-color; @@ -110,6 +118,10 @@ body.platform-win32 { box-shadow: none; border: 1px solid darken(@btn-emphasis-bg-color, 7%); + &.btn-disabled { + opacity: 0.4; + } + &:before { content: ' '; width: calc(~"100% + 2px"); @@ -149,13 +161,6 @@ body.platform-win32 { .btn-gradient:active { background: -webkit-gradient(linear, left top, left bottom, from(darken(@btn-default-bg-color, 9%)), to(darken(@btn-default-bg-color, 13.5%))); } -.btn-disabled { - color: fadeout(@btn-default-text-color, 40%); - background: fadeout(@btn-default-bg-color, 15%); - &:active { - background: fadeout(@btn-default-bg-color, 15%); - } -} .btn-icon { background: transparent;