Skip to content

Commit 5c050aa

Browse files
jaspermdegrootarschmitz
authored andcommitted
Icons: Switch to inline-block
1 parent beb3aaf commit 5c050aa

File tree

3 files changed

+28
-71
lines changed

3 files changed

+28
-71
lines changed

css/structure/jquery.mobile.core.css

Lines changed: 26 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ div.ui-mobile-viewport {
227227
font-size: 16px;
228228
margin: .5em 0;
229229
padding: .7em 1em;
230+
line-height: 1.375;
230231
display: block;
231232
position: relative;
232233
text-align: center;
@@ -249,27 +250,24 @@ div.ui-mobile-viewport {
249250
white-space: nowrap !important;
250251
}
251252
.ui-mini {
252-
font-size: 12.5px;
253+
font-size: 13px;
254+
line-height: 1.7;
253255
}
254256
.ui-mini .ui-button {
255257
font-size: inherit;
256258
}
257259
/* Make buttons in toolbars default to mini and inline. */
258260
.ui-header .ui-button,
259261
.ui-footer .ui-button {
260-
font-size: 12.5px;
262+
font-size: 13px;
261263
display: inline-block;
262264
vertical-align: middle;
263265
}
264266
.ui-header .ui-controlgroup .ui-button-icon-only,
265-
.ui-footer .ui-controlgroup .ui-button-icon-only {
266-
font-size: 12.5px;
267-
}
268-
269-
/* To ensure same top and left/right position when ui-button-left/right are added to something other than buttons. */
267+
.ui-footer .ui-controlgroup .ui-button-icon-only,
270268
.ui-header .ui-button-left,
271269
.ui-header .ui-button-right {
272-
font-size: 12.5px;
270+
font-size: 13px;
273271
}
274272
.ui-mini.ui-button-icon-only,
275273
.ui-mini .ui-button-icon-only,
@@ -283,76 +281,38 @@ div.ui-mobile-viewport {
283281
vertical-align: middle;
284282
margin-right: .625em;
285283
}
286-
.ui-icon-beginning {
287-
padding-left: 2.5em;
288-
}
289-
.ui-icon-end {
290-
padding-right: 2.5em;
291-
}
292-
.ui-icon-top {
293-
padding-top: 2.5em;
294-
}
295-
.ui-icon-bottom {
296-
padding-bottom: 2.5em;
297-
}
298284
.ui-controlgroup-horizontal .ui-checkboxradio-label {
299285
padding: .7em 1em;
300286
}
301-
.ui-header .ui-icon-top,
302-
.ui-footer .ui-icon-top,
303-
.ui-header .ui-icon-bottom,
304-
.ui-footer .ui-icon-bottom {
305-
padding-left: .3125em;
306-
padding-right: .3125em;
307-
}
308-
309287
.ui-icon {
310-
position: absolute;
311288
display: inline-block;
312289
width: 22px;
313290
height: 22px;
314-
background-position: center;
315-
background-repeat: no-repeat;
291+
line-height: 1;
292+
vertical-align: middle;
293+
position: relative;
294+
bottom: 2px;
295+
}
296+
.ui-icon-display-block {
297+
display: block;
298+
margin: 0 auto;
299+
top: 0;
300+
}
301+
.ui-button-icon-only .ui-icon {
302+
position: absolute;
303+
display: inline-block;
316304
text-indent: 100%;
317305
white-space: nowrap;
318306
overflow: hidden;
319-
}
320-
.ui-button.ui-button-icon-only .ui-icon,
321-
.ui-button.ui-icon-beginning .ui-icon,
322-
.ui-button.ui-icon-end .ui-icon {
307+
bottom: auto;
323308
top: 50%;
324-
margin-top: -11px;
325-
}
326-
.ui-icon-beginning .ui-icon {
327-
left: .5625em;
328-
}
329-
.ui-icon-end .ui-icon {
330-
right: .5625em;
331-
}
332-
.ui-mini.ui-icon-beginning .ui-icon,
333-
.ui-mini .ui-icon-beginning .ui-icon,
334-
.ui-header .ui-icon-beginning .ui-icon,
335-
.ui-footer .ui-icon-beginning .ui-icon {
336-
left: .37em;
337-
}
338-
.ui-mini.ui-icon-end .ui-icon,
339-
.ui-mini .ui-icon-end .ui-icon,
340-
.ui-header .ui-icon-end .ui-icon,
341-
.ui-footer .ui-icon-end .ui-icon {
342-
right: .37em;
343-
}
344-
.ui-button.ui-button-icon-only .ui-icon,
345-
.ui-button.ui-icon-top .ui-icon,
346-
.ui-button.ui-icon-bottom .ui-icon {
347309
left: 50%;
348-
margin-left: -11px;
349310
}
350-
.ui-icon-top .ui-icon {
351-
top: .5625em;
352-
}
353-
.ui-icon-bottom .ui-icon {
354-
top: auto;
355-
bottom: .5625em;
311+
.ui-button-icon-only .ui-icon,
312+
.ui-button-icon-only.ui-button-left > .ui-icon,
313+
.ui-button-icon-only.ui-button-right > .ui-icon {
314+
margin-top: -11px;
315+
margin-left: -11px;
356316
}
357317

358318
/* Buttons in header position classes */
@@ -395,6 +355,7 @@ input.ui-button,
395355
width: 100%;
396356
}
397357
button.ui-button-inline,
358+
input.ui-button-inline,
398359
.ui-header button.ui-button,
399360
.ui-footer button.ui-button {
400361
width: auto;

css/structure/jquery.mobile.forms.checkboxradio.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
.ui-checkboxradio-label .ui-icon.ui-checkboxradio-icon {
1414
width: 18px;
1515
height: 18px;
16-
margin: -9px 2px 0 2px;
16+
margin: 0 2px;
1717
}
1818

1919
.ui-checkboxradio-radio-label.ui-state-active .ui-checkboxradio-icon {

css/themes/default/jquery.mobile.theme.css

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,7 @@ label.ui-button {
167167
/* Icons
168168
-----------------------------------------------------------------------------------------------------------*/
169169

170-
.ui-icon-beginning .ui-icon,
171-
.ui-icon-end .ui-icon,
172-
.ui-icon-top .ui-icon,
173-
.ui-icon-bottom .ui-icon,
174-
.ui-button-icon-only .ui-icon {
170+
.ui-icon {
175171
background-color: #666 /*{global-icon-color}*/;
176172
background-color: rgba(0,0,0,.3) /*{global-icon-disc}*/;
177173
background-position: center center;

0 commit comments

Comments
 (0)