Skip to content

Commit d7bff01

Browse files
selfthinkermikesherov
authored andcommitted
Theme: removed or changed occurrences of zoom. Fixes #7975 - Remove invalid CSS for legacy browsers
Because of overlapping issues, this also reverts most of e77edc6 and fixes it in a different way.
1 parent 83e2a59 commit d7bff01

File tree

8 files changed

+14
-18
lines changed

8 files changed

+14
-18
lines changed

demos/button/toolbar.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<link rel="stylesheet" href="../demos.css">
1212
<style>
1313
#toolbar {
14-
padding: 11px 4px 9px 4px;
14+
padding: 4px;
15+
display: inline-block;
1516
}
16-
1717
/* support: IE7 */
18-
*:first-child+html #toolbar {
19-
padding: 4px 0px 4px 5px;
18+
*+html #toolbar {
19+
display: inline;
2020
}
2121
</style>
2222
<script>
@@ -91,7 +91,7 @@
9191
</head>
9292
<body>
9393

94-
<span id="toolbar" class="ui-widget-header ui-corner-all">
94+
<div id="toolbar" class="ui-widget-header ui-corner-all">
9595
<button id="beginning">go to beginning</button>
9696
<button id="rewind">rewind</button>
9797
<button id="play">play</button>
@@ -106,12 +106,12 @@
106106
<input type="radio" id="repeat1" name="repeat" /><label for="repeat1">Once</label>
107107
<input type="radio" id="repeatall" name="repeat" /><label for="repeatall">All</label>
108108
</span>
109-
</span>
109+
</div>
110110

111111
<div class="demo-description">
112112
<p>
113113
A mediaplayer toolbar. Take a look at the underlying markup: A few button elements,
114-
an input of type checkbox for the Shuffle button, and three inputs of type radio for the Repeat options.
114+
an input of type checkbox for the Shuffle button, and three inputs of type radio for the Repeat options.
115115
</p>
116116
</div>
117117
</body>

themes/base/jquery.ui.accordion.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
position: relative;
1515
margin-top: 2px;
1616
padding: .5em .5em .5em .7em;
17-
zoom: 1;
17+
min-height: 0; /* support: IE7 */
1818
}
1919
.ui-accordion .ui-accordion-icons {
2020
padding-left: 2.2em;
@@ -35,5 +35,4 @@
3535
padding: 1em 2.2em;
3636
border-top: 0;
3737
overflow: auto;
38-
zoom: 1;
3938
}

themes/base/jquery.ui.button.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
cursor: pointer;
1818
vertical-align: middle;
1919
text-align: center;
20-
zoom: 1;
2120
overflow: visible; /* removes extra width in IE */
2221
}
2322
.ui-button,
@@ -44,7 +43,7 @@ button.ui-button-icons-only {
4443

4544
/* button text element */
4645
.ui-button .ui-button-text {
47-
display: inline-block;
46+
display: block;
4847
line-height: normal;
4948
}
5049
.ui-button-text-only .ui-button-text {

themes/base/jquery.ui.core.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
clear: both;
4444
}
4545
.ui-helper-clearfix {
46-
zoom: 1;
46+
min-height: 0; /* support: IE7 */
4747
}
4848
.ui-helper-zfix {
4949
width: 100%;

themes/base/jquery.ui.dialog.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
padding: .5em 1em;
4141
background: none;
4242
overflow: auto;
43-
zoom: 1;
4443
}
4544
.ui-dialog .ui-dialog-buttonpane {
4645
text-align: left;

themes/base/jquery.ui.menu.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
.ui-menu .ui-menu-item {
2323
margin: 0;
2424
padding: 0;
25-
zoom: 1;
2625
width: 100%;
2726
}
2827
.ui-menu .ui-menu-divider {
@@ -37,7 +36,7 @@
3736
display: block;
3837
padding: 2px .4em;
3938
line-height: 1.5;
40-
zoom: 1;
39+
min-height: 0; /* support: IE7 */
4140
font-weight: normal;
4241
}
4342
.ui-menu .ui-menu-item a.ui-state-focus,

themes/base/jquery.ui.tabs.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
.ui-tabs {
1212
position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
1313
padding: .2em;
14-
zoom: 1;
1514
}
1615
.ui-tabs .ui-tabs-nav {
1716
margin: 0;

themes/base/jquery.ui.theme.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@
4141
background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/;
4242
color: #222222/*{fcHeader}*/;
4343
font-weight: bold;
44-
zoom: 1;
4544
}
46-
.ui-widget-header a { color: #222222/*{fcHeader}*/; }
45+
.ui-widget-header a {
46+
color: #222222/*{fcHeader}*/;
47+
}
4748

4849
/* Interaction states
4950
----------------------------------*/

0 commit comments

Comments
 (0)