From 62624f84a8a24e89f4ead1322c265869c0a7800e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 18 Feb 2016 15:29:10 +0100 Subject: [PATCH] Fix lightboxes and scss mixins --- app/coffee/modules/common/lightboxes.coffee | 4 ++++ app/styles/dependencies/mixins.scss | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee index ed65d28f..fe3dd88d 100644 --- a/app/coffee/modules/common/lightboxes.coffee +++ b/app/coffee/modules/common/lightboxes.coffee @@ -38,6 +38,8 @@ class LightboxService extends taiga.Service constructor: (@animationFrame, @q) -> open: ($el) -> + if _.isString($el) + $el = $($el) defered = @q.defer() lightboxContent = $el.children().not(".close") @@ -63,6 +65,8 @@ class LightboxService extends taiga.Service return defered.promise close: ($el) -> + if _.isString($el) + $el = $($el) docEl = angular.element(document) docEl.off(".lightbox") docEl.off(".keyboard-navigation") # Hack: to fix problems in the WYSIWYG textareas when press ENTER diff --git a/app/styles/dependencies/mixins.scss b/app/styles/dependencies/mixins.scss index 58fa132d..746cc5d6 100644 --- a/app/styles/dependencies/mixins.scss +++ b/app/styles/dependencies/mixins.scss @@ -17,6 +17,15 @@ } } +@mixin placeholder { + $placeholders: ":-webkit-input" ":-moz" "-moz" "-ms-input"; + @each $placeholder in $placeholders { + &:#{$placeholder}-placeholder { + @content; + } + } +} + @mixin slide($max, $overflow, $min: 0) { max-height: $min; transition: max-height .5s ease-in;