Merge branch 'develop' into 1.0

slab · Aug 23, 2016 · d220601 · d220601
2 parents 5aee3a3 + 434bf91
commit d220601
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/assets/base.styl b/assets/base.styl
@@ -201,6 +201,7 @@ colorItemsPerRow = 7
       padding: 4px 0px
     .ql-picker-item
       height: controlHeight
+      width: controlHeight
       padding: 2px 4px
   .ql-color-picker
     .ql-picker-options