<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29474] trunk/src/wp-admin: Plugin details modal:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29474">29474</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-08-12 23:01:38 +0000 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Plugin details modal:
* Scroll all content, rather than the dual-pane scrolling awkwardness.
* Better align the header image and title overlay with the display on WordPress.org, at least at full-width.
* Move the close button outside of the modal itself, rather than overlay on top of colors we can't predict.
props stephdau, tellyworth, helen. fixes <a href="http://core.trac.wordpress.org/ticket/27440">#27440</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminjsplugininstalljs">trunk/src/wp-admin/js/plugin-install.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/common.css (29473 => 29474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/common.css 2014-08-12 21:57:43 UTC (rev 29473)
+++ trunk/src/wp-admin/css/common.css 2014-08-12 23:01:38 UTC (rev 29474)
</span><span class="lines">@@ -2126,19 +2126,26 @@
</span><span class="cx">
</span><span class="cx"> /* Plugin install thickbox */
</span><span class="cx"> #plugin-information {
</span><del>- background: #fcfcfc;
</del><ins>+ background: #fff;
</ins><span class="cx"> position: fixed;
</span><span class="cx"> top: 0;
</span><span class="cx"> right: 0;
</span><span class="cx"> bottom: 0;
</span><span class="cx"> left: 0;
</span><del>- height: auto;
</del><ins>+ height: 100%;
</ins><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#plugin-information-scrollable {
+ display: block;
+ overflow: auto;
+ height: 100%;
+ padding-bottom: 58px;
+}
+
</ins><span class="cx"> #plugin-information-title {
</span><del>- margin-right: 56px; /* avoid collisions with the close icon */
</del><span class="cx"> padding: 0 20px;
</span><ins>+ background: #f5f5f5;
</ins><span class="cx"> font-size: 22px;
</span><span class="cx"> font-weight: 600;
</span><span class="cx"> line-height: 56px;
</span><span class="lines">@@ -2167,15 +2174,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #plugin-information-title.with-banner h2 {
</span><ins>+ display: inline-block;
</ins><span class="cx"> font-size: 30px;
</span><span class="cx"> line-height: 50px;
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> max-width: 760px;
</span><del>- position: absolute;
- left: 20px;
- top: 145px;
</del><span class="cx"> padding: 0 15px;
</span><del>- margin: 0;
</del><ins>+ margin: 174px 0 0 10px;
</ins><span class="cx"> color: #fff;
</span><span class="cx"> background: rgba( 30, 30, 30, 0.9 );
</span><span class="cx"> text-shadow: 0 1px 3px rgba( 0, 0, 0, 0.4 );
</span><span class="lines">@@ -2191,8 +2196,9 @@
</span><span class="cx">
</span><span class="cx"> #plugin-information-title.with-banner div.vignette {
</span><span class="cx"> display: block;
</span><ins>+ float: right;
</ins><span class="cx"> top: 0;
</span><del>- height: 215px;
</del><ins>+ height: 250px;
</ins><span class="cx"> width: 830px;
</span><span class="cx"> margin: 0 -20px;
</span><span class="cx"> background: transparent;
</span><span class="lines">@@ -2202,19 +2208,15 @@
</span><span class="cx">
</span><span class="cx"> #plugin-information-tabs {
</span><span class="cx"> padding: 0 16px;
</span><del>- position: absolute;
- top: 56px;
</del><ins>+ position: relative;
</ins><span class="cx"> right: 0;
</span><span class="cx"> left: 0;
</span><span class="cx"> height: 36px;
</span><span class="cx"> z-index: 1;
</span><ins>+ border-bottom: 1px solid #ddd;
+ background: #f3f3f3;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#plugin-information-tabs.with-banner {
- top: 214px;
- background: rgba( 255, 255, 255, 0.85 );
-}
-
</del><span class="cx"> #plugin-information-tabs a {
</span><span class="cx"> position: relative;
</span><span class="cx"> float: left;
</span><span class="lines">@@ -2232,7 +2234,7 @@
</span><span class="cx"> margin: 0 -1px 0;
</span><span class="cx"> background: #fff;
</span><span class="cx"> border: 1px solid #ddd;
</span><del>- border-bottom: none;
</del><ins>+ border-bottom-color: #fff;
</ins><span class="cx"> padding-top: 8px;
</span><span class="cx"> color: #333;
</span><span class="cx"> }
</span><span class="lines">@@ -2248,31 +2250,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #plugin-information-content {
</span><ins>+ overflow: hidden; /* equal height column trick */
</ins><span class="cx"> background: #fff;
</span><del>- border-top: 1px solid #ddd;
- border-bottom: 1px solid #ddd;
- position: absolute;
- top: 91px;
</del><ins>+ position: relative;
+ top: 0;
</ins><span class="cx"> right: 0;
</span><del>- bottom: 58px;
</del><span class="cx"> left: 0;
</span><del>- overflow: auto;
</del><ins>+ min-height: 100%;
+ min-height: calc( 100% - 346px );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#plugin-information-content.with-banner {
- border-top: none;
- top: 250px;
-}
-
</del><span class="cx"> #section-holder {
</span><del>- margin: 0;
- padding: 10px 26px;
- position: absolute;
</del><ins>+ position: relative;
</ins><span class="cx"> top: 0;
</span><span class="cx"> right: 250px;
</span><span class="cx"> bottom: 0;
</span><span class="cx"> left: 0;
</span><del>- overflow: auto;
</del><ins>+ margin-right: 250px; /* FYI box */
+ padding: 10px 26px;
+ margin-bottom: -99930px; /* a bit less than the padding below to accommodate footer */
+ padding-bottom: 99999px; /* equal height column trick */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #section-holder .updated {
</span><span class="lines">@@ -2281,16 +2278,17 @@
</span><span class="cx">
</span><span class="cx"> #plugin-information .fyi {
</span><span class="cx"> display: block;
</span><del>- background: #f3f3f3;
- border-left: 1px solid #ddd;
- color: #666;
- padding: 16px;
- position: absolute;
</del><ins>+ float: right;
+ position: relative;
</ins><span class="cx"> top: 0;
</span><span class="cx"> right: 0;
</span><del>- bottom: 0;
</del><ins>+ padding: 16px;
+ margin-bottom: -99930px; /* slightly less than the padding below to accommodate footer */
+ padding-bottom: 99999px; /* equal height column trick */
</ins><span class="cx"> width: 217px;
</span><del>- overflow: auto;
</del><ins>+ border-left: 1px solid #ddd;
+ background: #f3f3f3;
+ color: #666;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #plugin-information .fyi strong {
</span><span class="lines">@@ -2375,6 +2373,8 @@
</span><span class="cx"> bottom: 0;
</span><span class="cx"> left: 0;
</span><span class="cx"> height: 28px;
</span><ins>+ border-top: 1px solid #ddd;
+ background: #f3f3f3;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #plugin-information .section ul,
</span><span class="lines">@@ -2389,6 +2389,10 @@
</span><span class="cx"> line-height: 1.7;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#plugin-information .section h4:first-of-type {
+ margin-top: 1em;
+}
+
</ins><span class="cx"> #plugin-information #section-screenshots ol {
</span><span class="cx"> list-style: none;
</span><span class="cx"> margin: 0;
</span><span class="lines">@@ -2419,47 +2423,50 @@
</span><span class="cx"> font-size: 13px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media screen and ( max-width: 771px ), screen and ( max-height: 500px ) {
</del><ins>+@media screen and ( max-height: 500px ) {
</ins><span class="cx"> #plugin-information-title.with-banner {
</span><span class="cx"> height: 100px;
</span><span class="cx"> bottom: 100px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #plugin-information-title.with-banner h2 {
</span><del>- top: 12px;
</del><ins>+ margin-top: 30px;
</ins><span class="cx"> font-size: 20px;
</span><span class="cx"> line-height: 40px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #plugin-information-title.with-banner div.vignette {
</span><del>- height: 65px;
- bottom: 65px;
</del><ins>+ height: 100px;
+ bottom: 100px;
</ins><span class="cx"> width: 800%;
</span><span class="cx"> }
</span><del>-
- #plugin-information-tabs.with-banner {
- top: 63px;
- }
-
- #plugin-information-content.with-banner {
- top: 99px;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @media screen and ( max-width: 771px ) {
</span><span class="cx"> #plugin-information-tabs {
</span><ins>+ overflow: hidden; /* clearfix */
</ins><span class="cx"> padding: 0;
</span><ins>+ height: auto; /* let tabs wrap */
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ #plugin-information-tabs a.current {
+ margin-bottom: 0;
+ border-bottom: none;
+ }
+
</ins><span class="cx"> #plugin-information .fyi {
</span><ins>+ float: none;
</ins><span class="cx"> border: 1px solid #ddd;
</span><span class="cx"> position: static;
</span><span class="cx"> width: auto;
</span><del>- margin: 26px 26px 16px;
</del><ins>+ margin: 26px 26px 0;
+ padding-bottom: 0; /* reset from the two column height fix */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #section-holder {
</span><span class="cx"> position: static;
</span><ins>+ margin: 0;
+ padding-bottom: 70px; /* reset from the two column height fix, plus accomodate footer */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #plugin-information .fyi h3,
</span><span class="lines">@@ -2520,11 +2527,8 @@
</span><span class="cx"> body.plugins-php .tb-close-icon,
</span><span class="cx"> body.update-core-php .tb-close-icon,
</span><span class="cx"> body.index-php .tb-close-icon {
</span><del>- background: rgba( 255, 255, 255, .5);
- color: #444;
- line-height: 48px;
- width: 48px;
- height: 48px;
</del><ins>+ right: -30px;
+ color: #eee;
</ins><span class="cx"> -webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
</span><span class="cx"> transition: color .1s ease-in-out, background .1s ease-in-out;
</span><span class="cx"> }
</span><span class="lines">@@ -2539,8 +2543,7 @@
</span><span class="cx"> body.update-core-php .tb-close-icon:hover,
</span><span class="cx"> body.index-php .tb-close-icon:focus,
</span><span class="cx"> body.index-php .tb-close-icon:hover {
</span><del>- background: #0074a2;
- color: #fff;
</del><ins>+ color: #2ea2cc;
</ins><span class="cx"> outline: none;
</span><span class="cx"> -webkit-box-shadow: none;
</span><span class="cx"> box-shadow: none;
</span><span class="lines">@@ -2551,9 +2554,22 @@
</span><span class="cx"> body.plugins-php .tb-close-icon:before,
</span><span class="cx"> body.update-core-php .tb-close-icon:before,
</span><span class="cx"> body.index-php .tb-close-icon:before {
</span><del>- line-height: 48px;
</del><ins>+ content: "\f335";
+ font-size: 32px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/* move plugin install close icon to top on narrow screens */
+@media screen and ( max-width: 830px ) {
+ body.plugin-install-php .tb-close-icon,
+ body.import-php .tb-close-icon,
+ body.plugins-php .tb-close-icon,
+ body.update-core-php .tb-close-icon,
+ body.index-php .tb-close-icon {
+ right: 0;
+ top: -30px;
+ }
+}
+
</ins><span class="cx"> /* @todo: move this. */
</span><span class="cx"> img {
</span><span class="cx"> border: none;
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/plugin-install.php (29473 => 29474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/plugin-install.php 2014-08-12 21:57:43 UTC (rev 29473)
+++ trunk/src/wp-admin/includes/plugin-install.php 2014-08-12 23:01:38 UTC (rev 29474)
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> iframe_header( __( 'Plugin Install' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $_with_banner = '';
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $api->banners ) && ( ! empty( $api->banners['low'] ) || ! empty( $api->banners['high'] ) ) ) {
</span><span class="lines">@@ -393,6 +393,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ echo '<div id="plugin-information-scrollable">';
</ins><span class="cx"> echo "<div id='{$_tab}-title' class='{$_with_banner}'><div class='vignette'></div><h2>{$api->name}</h2></div>";
</span><span class="cx"> echo "<div id='{$_tab}-tabs' class='{$_with_banner}'>\n";
</span><span class="cx">
</span><span class="lines">@@ -513,6 +514,7 @@
</span><span class="cx"> }
</span><span class="cx"> echo "</div>\n";
</span><span class="cx"> echo "</div>\n";
</span><ins>+ echo "</div>\n"; // #plugin-information-scrollable
</ins><span class="cx"> echo "<div id='$tab-footer'>\n";
</span><span class="cx"> if ( ! empty( $api->download_link ) && ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) ) {
</span><span class="cx"> $status = install_plugin_install_status( $api );
</span></span></pre></div>
<a id="trunksrcwpadminjsplugininstalljs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/plugin-install.js (29473 => 29474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/plugin-install.js 2014-08-12 21:57:43 UTC (rev 29473)
+++ trunk/src/wp-admin/js/plugin-install.js 2014-08-12 23:01:38 UTC (rev 29474)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> });
</span><span class="cx"> if ( typeof document.body.style.maxWidth !== 'undefined' ) {
</span><span class="cx"> tbWindow.css({
</span><del>- 'top': ( ( 792 < width ) ? 30 : 10 ) + 'px',
</del><ins>+ 'top': '30px',
</ins><span class="cx"> 'margin-top': '0'
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>