-
-
-
+
+
+
-
-
+
+
@@ -114,21 +172,22 @@
diff --git a/src/components/mdLayout/mdLayout.scss b/src/components/mdLayout/mdLayout.scss
index 0582056..102cd73 100644
--- a/src/components/mdLayout/mdLayout.scss
+++ b/src/components/mdLayout/mdLayout.scss
@@ -7,6 +7,7 @@
.md-layout {
display: flex;
flex-direction: row;
+ flex-wrap: wrap;
flex: 1;
}
@@ -33,13 +34,8 @@
/* Gutter Size */
-$sizes: (8, 16, 24, 40);
-
-@each $item in $sizes {
- $padding: $item / 2 + px;
- $margin: -$item / 2 + px;
-
- .md-gutter-#{$item}:not(.md-column) {
+@mixin layout-gutter($margin: -12px, $padding: 12px) {
+ &:not(.md-column) {
margin-right: $margin;
margin-left: $margin;
@@ -49,7 +45,7 @@ $sizes: (8, 16, 24, 40);
}
}
- .md-column.md-gutter-#{$item} {
+ .md-column {
margin-top: $margin;
margin-bottom: $margin;
@@ -60,6 +56,25 @@ $sizes: (8, 16, 24, 40);
}
}
+.md-gutter {
+ @include layout-gutter();
+
+ @include layout-small {
+ @include layout-gutter(-8px, 8px);
+ }
+}
+
+$sizes: (8, 16, 24, 40);
+
+@each $item in $sizes {
+ $margin: -$item / 2 + px;
+ $padding: $item / 2 + px;
+
+ .md-gutter-#{$item} {
+ @include layout-gutter($margin, $padding);
+ }
+}
+
/* Flex Size */
@@ -73,14 +88,18 @@ $sizes: (8, 16, 24, 40);
}
.md-flex#{$size} {
- flex: 1;
+ flex: 1 1;
}
.md-flex#{$size}-33 {
+ min-width: 33.33333%;
+ max-width: 33.33333%;
flex: 0 1 33.33333%;
}
.md-flex#{$size}-66 {
+ min-width: 33.33333%;
+ max-width: 33.33333%;
flex: 0 1 66.66666%;
}
@@ -88,6 +107,8 @@ $sizes: (8, 16, 24, 40);
$counter: $i * 5;
.md-flex#{$size}-#{$counter} {
+ min-width: #{$counter + '%'};
+ max-width: #{$counter + '%'};
flex: 0 1 #{$counter + '%'};
}
}
diff --git a/src/components/mdLayout/mdLayout.vue b/src/components/mdLayout/mdLayout.vue
index b85ef43..9376f59 100644
--- a/src/components/mdLayout/mdLayout.vue
+++ b/src/components/mdLayout/mdLayout.vue
@@ -24,13 +24,13 @@
mdHideMedium: Boolean,
mdHideLarge: Boolean,
mdHideXlarge: Boolean,
- mdGutter: [Number, Boolean],
- mdFlex: [Number, Boolean],
- mdFlexXsmall: Number,
- mdFlexSmall: Number,
- mdFlexMedium: Number,
- mdFlexLarge: Number,
- mdFlexXlarge: Number
+ mdGutter: [String, Number, Boolean],
+ mdFlex: [String, Number, Boolean],
+ mdFlexXsmall: [String, Number, Boolean],
+ mdFlexSmall: [String, Number, Boolean],
+ mdFlexMedium: [String, Number, Boolean],
+ mdFlexLarge: [String, Number, Boolean],
+ mdFlexXlarge: [String, Number, Boolean]
},
computed: {
classes() {
@@ -51,18 +51,13 @@
'md-hide-small': this.mdHideSmall,
'md-hide-medium': this.mdHideMedium,
'md-hide-large': this.mdHideLarge,
- 'md-hide-xlarge': this.mdHideXlarge,
- 'md-flex-xsmall': this.mdFlexXsmall,
- 'md-flex-small': this.mdFlexSmall,
- 'md-flex-medium': this.mdFlexMedium,
- 'md-flex-large': this.mdFlexLarge,
- 'md-flex-xlarge': this.mdFlexXlarge
+ 'md-hide-xlarge': this.mdHideXlarge
};
if (this.mdGutter) {
if (typeof this.mdGutter === 'boolean') {
- classes['md-gutter-8'] = true;
- } else {
+ classes['md-gutter'] = true;
+ } else if (this.mdGutter) {
classes['md-gutter-' + this.mdGutter] = true;
}
}
@@ -87,7 +82,7 @@
if (typeof this[name] === 'boolean') {
object['md-flex' + size] = true;
} else {
- object['md-flex-' + size + this[name]] = true;
+ object['md-flex' + size + '-' + this[name]] = true;
}
}
}
diff --git a/src/components/mdTable/mdTablePagination.vue b/src/components/mdTable/mdTablePagination.vue
index 9f0ee3b..ffe8433 100644
--- a/src/components/mdTable/mdTablePagination.vue
+++ b/src/components/mdTable/mdTablePagination.vue
@@ -48,7 +48,7 @@
subTotal: 0,
currentSize: parseInt(this.mdSize, 10),
currentPage: parseInt(this.mdPage, 10),
- totalItems: isNaN(this.mdTotal)?Number.MAX_SAFE_INTEGER:parseInt(this.mdTotal, 10)
+ totalItems: isNaN(this.mdTotal) ? Number.MAX_SAFE_INTEGER : parseInt(this.mdTotal, 10)
};
},
computed: {
diff --git a/src/core/stylesheets/variables.scss b/src/core/stylesheets/variables.scss
index 0001180..1086d8b 100644
--- a/src/core/stylesheets/variables.scss
+++ b/src/core/stylesheets/variables.scss
@@ -6,10 +6,9 @@ $font-roboto: Roboto, Lato, sans-serif;
/* Responsive Breakpoints */
$breakpoint-xsmall: 600px !default;
-$breakpoint-small: 1024px !default;
-$breakpoint-medium: 1440px !default;
-$breakpoint-large: 1600px !default;
-$breakpoint-xlarge: 1920px !default;
+$breakpoint-small: 960px !default;
+$breakpoint-medium: 1280px !default;
+$breakpoint-large: 1920px !default;
/* Transitions - Based on Angular Material */