Skip to content

Commit

Permalink
Theme: removed or changed occurrences of zoom. Fixes #7975 - Remove i…
Browse files Browse the repository at this point in the history
…nvalid CSS for legacy browsers

Because of overlapping issues, this also reverts most of e77edc6 and fixes it in a different way.
  • Loading branch information
selfthinker authored and mikesherov committed Nov 30, 2012
1 parent 83e2a59 commit d7bff01
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 18 deletions.
14 changes: 7 additions & 7 deletions demos/button/toolbar.html
Expand Up @@ -11,12 +11,12 @@
<link rel="stylesheet" href="../demos.css">
<style>
#toolbar {
padding: 11px 4px 9px 4px;
padding: 4px;
display: inline-block;
}

/* support: IE7 */
*:first-child+html #toolbar {
padding: 4px 0px 4px 5px;
*+html #toolbar {
display: inline;
}
</style>
<script>
Expand Down Expand Up @@ -91,7 +91,7 @@
</head>
<body>

<span id="toolbar" class="ui-widget-header ui-corner-all">
<div id="toolbar" class="ui-widget-header ui-corner-all">
<button id="beginning">go to beginning</button>
<button id="rewind">rewind</button>
<button id="play">play</button>
Expand All @@ -106,12 +106,12 @@
<input type="radio" id="repeat1" name="repeat" /><label for="repeat1">Once</label>
<input type="radio" id="repeatall" name="repeat" /><label for="repeatall">All</label>
</span>
</span>
</div>

<div class="demo-description">
<p>
A mediaplayer toolbar. Take a look at the underlying markup: A few button elements,
an input of type checkbox for the Shuffle button, and three inputs of type radio for the Repeat options.
an input of type checkbox for the Shuffle button, and three inputs of type radio for the Repeat options.
</p>
</div>
</body>
Expand Down
3 changes: 1 addition & 2 deletions themes/base/jquery.ui.accordion.css
Expand Up @@ -14,7 +14,7 @@
position: relative;
margin-top: 2px;
padding: .5em .5em .5em .7em;
zoom: 1;
min-height: 0; /* support: IE7 */
}
.ui-accordion .ui-accordion-icons {
padding-left: 2.2em;
Expand All @@ -35,5 +35,4 @@
padding: 1em 2.2em;
border-top: 0;
overflow: auto;
zoom: 1;
}
3 changes: 1 addition & 2 deletions themes/base/jquery.ui.button.css
Expand Up @@ -17,7 +17,6 @@
cursor: pointer;
vertical-align: middle;
text-align: center;
zoom: 1;
overflow: visible; /* removes extra width in IE */
}
.ui-button,
Expand All @@ -44,7 +43,7 @@ button.ui-button-icons-only {

/* button text element */
.ui-button .ui-button-text {
display: inline-block;
display: block;
line-height: normal;
}
.ui-button-text-only .ui-button-text {
Expand Down
2 changes: 1 addition & 1 deletion themes/base/jquery.ui.core.css
Expand Up @@ -43,7 +43,7 @@
clear: both;
}
.ui-helper-clearfix {
zoom: 1;
min-height: 0; /* support: IE7 */
}
.ui-helper-zfix {
width: 100%;
Expand Down
1 change: 0 additions & 1 deletion themes/base/jquery.ui.dialog.css
Expand Up @@ -40,7 +40,6 @@
padding: .5em 1em;
background: none;
overflow: auto;
zoom: 1;
}
.ui-dialog .ui-dialog-buttonpane {
text-align: left;
Expand Down
3 changes: 1 addition & 2 deletions themes/base/jquery.ui.menu.css
Expand Up @@ -22,7 +22,6 @@
.ui-menu .ui-menu-item {
margin: 0;
padding: 0;
zoom: 1;
width: 100%;
}
.ui-menu .ui-menu-divider {
Expand All @@ -37,7 +36,7 @@
display: block;
padding: 2px .4em;
line-height: 1.5;
zoom: 1;
min-height: 0; /* support: IE7 */
font-weight: normal;
}
.ui-menu .ui-menu-item a.ui-state-focus,
Expand Down
1 change: 0 additions & 1 deletion themes/base/jquery.ui.tabs.css
Expand Up @@ -11,7 +11,6 @@
.ui-tabs {
position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
padding: .2em;
zoom: 1;
}
.ui-tabs .ui-tabs-nav {
margin: 0;
Expand Down
5 changes: 3 additions & 2 deletions themes/base/jquery.ui.theme.css
Expand Up @@ -41,9 +41,10 @@
background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/;
color: #222222/*{fcHeader}*/;
font-weight: bold;
zoom: 1;
}
.ui-widget-header a { color: #222222/*{fcHeader}*/; }
.ui-widget-header a {
color: #222222/*{fcHeader}*/;
}

/* Interaction states
----------------------------------*/
Expand Down

0 comments on commit d7bff01

Please sign in to comment.