[31468] reverted this in the 4.1 branch, also reverting in trunk.

See #30725.

Built from https://develop.svn.wordpress.org/trunk@31616


git-svn-id: http://core.svn.wordpress.org/trunk@31597 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-03-05 03:50:28 +00:00
parent b3e11db20b
commit 7ba0674183
5 changed files with 5 additions and 29 deletions

View File

@ -235,22 +235,11 @@
}
.media-toolbar-secondary {
position: relative;
float: right;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding-left: 20px;
height: 100%;
max-width: 66%;
}
.media-toolbar-secondary .spinner {
position: absolute;
top: 2px;
left: 0px;
}
.media-toolbar-primary > .media-button,
.media-toolbar-primary > .media-button-group {
margin-right: 10px;
@ -751,7 +740,6 @@
margin-top: 11px;
margin-left: 2%;
max-width: 47%;
width: 100%; /* prevents options from invisibly taking up horizontal space */
}
/**
@ -2376,7 +2364,7 @@
}
.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 */

File diff suppressed because one or more lines are too long

View File

@ -235,22 +235,11 @@
}
.media-toolbar-secondary {
position: relative;
float: left;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding-right: 20px;
height: 100%;
max-width: 66%;
}
.media-toolbar-secondary .spinner {
position: absolute;
top: 2px;
right: 0px;
}
.media-toolbar-primary > .media-button,
.media-toolbar-primary > .media-button-group {
margin-left: 10px;
@ -751,7 +740,6 @@
margin-top: 11px;
margin-right: 2%;
max-width: 47%;
width: 100%; /* prevents options from invisibly taking up horizontal space */
}
/**
@ -2376,7 +2364,7 @@
}
.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 */

File diff suppressed because one or more lines are too long

View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31615';
$wp_version = '4.2-alpha-31616';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.