mirror of
https://github.com/Hopiu/jquery-mobile.git
synced 2026-05-03 20:34:42 +00:00
Merge branch 'master' into phonegap
This commit is contained in:
commit
251a3c0add
3 changed files with 4 additions and 3 deletions
|
|
@ -157,7 +157,7 @@ jQuery.widget( "mobile.scrollview", jQuery.mobile.widget, {
|
|||
}
|
||||
|
||||
this._setScrollPosition(x, y);
|
||||
this._$clip.trigger(this.options.updateEventName, { x: x, y: y });
|
||||
this._$clip.trigger(this.options.updateEventName, [ { x: x, y: y } ]);
|
||||
|
||||
if (keepGoing)
|
||||
this._timerID = setTimeout(this._timerCB, this._timerInterval);
|
||||
|
|
|
|||
|
|
@ -40,9 +40,9 @@
|
|||
|
||||
.ui-header, .ui-footer { display: 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-btn-left, .ui-footer .ui-btn-left { position: absolute; left: 10px; top: .4em; }
|
||||
.ui-header .ui-btn-right, .ui-footer .ui-btn-right { position: absolute; right: 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; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; outline: 0 !important; }
|
||||
.ui-header .ui-btn-right { position: absolute; right: 10px; top: .4em; }
|
||||
|
||||
/*content area*/
|
||||
.ui-content { border-width: 0; overflow: visible; overflow-x: hidden; padding: 15px; }
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid
|
|||
|
||||
.ui-li-aside { float: right; width: 50%; text-align: right; margin: .3em 0; }
|
||||
.min-width-480px .ui-li-aside { width: 45%; }
|
||||
.ui-li-divider { cursor: default; }
|
||||
.ui-li-has-alt .ui-btn-inner { padding-right: 95px; }
|
||||
.ui-li-count { position: absolute; font-size: 11px; font-weight: bold; padding: .2em .5em; top: 50%; margin-top: -.9em; right: 38px; }
|
||||
.ui-li-divider .ui-li-count { right: 10px; }
|
||||
|
|
|
|||
Loading…
Reference in a new issue