Merge branch 'master' of git@github.com:stubbornella/oocss

Conflicts: core/module/mod.css plugins/tabs/tabs.css
zachharkey · Sep 19, 2010 · 62fdbdf · 62fdbdf
2 parents f61fb4b + 0645415
commit 62fdbdf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/grid/grids.css b/core/grid/grids.css
@@ -1,4 +1,3 @@
-@media screen and (max-width: 319px) {.unit{float: none !important; width: auto !important;}}
 .line:after,.lastUnit:after{clear:both;display:block;visibility:hidden;overflow:hidden;height:0 !important;line-height:0;font-size:xx-large;content:" x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";}
 .line{*zoom:1;}
 .unit{float:left;}

diff --git a/plugins/tabs/tabs.css b/plugins/tabs/tabs.css
@@ -8,10 +8,11 @@ TODO: clean up selector structure - too much variation in rule strength
 .tabs{}
 .tabs .bd{}
 .tabs .hd ul{padding:0; display:table-row;_zoom:1;}
-.tabs .hd li{display:table-cell;_display:inline;vertical-align:middle;}
+.tabs .hd li{display:table-cell;*display:inline;vertical-align:middle;}
 .tabs .tabControl a{display:inline-block;text-decoration: none;}
 .tabs .tabControl span{display:inline-block; text-align:center; padding: 5px 20px;}
-.tabs .bd li{display:none;}/* BUG - causing all tabs to be invisible */
+.tabs .bd li{display:none;}
+.tabs .bd li li{display:block;}
 .tabs .bd li.current{display:block;}
 
 .tabs .topper{padding:0;}