diff --git a/kitchen-sink/css/kitchen-sink.css b/kitchen-sink/css/kitchen-sink.css index 4ede82b4c0..52e380354b 100644 --- a/kitchen-sink/css/kitchen-sink.css +++ b/kitchen-sink/css/kitchen-sink.css @@ -29,17 +29,21 @@ .statusbar-overlay.with-panel-right { background: #000; } -.page[data-page="tabbar"] .toolbar, -.page[data-page="tabbar-labels"] .toolbar { +.page[data-page="tabbar"] .tabbar, +.page[data-page="tabbar-labels"] .tabbar { -webkit-transform: none; -moz-transform: none; -ms-transform: none; -o-transform: none; transform: none; } -.page[data-page="tabbar"] .page-content, .page[data-page="tabbar-labels"] .page-content { - padding-bottom: 44px; + padding-bottom: 50px; +} +@media all and (min-width: 768px) { + .page[data-page="tabbar-labels"] .page-content { + padding-bottom: 56px; + } } i.ks-tabbar-icon-1 { width: 30px; diff --git a/kitchen-sink/jade/tabbar-labels.jade b/kitchen-sink/jade/tabbar-labels.jade index 16d77b4c7c..d3e82af24c 100644 --- a/kitchen-sink/jade/tabbar-labels.jade +++ b/kitchen-sink/jade/tabbar-labels.jade @@ -9,7 +9,7 @@ a(href="#").link.open-panel.icon-only i.icon.icon-bars .pages.navbar-through - .page(data-page="tabbar-labels").no-toolbar.toolbar-fixed + .page(data-page="tabbar-labels").no-toolbar.tabbar-labels-fixed .toolbar.tabbar.tabbar-labels .toolbar-inner a(href="#tab-1").tab-link.active diff --git a/kitchen-sink/less/kitchen-sink.less b/kitchen-sink/less/kitchen-sink.less index d601316d01..7a26d8420b 100644 --- a/kitchen-sink/less/kitchen-sink.less +++ b/kitchen-sink/less/kitchen-sink.less @@ -35,15 +35,20 @@ } // Demo tab bars .page[data-page="tabbar"], .page[data-page="tabbar-labels"] { - .toolbar { + .tabbar { -webkit-transform: none; -moz-transform: none; -ms-transform: none; -o-transform: none; transform: none; } +} +.page[data-page="tabbar-labels"] { .page-content { - padding-bottom: 44px; + padding-bottom: 50px; + @media all and (min-width:768px) { + padding-bottom: 56px; + } } } i.ks-tabbar-icon-1 { diff --git a/kitchen-sink/tabbar-labels.html b/kitchen-sink/tabbar-labels.html index 02fa9adc2b..e724b8e2be 100644 --- a/kitchen-sink/tabbar-labels.html +++ b/kitchen-sink/tabbar-labels.html @@ -7,7 +7,7 @@