Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-31 13:37:51 +01:00
Code Issues Projects Releases Wiki Activity

Help/About: unify tab styling.

Browse Source 
Props afercia.
Fixes #34214.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35580 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-11-11 21:54:26 +00:00
parent 27e4384e89
commit b4daf516ec
9 changed files with 85 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/credits.php
View File

@ -25,13 +25,9 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
<h2 class="nav-tab-wrapper">
<a href="about.php" class="nav-tab">
<?php _e( 'What&#8217;s New' ); ?>
</a><a href="credits.php" class="nav-tab nav-tab-active">
<?php _e( 'Credits' ); ?>
</a><a href="freedoms.php" class="nav-tab">
<?php _e( 'Freedoms' ); ?>
</a>
<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
</h2>
<?php

20
wp-admin/css/about-rtl.css
View File

@ -79,17 +79,8 @@
/* Tabs */
.about-wrap h2.nav-tab-wrapper {
padding-right: 6px;
}
.about-wrap h2 .nav-tab {
padding: 4px 15px 6px;
margin: 0 0 -1px 3px;
font-size: 18px;
vertical-align: top;
border-width: 1px;
white-space: nowrap;
}
/* 1.1 - Typography */
@ -429,17 +420,6 @@
width: 100%;
}
.about-wrap h2.nav-tab-wrapper {
padding-right: 0;
border-bottom: 0;
}
.about-wrap h2 .nav-tab {
margin-top: 10px;
margin-left: 10px;
border-bottom: 1px solid #ccc;
}
.about-wrap .feature-section .svg-container {
padding-top: 20px;
padding-bottom: 20px;

20
wp-admin/css/about.css
View File

@ -79,17 +79,8 @@
/* Tabs */
.about-wrap h2.nav-tab-wrapper {
padding-left: 6px;
}
.about-wrap h2 .nav-tab {
padding: 4px 15px 6px;
margin: 0 3px -1px 0;
font-size: 18px;
vertical-align: top;
border-width: 1px;
white-space: nowrap;
}
/* 1.1 - Typography */
@ -429,17 +420,6 @@
width: 100%;
}
.about-wrap h2.nav-tab-wrapper {
padding-left: 0;
border-bottom: 0;
}
.about-wrap h2 .nav-tab {
margin-top: 10px;
margin-right: 10px;
border-bottom: 1px solid #ccc;
}
.about-wrap .feature-section .svg-container {
padding-top: 20px;
padding-bottom: 20px;

54
wp-admin/css/common-rtl.css
View File

@ -1997,20 +1997,25 @@ html.wp-toolbar {
------------------------------------------------------------------------------*/
.nav-tab {
display: inline-block;
border: 1px solid #ccc;
border-bottom: none;
margin: 0 0 0 5px;
padding: 6px 10px;
font-size: 15px;
line-height: 24px;
font-weight: 600;
background: #e4e4e4;
color: #555;
text-decoration: none;
white-space: nowrap;
}
.nav-tab,
h3 .nav-tab, /* Back-compat for pre-4.4 */
.nav-tab-small .nav-tab {
display: inline-block;
margin: -4px 0 -1px 4px;
padding: 5px 14px;
font-size: 12px;
line-height: 16px;
text-decoration: none;
}
.nav-tab:hover,
@ -2019,35 +2024,35 @@ html.wp-toolbar {
color: #464646;
}
.nav-tab-active,
.nav-tab:focus:active {
-webkit-box-shadow: none;
box-shadow: none;
}
.nav-tab-active {
margin-bottom: -1px;
color: #464646;
}
.nav-tab-active,
.nav-tab-active:hover,
.nav-tab-active:focus {
.nav-tab-active:focus,
.nav-tab-active:focus:active {
border-bottom: 1px solid #f1f1f1;
background: #f1f1f1;
color: #000;
}
/* @todo: consider to use flexbox to reset white space between inline-block elements. */
h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
.wrap h2.nav-tab-wrapper, /* higher specificity to override .wrap > h2:first-child */
h3.nav-tab-wrapper {
border-bottom: 1px solid #ccc;
margin: 0;
padding: 9px 10px 0 15px;
font-size: 23px;
font-weight: 400;
line-height: 29px;
}
h1 .nav-tab, /* Back-compat for pre-4.4 */
h2 .nav-tab {
padding: 6px 10px;
font-weight: 600;
font-size: 15px;
line-height: 24px;
padding: 9px 6px 0 15px;
font-size: 1px; /* normalize white space between inline-block elements */
line-height: inherit;
}
@ -3597,6 +3602,21 @@ img {
div#post-body.metabox-holder.columns-1 {
overflow-x: hidden;
}
h1.nav-tab-wrapper,
.wrap h2.nav-tab-wrapper,
h3.nav-tab-wrapper {
padding-right: 0;
border-bottom: 0;
}
h1 .nav-tab,
h2 .nav-tab,
h3 .nav-tab {
margin-top: 10px;
margin-left: 10px;
border-bottom: 1px solid #ccc;
}
}
@media screen and (max-width: 320px) {

54
wp-admin/css/common.css
View File

@ -1997,20 +1997,25 @@ html.wp-toolbar {
------------------------------------------------------------------------------*/
.nav-tab {
display: inline-block;
border: 1px solid #ccc;
border-bottom: none;
margin: 0 5px 0 0;
padding: 6px 10px;
font-size: 15px;
line-height: 24px;
font-weight: 600;
background: #e4e4e4;
color: #555;
text-decoration: none;
white-space: nowrap;
}
.nav-tab,
h3 .nav-tab, /* Back-compat for pre-4.4 */
.nav-tab-small .nav-tab {
display: inline-block;
margin: -4px 4px -1px 0;
padding: 5px 14px;
font-size: 12px;
line-height: 16px;
text-decoration: none;
}
.nav-tab:hover,
@ -2019,35 +2024,35 @@ html.wp-toolbar {
color: #464646;
}
.nav-tab-active,
.nav-tab:focus:active {
-webkit-box-shadow: none;
box-shadow: none;
}
.nav-tab-active {
margin-bottom: -1px;
color: #464646;
}
.nav-tab-active,
.nav-tab-active:hover,
.nav-tab-active:focus {
.nav-tab-active:focus,
.nav-tab-active:focus:active {
border-bottom: 1px solid #f1f1f1;
background: #f1f1f1;
color: #000;
}
/* @todo: consider to use flexbox to reset white space between inline-block elements. */
h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
.wrap h2.nav-tab-wrapper, /* higher specificity to override .wrap > h2:first-child */
h3.nav-tab-wrapper {
border-bottom: 1px solid #ccc;
margin: 0;
padding: 9px 15px 0 10px;
font-size: 23px;
font-weight: 400;
line-height: 29px;
}
h1 .nav-tab, /* Back-compat for pre-4.4 */
h2 .nav-tab {
padding: 6px 10px;
font-weight: 600;
font-size: 15px;
line-height: 24px;
padding: 9px 15px 0 6px;
font-size: 1px; /* normalize white space between inline-block elements */
line-height: inherit;
}
@ -3597,6 +3602,21 @@ img {
div#post-body.metabox-holder.columns-1 {
overflow-x: hidden;
}
h1.nav-tab-wrapper,
.wrap h2.nav-tab-wrapper,
h3.nav-tab-wrapper {
padding-left: 0;
border-bottom: 0;
}
h1 .nav-tab,
h2 .nav-tab,
h3 .nav-tab {
margin-top: 10px;
margin-right: 10px;
border-bottom: 1px solid #ccc;
}
}
@media screen and (max-width: 320px) {

4
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
wp-admin/freedoms.php
View File

@ -24,13 +24,9 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
<h2 class="nav-tab-wrapper">
<a href="about.php" class="nav-tab">
<?php _e( 'What&#8217;s New' ); ?>
</a><a href="credits.php" class="nav-tab">
<?php _e( 'Credits' ); ?>
</a><a href="freedoms.php" class="nav-tab nav-tab-active">
<?php _e( 'Freedoms' ); ?>
</a>
<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab nav-tab-active"><?php _e( 'Freedoms' ); ?></a>
</h2>
<p class="about-description"><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' ); ?></p>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-beta3-35615';
$wp_version = '4.4-beta3-35616';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.