Merge pull request #9 from blueberryapps/fix-style-ordering

Fix style ordering
blueberryapps · Apr 17, 2016 · 0a07403 · 0a07403
2 parents 636b8bb + 8cb4a0d
commit 0a07403
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "radium-bootstrap-grid",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Bootstrap grid system using inline styles",
   "main": "lib/index.js",
   "jsnext:main": "src/index.js",

diff --git a/src/column.react.js b/src/column.react.js
@@ -72,31 +72,31 @@ export default class Column extends Component {
       <div
         style={[
           column,
-          lg && columnWidth['lg'][lg],
-          lgHidden && columnHidden['lg'],
-          lgOffset && columnOffset['lg'][lgOffset],
-          lgPull && columnPull['lg'][lgPull],
-          lgPush && columnPush['lg'][lgPush],
-          md && columnWidth['md'][md],
-          mdHidden && columnHidden['md'],
-          mdOffset && columnOffset['md'][mdOffset],
-          mdPull && columnPull['md'][mdPull],
-          mdPush && columnPush['md'][mdPush],
+          xsHidden && columnHidden['xs'],
+          xsOffset && columnOffset['xs'][xsOffset],
+          xsPull && columnPull['xs'][xsPull],
+          xsPush && columnPush['xs'][xsPush],
           ms && columnWidth['ms'][ms],
           msHidden && columnHidden['ms'],
           msOffset && columnOffset['ms'][msOffset],
           msPull && columnPull['ms'][msPull],
           msPush && columnPush['ms'][msPush],
+          md && columnWidth['md'][md],
+          mdHidden && columnHidden['md'],
+          mdOffset && columnOffset['md'][mdOffset],
+          mdPull && columnPull['md'][mdPull],
+          mdPush && columnPush['md'][mdPush],
           sm && columnWidth['sm'][sm],
           smHidden && columnHidden['sm'],
           xs && columnWidth['xs'][xs],
           smOffset && columnOffset['sm'][smOffset],
           smPull && columnPull['sm'][smPull],
           smPush && columnPush['sm'][smPush],
-          xsHidden && columnHidden['xs'],
-          xsOffset && columnOffset['xs'][xsOffset],
-          xsPull && columnPull['xs'][xsPull],
-          xsPush && columnPush['xs'][xsPush],
+          lg && columnWidth['lg'][lg],
+          lgHidden && columnHidden['lg'],
+          lgOffset && columnOffset['lg'][lgOffset],
+          lgPull && columnPull['lg'][lgPull],
+          lgPush && columnPush['lg'][lgPush],
           style
         ]}
         {...props}