Skip to content

Commit

Permalink
Merge pull request OwlCarousel2#457 from wjthomas9/develop
Browse files Browse the repository at this point in the history
Prefix owl mixins to prevent conflicts with other mixin libraries

Closes OwlCarousel2#647
  • Loading branch information
greg5green committed Jun 28, 2015
2 parents 8380fac + d6cea9b commit ccc498c
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions src/scss/_mixins.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
@mixin transition($prop, $time, $easing){
@mixin owl-transition($prop, $time, $easing){
-webkit-transition: $prop $time $easing;
-moz-transition: $prop $time $easing;
-ms-transition: $prop $time $easing;
-o-transition: $prop $time $easing;
transition: $prop $time $easing;
}

@mixin rounded($value){
@mixin owl-rounded($value){
-webkit-border-radius: $value;
-moz-border-radius: $value;
border-radius: $value;
}

@mixin transform($prop){
@mixin owl-transform($prop){
-webkit-transition: $prop;
-moz-transition: $prop;
-ms-transition: $prop;
Expand Down
6 changes: 3 additions & 3 deletions src/scss/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
background: $nav-background;
display: inline-block;
cursor: pointer;
@include rounded($nav-rounded);
@include owl-rounded($nav-rounded);

&:hover {
background: $nav-background-hover;
Expand Down Expand Up @@ -48,8 +48,8 @@
background: $dot-background;
display: block;
-webkit-backface-visibility: visible;
@include transition(opacity, 200ms, ease);
@include rounded($dot-rounded);
@include owl-transition(opacity, 200ms, ease);
@include owl-rounded($dot-rounded);
}

&.active,
Expand Down
2 changes: 1 addition & 1 deletion src/scss/owl.autoheight.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
@import 'mixins';

.owl-height {
@include transition(height, 500ms, ease-in-out)
@include owl-transition(height, 500ms, ease-in-out)
}
2 changes: 1 addition & 1 deletion src/scss/owl.lazyload.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.owl-item {
.owl-lazy {
opacity: 0;
@include transition(opacity, 400ms, ease);
@include owl-transition(opacity, 400ms, ease);
}
img{
transform-style: preserve-3d;
Expand Down
6 changes: 3 additions & 3 deletions src/scss/owl.video.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
cursor: pointer;
z-index: 1;
-webkit-backface-visibility: hidden;
@include transition(scale, 100ms, ease);
@include owl-transition(scale, 100ms, ease);
}
.owl-video-play-icon:hover {
@include transform(scale(1.3, 1.3));
@include owl-transform(scale(1.3, 1.3));
}
.owl-video-playing .owl-video-tn,
.owl-video-playing .owl-video-play-icon {
Expand All @@ -40,7 +40,7 @@
-moz-background-size: contain;
-o-background-size: contain;
background-size: contain;
@include transition(opacity, 400ms, ease);
@include owl-transition(opacity, 400ms, ease);
}
.owl-video-frame {
position: relative;
Expand Down

0 comments on commit ccc498c

Please sign in to comment.