Merge branch 'develop'

wanadev · Dec 8, 2015 · 26ba953 · 26ba953
2 parents 553cfcf + 1e9493f
commit 26ba953
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 6 deletions.
diff --git a/.npmignore b/.npmignore
@@ -5,3 +5,4 @@ gruntfile.js
 dist/*.js
 .jscsrc
 karma.conf.js
+.travis.yml
diff --git a/README.md b/README.md
@@ -148,6 +148,9 @@ Once you feel comfortable with the custom widget creation, you can create widget
 
 ## Changelog:
 
+* **1.2.1:**
+    * Fixes minor display issues
+
 * **1.2.0:**
   * TabItem can now have icons
   * Touch support on Window and Slider

diff --git a/dist/photonui-base.css b/dist/photonui-base.css
diff --git a/dist/photonui.js b/dist/photonui.js
@@ -9332,7 +9332,7 @@ var FluidLayout = Layout.$extend({
      * @type String
      * @default "start"
      */
-    _horizontallAlign: "start",
+    _horizontalAlign: "start",
 
     getHorizontalAlign: function () {
         return this._horizontalAlign;

diff --git a/dist/photonui.min.js b/dist/photonui.min.js
diff --git a/less/base/interactive/slider.less b/less/base/interactive/slider.less
@@ -30,7 +30,7 @@
 
 
 .photonui-slider {
-    display: flex;
+    display: flex !important;
     flex-direction: row;
     flew-wrap: nowrap;
     align-items: center;

diff --git a/less/base/layout/fluidlayout.less b/less/base/layout/fluidlayout.less
@@ -38,6 +38,7 @@
         display: flex;
         flex-wrap: wrap;
         height: 100%;
+        width: 100%;
         align-content: flex-start;
 
         > .photonui-container {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "photonui",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A javascript framework to create user interfaces",
   "homepage": "http://wanadev.github.io/PhotonUI/",
   "author": "Wanadev (http://wanadev.fr/)",

diff --git a/src/layout/fluidlayout.js b/src/layout/fluidlayout.js
@@ -189,7 +189,7 @@ var FluidLayout = Layout.$extend({
      * @type String
      * @default "start"
      */
-    _horizontallAlign: "start",
+    _horizontalAlign: "start",
 
     getHorizontalAlign: function () {
         return this._horizontalAlign;