Merge branch 'helper-updates' of github.com:woocommerce/woocommerce into helper-updates

This commit is contained in:
Konstantin Kovshenin 2017-08-30 17:12:36 +03:00
commit a9619da513
4 changed files with 826 additions and 40 deletions

File diff suppressed because one or more lines are too long

View File

@ -30,6 +30,20 @@ $color_button_secondary: $woo_pink2;
.nav-tab-wrapper {
margin-bottom: 22px;
}
.update-count {
background-color: #d54e21;
border-radius: 10px;
color: #fff;
display: inline-block;
font-size: 9px;
font-weight: 600;
line-height: 17px;
margin: 1px 0 0 2px;
padding: 0 6px;
vertical-align: text-top;
}
@media only screen and (max-width : 784px) {
.nav-tab {
max-width: 40%;
@ -88,24 +102,17 @@ $color_button_secondary: $woo_pink2;
line-height: 1;
padding: 0;
position: absolute;
top: 12px;
right: 12px;
top: 10px;
right: 14px;
}
}
span {
font-weight: bold;
padding-right: 4px;
}
a {
li {
color: #0073AA;
display: inline-block;
padding: 0 4px 0 8px;
position: relative;
text-decoration: none;
&:before {
&::before {
background-color: #979797;
content: " ";
position: absolute;
@ -114,21 +121,50 @@ $color_button_secondary: $woo_pink2;
bottom: 0;
width: 1px;
}
&:first-of-type {
&::before {
display: none;
}
}
}
a{
color: #0073AA;
text-decoration: none;
&.current{
color: #000;
font-weight: 600;
}
}
.count{
color: #555d66;
font-weight: 400;
}
@media only screen and (max-width : 600px) {
background-color: #fff;
border: 1px solid #E1E1E1;
border-radius: 2px;
border-radius: 4px;
font-size: 14px;
label,
span,
a {
border-bottom: 1px solid #E1E1E1;
line-height: 2;
li {
line-height: 21px;
padding: 8px 16px;
margin: 0;
&:last-child {
border-bottom: none;
}
}
span,
li {
border-bottom: 1px solid #E1E1E1;
}
label,
@ -137,26 +173,36 @@ $color_button_secondary: $woo_pink2;
}
span,
a {
li{
display: none;
}
a {
cursor: pointer;
li{
&::before {
display: none;
}
}
a {
cursor: pointer;
}
span.chevron {
transform: rotateX(0deg);
color: #555555;
opacity: 0.5;
transform: rotateX(180deg);
}
&:focus,
&:hover {
box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
label{
border-bottom: 1px solid #E1E1E1;
}
span,
a {
li{
display: block;
}
@ -447,7 +493,7 @@ $color_button_secondary: $woo_pink2;
.wp-list-table__ext-title {
color: $color_text_blue;
font-size: 18px;
font-weight: 784;
font-weight: 600;
width: 60%;
@media only screen and (max-width : 782px) {
@ -472,7 +518,7 @@ $color_button_secondary: $woo_pink2;
.wp-list-table__ext-status {
position: relative;
&.update-available:after {
&.update-available::after {
background-color: #FFC322;
content: " ";
position: absolute;
@ -482,7 +528,7 @@ $color_button_secondary: $woo_pink2;
width: 5px;
}
&.expired:after {
&.expired::after {
background-color: #B81C23;
content: " ";
position: absolute;
@ -532,7 +578,7 @@ $color_button_secondary: $woo_pink2;
td {
position: relative;
&:before {
&::before {
background-color: #E1E1E1;
content: " ";
height: 1px;
@ -545,13 +591,13 @@ $color_button_secondary: $woo_pink2;
td.wp-list-table__ext-status,
td.wp-list-table__licence-container {
&:before {
&::before {
left: 22px !important;
width: auto !important;
}
}
td.wp-list-table__ext-actions:before {
td.wp-list-table__ext-actions::before {
right: 22px;
}
@ -896,8 +942,8 @@ $color_button_secondary: $woo_pink2;
transition: all .4s ease, box-shadow 0s;
vertical-align: middle;
&:before,
&:after {
&::before,
&::after {
content: "";
display: block;
position: relative;
@ -905,14 +951,14 @@ $color_button_secondary: $woo_pink2;
height: 20px;
}
&:after {
&::after {
border-radius: 50%;
background: $white;
left: 0;
transition: all .2s ease;
}
&:before {
&::before {
display: none;
}
@ -967,7 +1013,7 @@ $color_button_secondary: $woo_pink2;
+ .form-toggle__label .form-toggle__switch {
background: $woo_pink1;
&:after {
&::after {
left: 8px;
}
}
@ -1002,15 +1048,15 @@ $color_button_secondary: $woo_pink2;
width: 24px;
height: 16px;
&:before,
&:after {
&::before,
&::after {
height: 12px;
width: 12px;
}
}
&:checked {
+ .form-toggle__label .form-toggle__switch {
&:after {
&::after {
left: 8px;
}
}

View File

@ -12,7 +12,8 @@
<p><?php printf( __( 'Below is a list of extensions available on your WooCommerce.com account. To receive extension updates please make sure the extension is installed, and its subscription activated and connected to your WooCommerce.com account. Extensions can be activated from the <a href="%s">Plugins</a> screen.', 'woocommerce' ), admin_url( 'plugins.php' ) ); ?></p>
</div>
<div class="subsubsub">
<ul class="subscription-filter">
<label><?php _e( 'Sort by:', 'woocommerce' ); ?> <span class="chevron dashicons dashicons-arrow-up-alt2"></span></label>
<?php
$filters = array_keys( WC_Helper::get_filters() );
$last_filter = array_pop( $filters );
@ -22,10 +23,9 @@
<?php foreach ( WC_Helper::get_filters() as $key => $label ) : ?>
<li>
<a <?php echo $current_filter === $key ? 'class="current"' : ''; ?> href="<?php echo esc_url( admin_url( 'admin.php?page=wc-addons&section=helper&filter=' . $key ) ); ?>"><?php echo esc_html( $label ); ?></a>
<?php echo $key !== $last_filter ? '|' : ''; ?>
</li>
<?php endforeach; ?>
</div>
</ul>
<table class="wp-list-table widefat fixed striped">
<?php if ( ! empty( $subscriptions ) ) : ?>

View File

@ -5,7 +5,7 @@
<?php
$count = WC_Helper_Updater::get_updates_count();
$count_html = sprintf( '<span class="update-plugins count-%d"><span class="update-count">(%d)</span></span>', $count, number_format_i18n( $count ) );
$count_html = sprintf( '<span class="update-plugins count-%d"><span class="update-count">%d</span></span>', $count, number_format_i18n( $count ) );
if ( ! $count ) {
$count_html = '';
}