]> source.dussan.org Git - jquery-ui.git/commitdiff
projects / jquery-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 83e2a59)
Theme: removed or changed occurrences of zoom. Fixes #7975 - Remove invalid CSS for...
authorAnika Henke <anika@selfthinker.org>
Thu, 29 Nov 2012 19:26:29 +0000 (19:26 +0000)
committerMike Sherov <mike.sherov@gmail.com>
Fri, 30 Nov 2012 02:48:58 +0000 (21:48 -0500)
Because of overlapping issues, this also reverts most of e77edc60 and fixes it in a different way.

demos/button/toolbar.html patch | blob | history
themes/base/jquery.ui.accordion.css patch | blob | history
themes/base/jquery.ui.button.css patch | blob | history
themes/base/jquery.ui.core.css patch | blob | history
themes/base/jquery.ui.dialog.css patch | blob | history
themes/base/jquery.ui.menu.css patch | blob | history
themes/base/jquery.ui.tabs.css patch | blob | history
themes/base/jquery.ui.theme.css patch | blob | history

diff --git a/demos/button/toolbar.html b/demos/button/toolbar.html
index 5be3668f6249a0dd0af93cc4f36b1016df5826bd..62c1ca83a482865bad2fc9111f3ce5b99e8bdbe2 100644 (file)
--- a/demos/button/toolbar.html
+++ b/demos/button/toolbar.html
@@ -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>
@@ -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>
@@ -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>
diff --git a/themes/base/jquery.ui.accordion.css b/themes/base/jquery.ui.accordion.css
index d239bc49e4de0f6ceced5804ce9d6580f0728c51..8af1b2e2bbc62d15a1f8094789c1f3bf20e83da1 100644 (file)
--- a/themes/base/jquery.ui.accordion.css
+++ b/themes/base/jquery.ui.accordion.css
@@ -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;
@@ -35,5 +35,4 @@
        padding: 1em 2.2em;
        border-top: 0;
        overflow: auto;
-       zoom: 1;
 }
diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css
index 602f93a926e58cca64685eac24aa63a32b81a706..bf6d10547b4974e5456f5a5d841a29e22d7d2fc7 100644 (file)
--- a/themes/base/jquery.ui.button.css
+++ b/themes/base/jquery.ui.button.css
@@ -17,7 +17,6 @@
        cursor: pointer;
        vertical-align: middle;
        text-align: center;
-       zoom: 1;
        overflow: visible; /* removes extra width in IE */
 }
 .ui-button,
@@ -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 {
diff --git a/themes/base/jquery.ui.core.css b/themes/base/jquery.ui.core.css
index c68808065418b8a143fb563597278756f6d9486c..cc1efef1d714a96546fbc6210dd9be534fe905b5 100644 (file)
--- a/themes/base/jquery.ui.core.css
+++ b/themes/base/jquery.ui.core.css
@@ -43,7 +43,7 @@
        clear: both;
 }
 .ui-helper-clearfix {
-       zoom: 1;
+       min-height: 0; /* support: IE7 */
 }
 .ui-helper-zfix {
        width: 100%;
diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css
index d278d9649c62bc2d5fb9b3e277edd8551d85a5f8..986ce8604dddb9686c3bb559d21e127f7db61e73 100644 (file)
--- a/themes/base/jquery.ui.dialog.css
+++ b/themes/base/jquery.ui.dialog.css
@@ -40,7 +40,6 @@
        padding: .5em 1em;
        background: none;
        overflow: auto;
-       zoom: 1;
 }
 .ui-dialog .ui-dialog-buttonpane {
        text-align: left;
diff --git a/themes/base/jquery.ui.menu.css b/themes/base/jquery.ui.menu.css
index 9357158b7f268f5b5105f3af21d36e317c08e262..67d5e6f82f579f278c54376159979f819ed9bdf8 100644 (file)
--- a/themes/base/jquery.ui.menu.css
+++ b/themes/base/jquery.ui.menu.css
@@ -22,7 +22,6 @@
 .ui-menu .ui-menu-item {
        margin: 0;
        padding: 0;
-       zoom: 1;
        width: 100%;
 }
 .ui-menu .ui-menu-divider {
@@ -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,
diff --git a/themes/base/jquery.ui.tabs.css b/themes/base/jquery.ui.tabs.css
index f4d82f0380d44cb9ea5846f79e1236488d4a21dc..ec8a0539945384afb18e5d8c9c12737ed917267f 100644 (file)
--- a/themes/base/jquery.ui.tabs.css
+++ b/themes/base/jquery.ui.tabs.css
@@ -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;
diff --git a/themes/base/jquery.ui.theme.css b/themes/base/jquery.ui.theme.css
index 6388885c23d5b335a636eabf81518e2d690ce115..47aedb0d3bae4e6cd8da0cc0c54b6e97d3da209e 100644 (file)
--- a/themes/base/jquery.ui.theme.css
+++ b/themes/base/jquery.ui.theme.css
@@ -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
 ----------------------------------*/
The official jQuery user interface library: https://github.com/jquery/jquery-ui