Conflicts
This commit is contained in:
Mike Jolley
commit
ea05881af9
File diff suppressed because one or more lines are too long
|
|
@ -26,14 +26,13 @@
|
|||
padding: 0;
|
||||
vertical-align: top;
|
||||
width: 300px;
|
||||
min-height: 220px;
|
||||
|
||||
a {
|
||||
text-decoration: none;
|
||||
color: inherit;
|
||||
border: 1px solid #ddd;
|
||||
display: block;
|
||||
min-height: 162px;
|
||||
min-height: 220px;
|
||||
overflow: hidden;
|
||||
-webkit-box-shadow:
|
||||
inset 0 1px 0 rgba(255,255,255,0.2),
|
||||
|
|
@ -44,8 +43,8 @@
|
|||
|
||||
img {
|
||||
max-width: 258px;
|
||||
max-height: 30px;
|
||||
padding: 20px;
|
||||
max-height: 24px;
|
||||
padding: 17px 20px;
|
||||
display: block;
|
||||
margin: 0;
|
||||
background: #fff;
|
||||
|
|
@ -1416,6 +1415,9 @@ table.wp-list-table {
|
|||
img {
|
||||
margin: 1px 2px;
|
||||
}
|
||||
.row-actions {
|
||||
color: #999;
|
||||
}
|
||||
td.column-thumb img {
|
||||
margin: 0;
|
||||
vertical-align: middle;
|
||||
|
|
@ -2142,7 +2144,7 @@ img.help_tip {
|
|||
vertical-align: middle;
|
||||
}
|
||||
}
|
||||
.handlediv {
|
||||
> .handlediv {
|
||||
margin-top:4px;
|
||||
}
|
||||
}
|
||||
|
|
@ -2577,8 +2579,8 @@ img.help_tip {
|
|||
border-style:dashed;
|
||||
}
|
||||
.wc-metabox {
|
||||
background: #ececec;
|
||||
border: 1px solid #ececec;
|
||||
background: #fff;
|
||||
border: 1px solid #dfdfdf;
|
||||
margin: 9px 0 !important;
|
||||
-moz-border-radius-topleft: 3px;
|
||||
-moz-border-radius-topright: 3px;
|
||||
|
|
@ -2586,10 +2588,23 @@ img.help_tip {
|
|||
-webkit-border-top-right-radius: 3px;
|
||||
border-top-left-radius: 3px;
|
||||
border-top-right-radius: 3px;
|
||||
.handlediv {
|
||||
&:before {
|
||||
line-height: .5 !important;
|
||||
}
|
||||
}
|
||||
&.closed {
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
h3 {
|
||||
border:0;
|
||||
}
|
||||
.handlediv {
|
||||
&:before {
|
||||
content: '\f140' !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
h3 {
|
||||
margin: 0 !important;
|
||||
|
|
@ -2654,10 +2669,10 @@ img.help_tip {
|
|||
width: 200px;
|
||||
}
|
||||
input.checkbox {
|
||||
width: auto;
|
||||
width: 16px;
|
||||
min-width: inherit;
|
||||
vertical-align: middle;
|
||||
display: inline;
|
||||
vertical-align: text-bottom;
|
||||
display: inline-block;
|
||||
float: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -2697,7 +2712,8 @@ img.help_tip {
|
|||
#variable_product_options {
|
||||
.woocommerce_variation {
|
||||
table {
|
||||
background: #f5f5f5;
|
||||
background: #fafafa;
|
||||
border-top:1px solid #eee;
|
||||
padding: 6px;
|
||||
td {
|
||||
input {
|
||||
|
|
@ -2756,8 +2772,8 @@ img.help_tip {
|
|||
top: 34px;
|
||||
left: 0;
|
||||
margin: 0 0 0 -1px;
|
||||
border: 6px solid #f5f5f5;
|
||||
border-color: transparent transparent transparent #f5f5f5;
|
||||
border: 6px solid #fafafa;
|
||||
border-color: transparent transparent transparent #fafafa;
|
||||
}
|
||||
}
|
||||
&.upload_image {
|
||||
|
|
|
|||
|
|
@ -1 +1,125 @@
|
|||
@font-face{font-family:'WooCommerce';src:url('../fonts/WooCommerce.eot');src:url('../fonts/WooCommerce.eot?#iefix') format('embedded-opentype'),url('../fonts/WooCommerce.woff') format('woff'),url('../fonts/WooCommerce.ttf') format('truetype'),url('../fonts/WooCommerce.svg#WooCommerce') format('svg');font-weight:normal;font-style:normal}.mp6 #adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image:before{font-family:'WooCommerce'!important;content:"\e03d";font-size:1.3em!important}.mp6 #adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image:before{font-family:'WooCommerce'!important;content:"\e01d";font-size:1.3em!important}#adminmenu #menu-posts-product div.wp-menu-image,#adminmenu #menu-posts-shop_order div.wp-menu-image,#adminmenu #menu-posts-shop_coupon div.wp-menu-image,#adminmenu #toplevel_page_woocommerce div.wp-menu-image{background-image:url(../images/icons/menu_icons.png);background-size:auto}#adminmenu #menu-posts-product div.wp-menu-image{background-position:-32px -32px}#adminmenu #menu-posts-product.wp-menu-open div.wp-menu-image,#adminmenu #menu-posts-product:hover div.wp-menu-image{background-position:-32px 0}#adminmenu #menu-posts-product img{display:none}#adminmenu #menu-posts-shop_order div.wp-menu-image{background-position:-64px -32px}#adminmenu #menu-posts-shop_order.wp-menu-open div.wp-menu-image,#adminmenu #menu-posts-shop_order:hover div.wp-menu-image{background-position:-64px 0}#adminmenu #menu-posts-shop_order img{display:none}#adminmenu #menu-posts-shop_coupon div.wp-menu-image{background-position:-96px -32px}#adminmenu #menu-posts-shop_coupon.wp-menu-open div.wp-menu-image,#adminmenu #menu-posts-shop_coupon:hover div.wp-menu-image{background-position:-96px 0}#adminmenu #menu-posts-shop_coupon img{display:none}#adminmenu #toplevel_page_woocommerce div.wp-menu-image{background-position:0 -32px}#adminmenu #toplevel_page_woocommerce.wp-menu-open div.wp-menu-image,#adminmenu #toplevel_page_woocommerce:hover div.wp-menu-image{background-position:0 0}#adminmenu #toplevel_page_woocommerce img{display:none}span.mce_woocommerce_shortcodes_button{background-image:url(../images/icons/wc_icon.png)!important;background-repeat:no-repeat!important;background-position:center!important}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#adminmenu #menu-posts-product div.wp-menu-image,#adminmenu #menu-posts-shop_order div.wp-menu-image,#adminmenu #menu-posts-shop_coupon div.wp-menu-image,#adminmenu #toplevel_page_woocommerce div.wp-menu-image{background-image:url(../images/icons/menu_icons-x2.png);background-size:200px 64px}span.mce_woocommerce_shortcodes_button{background-image:url(../images/icons/wc_icon@2x.png)!important;background-size:18px 18px!important}}
|
||||
/* =Mixins
|
||||
-------------------------------------------------------------- */
|
||||
.clear {
|
||||
clear: both;
|
||||
}
|
||||
.nobr {
|
||||
white-space: nowrap;
|
||||
}
|
||||
/**
|
||||
* Objects
|
||||
*/
|
||||
/* Icon Font */
|
||||
@font-face {
|
||||
font-family: 'WooCommerce';
|
||||
src: url('../fonts/WooCommerce.eot');
|
||||
src: url('../fonts/WooCommerce.eot?#iefix') format('embedded-opentype'), url('../fonts/WooCommerce.woff') format('woff'), url('../fonts/WooCommerce.ttf') format('truetype'), url('../fonts/WooCommerce.svg#WooCommerce') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
/* Menu Icons */
|
||||
.mp6 #adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image:before {
|
||||
font-family: 'WooCommerce' !important;
|
||||
content: "\e03d";
|
||||
font-size: 1.3em !important;
|
||||
}
|
||||
.mp6 #adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image:before {
|
||||
font-family: 'WooCommerce' !important;
|
||||
content: "\e01d";
|
||||
font-size: 1.3em !important;
|
||||
}
|
||||
/* Menu */
|
||||
#adminmenu #menu-posts-product div.wp-menu-image,
|
||||
#adminmenu #menu-posts-shop_order div.wp-menu-image,
|
||||
#adminmenu #menu-posts-shop_coupon div.wp-menu-image,
|
||||
#adminmenu #toplevel_page_woocommerce div.wp-menu-image {
|
||||
background-image: url(../images/icons/menu_icons.png);
|
||||
background-size: auto;
|
||||
}
|
||||
#adminmenu #menu-posts-product div.wp-menu-image {
|
||||
background-position: -32px -32px;
|
||||
}
|
||||
#adminmenu #menu-posts-product.wp-menu-open div.wp-menu-image,
|
||||
#adminmenu #menu-posts-product:hover div.wp-menu-image {
|
||||
background-position: -32px 0px;
|
||||
}
|
||||
#adminmenu #menu-posts-product img {
|
||||
display: none;
|
||||
}
|
||||
#adminmenu #menu-posts-shop_order div.wp-menu-image {
|
||||
background-position: -64px -32px;
|
||||
}
|
||||
#adminmenu #menu-posts-shop_order.wp-menu-open div.wp-menu-image,
|
||||
#adminmenu #menu-posts-shop_order:hover div.wp-menu-image {
|
||||
background-position: -64px 0px;
|
||||
}
|
||||
#adminmenu #menu-posts-shop_order img {
|
||||
display: none;
|
||||
}
|
||||
#adminmenu #menu-posts-shop_coupon div.wp-menu-image {
|
||||
background-position: -96px -32px;
|
||||
}
|
||||
#adminmenu #menu-posts-shop_coupon.wp-menu-open div.wp-menu-image,
|
||||
#adminmenu #menu-posts-shop_coupon:hover div.wp-menu-image {
|
||||
background-position: -96px 0px;
|
||||
}
|
||||
#adminmenu #menu-posts-shop_coupon img {
|
||||
display: none;
|
||||
}
|
||||
#adminmenu #toplevel_page_woocommerce div.wp-menu-image {
|
||||
background-position: 0px -32px;
|
||||
}
|
||||
#adminmenu #toplevel_page_woocommerce.wp-menu-open div.wp-menu-image,
|
||||
#adminmenu #toplevel_page_woocommerce:hover div.wp-menu-image {
|
||||
background-position: 0px 0px;
|
||||
}
|
||||
#adminmenu #toplevel_page_woocommerce img {
|
||||
display: none;
|
||||
}
|
||||
/* Editor button */
|
||||
span.mce_woocommerce_shortcodes_button {
|
||||
background-image: url(../images/icons/wc_icon.png) !important;
|
||||
background-repeat: no-repeat !important;
|
||||
background-position: center !important;
|
||||
}
|
||||
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
|
||||
#adminmenu #menu-posts-product div.wp-menu-image,
|
||||
#adminmenu #menu-posts-shop_order div.wp-menu-image,
|
||||
#adminmenu #menu-posts-shop_coupon div.wp-menu-image,
|
||||
#adminmenu #toplevel_page_woocommerce div.wp-menu-image {
|
||||
background-image: url(../images/icons/menu_icons-x2.png);
|
||||
background-size: 200px 64px;
|
||||
}
|
||||
span.mce_woocommerce_shortcodes_button {
|
||||
background-image: url(../images/icons/wc_icon@2x.png) !important;
|
||||
background-size: 18px 18px !important;
|
||||
}
|
||||
}
|
||||
.mp6 span.mce_woocommerce_shortcodes_button {
|
||||
background-image: none !important;
|
||||
display: block;
|
||||
text-indent: -9999px;
|
||||
position: relative;
|
||||
height: 1em;
|
||||
width: 1em;
|
||||
}
|
||||
.mp6 span.mce_woocommerce_shortcodes_button:before {
|
||||
font-family: 'WooCommerce';
|
||||
speak: none;
|
||||
font-weight: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
line-height: 1;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
margin: 0;
|
||||
text-indent: 0;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
text-align: center;
|
||||
content: "\e01d";
|
||||
font-size: .9em;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
/* =Mixins
|
||||
-------------------------------------------------------------- */
|
||||
@import "mixins";
|
||||
|
||||
/* Icon Font */
|
||||
@font-face {
|
||||
font-family: 'WooCommerce';
|
||||
|
|
@ -95,4 +99,13 @@ span.mce_woocommerce_shortcodes_button {
|
|||
background-image: url(../images/icons/wc_icon@2x.png) !important;
|
||||
background-size: 18px 18px !important;
|
||||
}
|
||||
}
|
||||
.mp6 span.mce_woocommerce_shortcodes_button {
|
||||
background-image: none !important;
|
||||
.ir;
|
||||
&:before {
|
||||
.icon( "\e01d" );
|
||||
font-size:.9em;
|
||||
line-height: 1.2;
|
||||
}
|
||||
}
|
||||
|
|
@ -63,6 +63,12 @@ jQuery( function($){
|
|||
});
|
||||
});
|
||||
|
||||
$(function(){
|
||||
jQuery('.wc-metabox > h3').click( function(event){
|
||||
$( this ).parent( '.wc-metabox' ).toggleClass( 'closed' ).toggleClass( 'open' );
|
||||
});
|
||||
});
|
||||
|
||||
// Order emails
|
||||
$('#order-emails a.show-order-emails').click(function () {
|
||||
if ($('#order-emails-select').is(":hidden")) {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue