Skip to content

Commit

Permalink
Merge branch 'wporg' of https://github.com/pixelgrade/gridable into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
andreilupu committed May 25, 2017
2 parents f353f54 + 557ce48 commit a5ab066
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule ".labels"]
path = .labels
url = https://georgeolaru@github.com/pixelgrade/labels.git
1 change: 1 addition & 0 deletions .labels
Submodule .labels added at dbb5c2
1 change: 1 addition & 0 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ We invest a lot of time and energy into developing Gridable in a way that makes
* Rewrite the Column Resize feature which helped us fix a lot of bugs with the content "Copy/Paste" actions
* Added the ability to have 1 level of **Nested rows**
* Added Screenshots to wordpress.org
* Added a better Distraction-Free editor width

= 1.1.0 =
* Rewrite `gridable_sh_row_classes` and `gridable_sh_col_classes` into a more consistent way as `gridable_row_class` and `gridable_column_class`
Expand Down
3 changes: 2 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ gulp.task( 'build', ['copy-folder'], function() {
'**/__MACOSX',
'+development.rb',
'+production.rb',
'README.md'
'README.md',
'.labels'
];

files_to_remove.forEach( function( e, k ) {
Expand Down
4 changes: 2 additions & 2 deletions public/scss/gridable-style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
}

@for $i from 1 through 12 {
.col-#{$i} {
.gridable--col.col-#{$i} {
flex-basis: percentage($i/12);
width: percentage($i/12);
max-width: percentage($i/12);
}
}

@media only screen and (max-width: 1024px) {
[class*="col-"] {
.gridable--col[class*="col-"] {
flex-basis: 100%;
width: 100%;
max-width: 100%;
Expand Down

0 comments on commit a5ab066

Please sign in to comment.