Flux layout fix first/last bugs in traditional columns

Selector was too general for first and last - needed to be more specific!
Jonnyauk · Jun 13, 2016 · 021d2b2 · 021d2b2
1 parent 3d1eadc
commit 021d2b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/wf-content/css/wf-css-flux-layout-core.css b/wf-content/css/wf-css-flux-layout-core.css
@@ -59,10 +59,10 @@ td,th { padding: 5px; }
 .top, .flush-top { margin-top: 0; padding-top: 0; }
 .bottom, .flush-bottom { margin-bottom: 0; padding-bottom: 0; }
 
-.clearfix:after, .container:after, .row:after, .row-columns:after { content: "\0020"; display: block; height: 0; clear: both; visibility: hidden; overflow: hidden; }
-.clearfix, .container, .row, .row-columns { display: block; }
-.clear, .clearfix:after, .container:after, .row:after, .row-columns:after { clear:both; }
-.clearfix:before, .clearfix:after, .container:before, .container:after, .row:before, .row:after, .row-columns:before, .row-columns:after { content:""; display:table; }
+.clearfix:after, .container:after, .row:after, .row-column:after { content: "\0020"; display: block; height: 0; clear: both; visibility: hidden; overflow: hidden; }
+.clearfix, .container, .row, .row-column { display: block; }
+.clear, .clearfix:after, .container:after, .row:after, .row-column:after { clear:both; }
+.clearfix:before, .clearfix:after, .container:before, .container:after, .row:before, .row:after, .row-column:before, .row-column:after { content:""; display:table; }
 
 /*** Viewport height ***/
 

diff --git a/wf-content/css/wf-css-flux-layout.php b/wf-content/css/wf-css-flux-layout.php
@@ -31,8 +31,8 @@
 //$wf_grid->space_loops();
 //$wf_grid->push_loops();
 $wf_grid->relative_loops();
-$wf_grid->relative_push_pull();
 $wf_grid->columns();
+$wf_grid->relative_push_pull();
 $wf_grid->media_queries_utility();
 $wf_grid->media_queries();
 
@@ -259,8 +259,8 @@ function columns() {
 		. 'float:left; margin-left: ' . $this->columns_gutter / 2 . '%; margin-right: ' . $this->columns_gutter / 2 . '%; }'
 		 . $this->minify;
 
-		echo '.row-' . rtrim($this->columns_prepend, '-') . ' div:first-of-type { margin-left: 0; margin-right: ' . $this->columns_gutter / 2 . '%; }' . $this->minify;
-		echo '.row-' . rtrim($this->columns_prepend, '-') . ' div:last-of-type { margin-left: ' . $this->columns_gutter / 2 . '%; margin-right: 0; }' . $this->minify;
+		echo '.row-' . rtrim($this->columns_prepend, '-') . ' > div:first-child { margin-left: 0; margin-right: ' . $this->columns_gutter / 2 . '%; }' . $this->minify;
+		echo '.row-' . rtrim($this->columns_prepend, '-') . ' > div:last-child { margin-left: ' . $this->columns_gutter / 2 . '%; margin-right: 0; }' . $this->minify;
 
 		foreach ( $this->columns as $size_r ) {