Merge branch 'hotfix/0.8.2' into develop

w11k · Oct 27, 2014 · d5df568 · d5df568
2 parents ca889ad + f9bdd4c
commit d5df568
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # w11k-slides Changelog
 
+<a name="0.8.2"></a>
+## 0.8.2 (2014-10-27)
+
+
+### Bug Fixes
+
+* **styling:** use 'background' instead of 'background-color' on title slide ([3871984c](https://github.com/w11k/w11k-slides/commit/3871984cbd0e33ec4c96f5e307a4a04ba1a0ce64))
+
+
 <a name="0.8.1"></a>
 ## 0.8.1 (2014-10-24)
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "w11k-slides",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "AngularJS module to create simple slide shows",
   "keywords": [ "angular", "angularjs", "slides", "slide-show", "presentation" ],
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "w11k-slides",
-  "version": "0.8.1",
+  "version": "0.8.2",
 
   "description": "AngularJS module to create simple slide shows",
   "keywords": [ "angular", "angularjs", "slides", "slide-show", "presentation" ],

diff --git a/src/_variables.scss b/src/_variables.scss
@@ -6,10 +6,10 @@ $w11k-slides-color-2: #111 !default;
  * * * * * * * * * * * * * * * * * * * */
 
 $w11k-slides-title-top-text-color: $w11k-slides-color-1 !default;
-$w11k-slides-title-top-background-color: transparent !default;
+$w11k-slides-title-top-background: transparent !default;
 $w11k-slides-title-separator-color: darken($w11k-slides-color-1, 8%) !default;
 $w11k-slides-title-bottom-text-color: $w11k-slides-color-2 !default;
-$w11k-slides-title-bottom-background-color: transparent !default;
+$w11k-slides-title-bottom-background: transparent !default;
 
 $w11k-slides-slide-regular-header-background: $w11k-slides-color-1 !default;
 $w11k-slides-slide-regular-header-text-color: white !default;

diff --git a/src/slides/_types.scss b/src/slides/_types.scss
@@ -8,7 +8,7 @@
     height: 39.2%;
     text-align: center;
     color: $w11k-slides-title-top-text-color;
-    background-color: $w11k-slides-title-top-background-color;
+    background: $w11k-slides-title-top-background;
     padding: 0 2em;
 
     .content {
@@ -23,7 +23,7 @@
     position: relative;
     height: 62.8%;
     border-top: 0.3em solid $w11k-slides-title-separator-color;
-    background-color: $w11k-slides-title-bottom-background-color;
+    background: $w11k-slides-title-bottom-background;
     padding: 0 2em;
 
     .content {

diff --git a/src/slides/types.less b/src/slides/types.less
@@ -8,7 +8,7 @@
     height: 39.2%;
     text-align: center;
     color: @w11k-slides-title-top-text-color;
-    background-color: @w11k-slides-title-top-background-color;
+    background: @w11k-slides-title-top-background;
     padding: 0 2em;
 
     .content {
@@ -23,7 +23,7 @@
     position: relative;
     height: 62.8%;
     border-top: 0.3em solid @w11k-slides-title-separator-color;
-    background-color: @w11k-slides-title-bottom-background-color;
+    background: @w11k-slides-title-bottom-background;
     padding: 0 2em;
 
     .content {

diff --git a/src/variables.less b/src/variables.less
@@ -6,10 +6,10 @@
  * * * * * * * * * * * * * * * * * * * */
 
 @w11k-slides-title-top-text-color: @w11k-slides-color-1;
-@w11k-slides-title-top-background-color: transparent;
+@w11k-slides-title-top-background: transparent;
 @w11k-slides-title-separator-color: darken(@w11k-slides-color-1, 8%);
 @w11k-slides-title-bottom-text-color: @w11k-slides-color-2;
-@w11k-slides-title-bottom-background-color: transparent;
+@w11k-slides-title-bottom-background: transparent;
 
 @w11k-slides-slide-regular-header-background: @w11k-slides-color-1;
 @w11k-slides-slide-regular-header-text-color: white;