From 218378ee159d4bb200cf516efa71df2dcf6493e9 Mon Sep 17 00:00:00 2001 From: scottjehl Date: Sun, 10 Oct 2010 16:32:44 -0400 Subject: [PATCH] moved basic header and footer styles into core.css. Now headerfooter.css only deals with inline/vs follow/fixed positioning of toolbars --- css/jquery.mobile.core.css | 5 +++++ css/jquery.mobile.headerfooter.css | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/css/jquery.mobile.core.css b/css/jquery.mobile.core.css index a7725480..6cbc4bf4 100644 --- a/css/jquery.mobile.core.css +++ b/css/jquery.mobile.core.css @@ -43,6 +43,11 @@ .ui-bar { font-size: 16px; margin: 0; } .ui-bar h1, .ui-bar h2, .ui-bar h3, .ui-bar h4, .ui-bar h5, .ui-bar h6 { margin: 0; padding: 0; font-size: 16px; display: inline-block; } +.ui-page .ui-header, .ui-page .ui-footer { position: relative; } +.ui-header .ui-btn-left { position: absolute; left: 10px; top: .4em; } +.ui-header .ui-title, .ui-footer .ui-title { text-align: center; font-size: 16px; display: block; margin: .6em 90px .8em; padding: 0; white-space: nowrap; overflow: hidden; } +.ui-header .ui-btn-right { position: absolute; right: 10px; top: .4em; } + /*content area*/ .ui-content { border-width: 0; overflow: visible; padding-bottom: 15px; } diff --git a/css/jquery.mobile.headerfooter.css b/css/jquery.mobile.headerfooter.css index b9d4ff33..b3739af1 100644 --- a/css/jquery.mobile.headerfooter.css +++ b/css/jquery.mobile.headerfooter.css @@ -3,10 +3,6 @@ * Copyright (c) jQuery Project * Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses. */ -/* page header & footer configuration */ -.ui-page .ui-header, .ui-page .ui-footer { position: relative; } +/* fixed page header & footer configuration */ .ui-header, .ui-footer, .ui-page-fullscreen .ui-header, .ui-page-fullscreen .ui-footer { position: absolute; z-index: 1000; overflow: hidden; width: 100%; border-left-width: 0; border-right-width: 0; } .ui-footer-duplicate, .ui-page-fullscreen .ui-fixed-inline { display: none; } -.ui-header .ui-btn-left { position: absolute; left: 10px; top: .4em; } -.ui-header .ui-title, .ui-footer .ui-title { text-align: center; font-size: 16px; display: block; margin: .6em 90px .8em; padding: 0; white-space: nowrap; overflow: hidden; } -.ui-header .ui-btn-right { position: absolute; right: 10px; top: .4em; }