taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix lightboxes and scss mixins

stable
Xavier Julián 2016-02-18 15:29:10 +01:00 committed by Juanfran
parent 3c3c445b85
commit 62624f84a8
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/coffee/modules/common/lightboxes.coffee
View File

@ -38,6 +38,8 @@ class LightboxService extends taiga.Service
constructor: (@animationFrame, @q) -> constructor: (@animationFrame, @q) ->
open: ($el) -> open: ($el) ->
if _.isString($el)
$el = $($el)
defered = @q.defer() defered = @q.defer()
lightboxContent = $el.children().not(".close") lightboxContent = $el.children().not(".close")
@ -63,6 +65,8 @@ class LightboxService extends taiga.Service
return defered.promise return defered.promise
close: ($el) -> close: ($el) ->
if _.isString($el)
$el = $($el)
docEl = angular.element(document) docEl = angular.element(document)
docEl.off(".lightbox") docEl.off(".lightbox")
docEl.off(".keyboard-navigation") # Hack: to fix problems in the WYSIWYG textareas when press ENTER docEl.off(".keyboard-navigation") # Hack: to fix problems in the WYSIWYG textareas when press ENTER

9
app/styles/dependencies/mixins.scss
View File

@ -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) { @mixin slide($max, $overflow, $min: 0) {
max-height: $min; max-height: $min;
transition: max-height .5s ease-in; transition: max-height .5s ease-in;