From 5b763a73d452570919742cdcd50298a3ffb9a879 Mon Sep 17 00:00:00 2001 From: Beau Smith Date: Mon, 25 Oct 2010 17:28:31 -0700 Subject: [PATCH 1/2] Add missing commas in button styles. --- themes/default/jquery.mobile.button.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/default/jquery.mobile.button.css b/themes/default/jquery.mobile.button.css index 8aff729f764..a4c197b937d 100644 --- a/themes/default/jquery.mobile.button.css +++ b/themes/default/jquery.mobile.button.css @@ -19,10 +19,10 @@ .ui-bar .ui-btn-icon-left .ui-btn-inner { padding-left: 27px; } .ui-btn-icon-right .ui-btn-inner { padding-right: 33px; } .ui-header .ui-btn-icon-right .ui-btn-inner, -.ui-footer .ui-btn-icon-right .ui-btn-inner +.ui-footer .ui-btn-icon-right .ui-btn-inner, .ui-bar .ui-btn-icon-right .ui-btn-inner { padding-right: 27px; } .ui-btn-icon-top .ui-btn-inner { padding-top: 33px; } -.ui-header .ui-btn-icon-top .ui-btn-inner +.ui-header .ui-btn-icon-top .ui-btn-inner, .ui-footer .ui-btn-icon-top .ui-btn-inner, .ui-bar .ui-btn-icon-top .ui-btn-inner { padding-top: 27px; } .ui-btn-icon-bottom .ui-btn-inner { padding-bottom: 33px; } From 811ba0e68f40c691ece3baf8c89afa5b9d6c7ae8 Mon Sep 17 00:00:00 2001 From: Beau Smith Date: Mon, 25 Oct 2010 19:28:16 -0700 Subject: [PATCH 2/2] Removing un-necessary specificity from .ui-checkbox and .ui-radio styling. --- themes/default/jquery.mobile.controlgroup.css | 8 ++++---- themes/default/jquery.mobile.forms.checkboxradio.css | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/default/jquery.mobile.controlgroup.css b/themes/default/jquery.mobile.controlgroup.css index 2beaceefc67..abeffef57a2 100644 --- a/themes/default/jquery.mobile.controlgroup.css +++ b/themes/default/jquery.mobile.controlgroup.css @@ -9,13 +9,13 @@ .ui-controlgroup-controls { display: block; width: 95%;} .ui-controlgroup li { list-style: none; } .ui-controlgroup-vertical .ui-btn, -.ui-controlgroup-vertical div.ui-checkbox, .ui-controlgroup-vertical div.ui-radio { margin: 0; border-bottom-width: 0; } +.ui-controlgroup-vertical .ui-checkbox, .ui-controlgroup-vertical .ui-radio { margin: 0; border-bottom-width: 0; } .ui-controlgroup-vertical .ui-controlgroup-last { border-bottom-width: 1px; } .ui-controlgroup-horizontal { padding: 0; } .ui-controlgroup-horizontal .ui-btn, -.ui-controlgroup-horizontal div.ui-checkbox, .ui-controlgroup-horizontal div.ui-radio { margin: 0 -5px 0 0; display: inline-block; } -.ui-controlgroup-horizontal div.ui-checkbox .ui-btn, .ui-controlgroup-horizontal div.ui-radio .ui-btn, -.ui-controlgroup-horizontal div.ui-checkbox:last-child, .ui-controlgroup-horizontal div.ui-radio:last-child { margin-right: 0; } +.ui-controlgroup-horizontal .ui-checkbox, .ui-controlgroup-horizontal .ui-radio { margin: 0 -5px 0 0; display: inline-block; } +.ui-controlgroup-horizontal .ui-checkbox .ui-btn, .ui-controlgroup-horizontal .ui-radio .ui-btn, +.ui-controlgroup-horizontal .ui-checkbox:last-child, .ui-controlgroup-horizontal .ui-radio:last-child { margin-right: 0; } .ui-controlgroup-horizontal .ui-controlgroup-last { margin-right: 0; } .ui-controlgroup .ui-checkbox label, .ui-controlgroup .ui-radio label { font-size: 16px; } /* conflicts with listview.. diff --git a/themes/default/jquery.mobile.forms.checkboxradio.css b/themes/default/jquery.mobile.forms.checkboxradio.css index ee64768c059..87225b44099 100644 --- a/themes/default/jquery.mobile.forms.checkboxradio.css +++ b/themes/default/jquery.mobile.forms.checkboxradio.css @@ -3,7 +3,7 @@ * Copyright (c) jQuery Project * Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses. */ -div.ui-checkbox, div.ui-radio { position:relative; margin: .2em 0 .5em; } +.ui-checkbox, .ui-radio { position:relative; margin: .2em 0 .5em; } .ui-checkbox .ui-btn, .ui-radio .ui-btn { margin: 0; text-align: left; } .ui-checkbox .ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-btn-icon-left .ui-btn-inner { padding-left: 45px; } .ui-checkbox .ui-btn-icon-right .ui-btn-inner, .ui-radio .ui-btn-icon-right .ui-btn-inner { padding-right: 45px; }