google
/
material-design-lite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #265 from google/hotfix/grid-variables 

Hotfix/grid variables
master
Jonathan Garbee 2015-04-30 13:36:11 -04:00
parent 3f588faaf6 036f2bc1e5
commit 480d468ddb
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/_variables.scss
View File

@ -37,6 +37,8 @@
* -----Animation
* -----Progress
* -----Badge
* -----Shadows
* -----Grid
*/
@ -532,3 +534,23 @@ $badge-padding: 2px;
$shadow-key-umbra-opacity: 0.2;
$shadow-key-penumbra-opacity: 0.14;
$shadow-ambient-shadow-opacity: 0.12;
/* GRID */
$grid-desktop-columns: 12 !default;
$grid-desktop-gutter: 16px !default;
$grid-desktop-margin: 16px !default;
$grid-desktop-breakpoint: 840px !default;
$grid-tablet-columns: 8 !default;
$grid-tablet-gutter: $grid-desktop-gutter !default;
$grid-tablet-margin: $grid-desktop-margin !default;
$grid-tablet-breakpoint: 480px !default;
$grid-phone-columns: 4 !default;
$grid-phone-gutter: $grid-desktop-gutter !default;
$grid-phone-margin: $grid-desktop-margin !default;
$grid-cell-default-columns: $grid-phone-columns !default;

19
src/grid/_grid.scss
View File

@ -14,24 +14,7 @@
* limitations under the License.
*/
$grid-desktop-columns: 12;
$grid-desktop-gutter: 16px;
$grid-desktop-margin: 16px;
$grid-desktop-breakpoint: 840px;
$grid-tablet-columns: 8;
$grid-tablet-gutter: $grid-desktop-gutter;
$grid-tablet-margin: $grid-desktop-margin;
$grid-tablet-breakpoint: 480px;
$grid-phone-columns: 4;
$grid-phone-gutter: $grid-desktop-gutter;
$grid-phone-margin: $grid-desktop-margin;
$grid-cell-default-columns: $grid-phone-columns;
@import "../variables";
.mdl-grid {
display: flex;