Revert [31198] from the 4.1 branch, as it is an incomplete fix that introduces more problems than the tiny issue it was attempting to solve.

see #30725.

Built from https://develop.svn.wordpress.org/branches/4.1@31468


git-svn-id: http://core.svn.wordpress.org/branches/4.1@31449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2015-02-17 14:11:25 +00:00
parent 4ff80ae587
commit 4a877ade5a
4 changed files with 4 additions and 28 deletions

View File

@ -235,22 +235,11 @@
} }
.media-toolbar-secondary { .media-toolbar-secondary {
position: relative;
float: right; float: right;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding-left: 20px;
height: 100%; height: 100%;
max-width: 66%; max-width: 66%;
} }
.media-toolbar-secondary .spinner {
position: absolute;
top: 2px;
left: 0px;
}
.media-toolbar-primary > .media-button, .media-toolbar-primary > .media-button,
.media-toolbar-primary > .media-button-group { .media-toolbar-primary > .media-button-group {
margin-right: 10px; margin-right: 10px;
@ -746,7 +735,6 @@
margin-top: 11px; margin-top: 11px;
margin-left: 2%; margin-left: 2%;
max-width: 47%; max-width: 47%;
width: 100%; /* prevents options from invisibly taking up horizontal space */
} }
/** /**
@ -2366,7 +2354,7 @@
} }
.media-modal .attachments-browser .media-toolbar .spinner { .media-modal .attachments-browser .media-toolbar .spinner {
margin: 14px 0 0; margin: 14px 8px 0;
} }
/* Text inputs need to be 16px, or they force zooming on iOS */ /* Text inputs need to be 16px, or they force zooming on iOS */

File diff suppressed because one or more lines are too long

View File

@ -235,22 +235,11 @@
} }
.media-toolbar-secondary { .media-toolbar-secondary {
position: relative;
float: left; float: left;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding-right: 20px;
height: 100%; height: 100%;
max-width: 66%; max-width: 66%;
} }
.media-toolbar-secondary .spinner {
position: absolute;
top: 2px;
right: 0px;
}
.media-toolbar-primary > .media-button, .media-toolbar-primary > .media-button,
.media-toolbar-primary > .media-button-group { .media-toolbar-primary > .media-button-group {
margin-left: 10px; margin-left: 10px;
@ -746,7 +735,6 @@
margin-top: 11px; margin-top: 11px;
margin-right: 2%; margin-right: 2%;
max-width: 47%; max-width: 47%;
width: 100%; /* prevents options from invisibly taking up horizontal space */
} }
/** /**
@ -2366,7 +2354,7 @@
} }
.media-modal .attachments-browser .media-toolbar .spinner { .media-modal .attachments-browser .media-toolbar .spinner {
margin: 14px 0 0; margin: 14px 8px 0;
} }
/* Text inputs need to be 16px, or they force zooming on iOS */ /* Text inputs need to be 16px, or they force zooming on iOS */

File diff suppressed because one or more lines are too long