Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7745 from shivapoudel/box-sizing 

Deprecated Box sizing Errors
This commit is contained in:
James Koster 2015-03-18 10:06:25 +00:00
parent 9b26bafa78 f79e2488b4
commit e5b4cf8c83
18 changed files with 55 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
assets/css/_animation.scss
View File

@ -1,18 +1,9 @@
@-moz-keyframes spin {
/**
* _animation.scss
* Custom WooCommerce Animations.
*/
@include keyframes( spin ) {
100% {
-moz-transform: rotate(360deg);
@include transform( rotate(360deg) );
}
}
@-webkit-keyframes spin {
100% {
-webkit-transform: rotate(360deg);
}
}
@keyframes spin {
100% {
-webkit-transform: rotate(360deg);
transform:rotate(360deg);
}
}

22
assets/css/_mixins.scss
View File

@ -127,11 +127,11 @@
}
@mixin darkorlighttextshadow($a, $opacity: .8) {
@if lightness($a) >= 65% {
@include text_shadow(0, -1px, 0, rgba(0, 0, 0, $opacity));
} @else {
@include text_shadow(0, 1px, 0, rgba(255, 255, 255, $opacity));
}
@if lightness($a) >= 65% {
@include text_shadow(0, -1px, 0, rgba(0, 0, 0, $opacity));
} @else {
@include text_shadow(0, 1px, 0, rgba(255, 255, 255, $opacity));
}
}
/**
@ -228,14 +228,14 @@
margin-top: -.5em;
display: block;
-webkit-animation: spin 1s ease-in-out infinite;
-moz-animation: spin 1s ease-in-out infinite;
animation: spin 1s ease-in-out infinite;
content: "";
background: url(../images/icons/loader.svg) center center;
background-size: cover;
-moz-animation: spin 1s ease-in-out infinite;
animation: spin 1s ease-in-out infinite;
content: "";
background: url(../images/icons/loader.svg) center center;
background-size: cover;
line-height: 1;
text-align: center;
font-size: 2em;
color: rgba(#000,0.75);
}
}
}

2
assets/css/admin.css
View File

File diff suppressed because one or more lines are too long

28
assets/css/admin.scss
View File

@ -306,7 +306,7 @@ table.wc_status_table {
}
.text {
@include box-sizing(border-box);
box-sizing: border-box;
width: 99%;
float: left;
margin: 1px 1% 1px 1px;
@ -345,7 +345,7 @@ table.wc_status_table {
.weight,
.stock,
.length {
@include box-sizing(border-box);
box-sizing: border-box;
width: 100%;
margin-left: 4.4em;
}
@ -353,7 +353,7 @@ table.wc_status_table {
.length,
.width,
.height {
@include box-sizing(border-box);
box-sizing: border-box;
width: 25%;
}
}
@ -674,13 +674,13 @@ ul.wc_coupon_list_block {
.button {
width: 24px;
@include box-sizing(border-box);
box-sizing: border-box;
float: right;
}
select {
width: 225px;
@include box-sizing(border-box);
box-sizing: border-box;
float: left;
}
}
@ -780,7 +780,7 @@ ul.wc_coupon_list_block {
font-size: 1em !important;
width: 10em;
margin: 0 0 0 .5em;
@include box-sizing(border-box);
box-sizing: border-box;
input[type="text"] {
width: 96%;
@ -958,7 +958,7 @@ ul.wc_coupon_list_block {
input {
width: 100%;
@include box-sizing(border-box);
box-sizing: border-box;
border: 0;
box-shadow: none;
margin: 0;
@ -1248,7 +1248,7 @@ ul.wc_coupon_list_block {
ul.order_actions {
li {
padding: 6px 10px;
@include box-sizing(border-box);
box-sizing: border-box;
&:last-child {
border-bottom: 0;
@ -2121,7 +2121,7 @@ img.help_tip {
width: 100%;
margin: 0;
font-family: monospace;
@include box-sizing(border-box);
box-sizing: border-box;
}
.iris-picker {
@ -2225,7 +2225,7 @@ img.help_tip {
background: #f7f7f7;
@include border-radius(2px);
position: relative;
@include box-sizing(border-box);
box-sizing: border-box;
img {
width: 100%;
@ -2431,7 +2431,7 @@ img.help_tip {
padding: 0 0 10px;
background-color: #fafafa;
border-right: 1px solid #eee;
@include box-sizing(border-box);
box-sizing: border-box;
&:after {
content: "";
@ -2702,7 +2702,7 @@ img.help_tip {
}
.woocommerce_options_panel {
@include box-sizing(border-box);
box-sizing: border-box;
.downloadable_files {
padding: 0 9px 0 162px;
@ -3670,7 +3670,7 @@ img.ui-datepicker-trigger {
padding: 6px 0 0 0;
border-top: 4px solid #999;
text-align: center;
@include box-sizing(border-box);
box-sizing: border-box;
width: 50%;
}
}
@ -4036,7 +4036,7 @@ table.bar_chart {
*/
.wc-backbone-modal {
* {
@include box-sizing(content-box);
box-sizing: content-box;
}
.wc-backbone-modal-content {

2
assets/css/chosen.css
View File

File diff suppressed because one or more lines are too long

2
assets/css/dashboard.css
View File

@ -1 +1 @@
@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@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:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;float:left;font-size:.8em;border-left:1px solid #fff;border-right:1px solid #ececec;text-align:center;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-left:0}ul.woocommerce_stats li:last-child{border-right:0}ul.woocommerce_stats strong{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:left;padding:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;-webkit-transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:right;position:absolute;right:0;top:50%;margin-right:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover:before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0 12px 12px 0;text-indent:0;top:0;left:0;height:100%;text-align:center;content:"";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:left}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a:before{content:"\e01f"}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a:before{content:"\e006"}#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.processing-orders a:before{content:"\e011";color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a:before{content:"\e033";color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a:before{content:"\e02c";color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a:before{content:"\e02c";color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:left;margin:0 10px 5px 0}#woocommerce_dashboard_recent_reviews .star-rating{float:right;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-left:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating:before{content:"\e021\e021\e021\e021\e021";color:#b3b3b3;float:left;top:0;left:0;position:absolute;letter-spacing:.1em}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span:before{content:"\e020\e020\e020\e020\e020";top:0;position:absolute;left:0;letter-spacing:.1em;color:#9c5d90}#dash-right-now li.product-count a:before{font-family:WooCommerce;content:"\e01d"}
@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix)format("embedded-opentype"),url(../fonts/star.woff)format("woff"),url(../fonts/star.ttf)format("truetype"),url(../fonts/star.svg#star)format("svg");font-weight:400;font-style:normal}@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:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;float:left;font-size:.8em;border-left:1px solid #fff;border-right:1px solid #ececec;text-align:center;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-left:0}ul.woocommerce_stats li:last-child{border-right:0}#woocommerce_dashboard_status .wc_status_list li.low-in-stock,#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-right:1px solid #ececec}ul.woocommerce_stats strong{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:left;padding:0;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;-webkit-transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:right;position:absolute;right:0;top:50%;margin-right:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover:before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0 12px 12px 0;text-indent:0;top:0;left:0;height:100%;text-align:center;content:"";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:left}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month,#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a:before{content:"\e01f"}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a:before{content:"\e006"}#woocommerce_dashboard_status .wc_status_list li.processing-orders a:before{content:"\e011";color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a:before{content:"\e033";color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a:before{content:"\e02c";color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a:before{content:"\e02c";color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:left;margin:0 10px 5px 0}#woocommerce_dashboard_recent_reviews .star-rating{float:right;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-left:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating:before{content:"\e021\e021\e021\e021\e021";color:#b3b3b3;float:left;top:0;left:0;position:absolute;letter-spacing:.1em}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span:before{content:"\e020\e020\e020\e020\e020";top:0;position:absolute;left:0;letter-spacing:.1em;color:#9c5d90}#dash-right-now li.product-count a:before{font-family:WooCommerce;content:"\e01d"}

4
assets/css/dashboard.scss
View File

@ -27,7 +27,7 @@ ul.woocommerce_stats {
border-left: 1px solid #fff;
border-right: 1px solid #ececec;
text-align: center;
@include box-sizing(border-box);
box-sizing: border-box;
}
li:first-child {
@ -62,7 +62,7 @@ ul.woocommerce_stats {
width: 50%;
float: left;
padding: 0;
@include box-sizing(border-box);
box-sizing: border-box;
margin: 0;
border-top: 1px solid #ececec;
color: #aaa;

2
assets/css/menu.css
View File

@ -1 +1 @@
@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@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:400;font-style:normal}#adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e03d";font-size:1.3em!important}#adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e01d";font-size:1.3em!important}#adminmenu #toplevel_page_wc-reports .menu-icon-generic div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e023";font-size:1.3em!important}span.mce_woocommerce_shortcodes_button{background-image:none!important;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}span.mce_woocommerce_shortcodes_button:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-size:.9em;line-height:1.2}.wc_plugin_upgrade_notice{font-weight:400;color:#fff;background:#d54d21;padding:1em;margin:9px 0}.wc_plugin_upgrade_notice a{color:#fff;text-decoration:underline}.wc_plugin_upgrade_notice:before{content:"\f348";display:inline-block;font:400 18px/1 dashicons;speak:none;margin:0 8px 0 -2px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}
@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix)format("embedded-opentype"),url(../fonts/star.woff)format("woff"),url(../fonts/star.ttf)format("truetype"),url(../fonts/star.svg#star)format("svg");font-weight:400;font-style:normal}@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:400;font-style:normal}#adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e03d";font-size:1.3em!important}#adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e01d";font-size:1.3em!important}#adminmenu #toplevel_page_wc-reports .menu-icon-generic div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e023";font-size:1.3em!important}span.mce_woocommerce_shortcodes_button{background-image:none!important;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}span.mce_woocommerce_shortcodes_button:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-size:.9em;line-height:1.2}.wc_plugin_upgrade_notice{font-weight:400;color:#fff;background:#d54d21;padding:1em;margin:9px 0}.wc_plugin_upgrade_notice a{color:#fff;text-decoration:underline}.wc_plugin_upgrade_notice:before{content:"\f348";display:inline-block;font:400 18px/1 dashicons;speak:none;margin:0 8px 0 -2px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}

2
assets/css/prettyPhoto.css
View File

File diff suppressed because one or more lines are too long

2
assets/css/prettyPhoto.scss
View File

@ -245,7 +245,7 @@ div.pp_woocommerce {
div.pp_woocommerce {
left: 5% !important;
right: 5% !important;
@include box-sizing(border-box);
box-sizing: border-box;
width: 90% !important;
.pp_gallery,

2
assets/css/select2.css
View File

File diff suppressed because one or more lines are too long

2
assets/css/woocommerce-layout.css
View File

File diff suppressed because one or more lines are too long

4
assets/css/woocommerce-layout.scss
View File

@ -309,7 +309,7 @@
}
.input-text {
@include box-sizing(border-box);
box-sizing: border-box;
width: 100%;
}
}
@ -462,4 +462,4 @@
}
}
}
}
}

2
assets/css/woocommerce-smallscreen.css
View File

File diff suppressed because one or more lines are too long

4
assets/css/woocommerce-smallscreen.scss
View File

@ -134,7 +134,7 @@
.button,
.input-text {
width: 48%;
@include box-sizing(border-box);
box-sizing: border-box;
}
.input-text + .button,
@ -175,7 +175,7 @@
#place_order {
float: none;
width: 100%;
@include box-sizing(border-box);
box-sizing: border-box;
margin-bottom: 1em;
}
}

2
assets/css/woocommerce.css
View File

File diff suppressed because one or more lines are too long

4
assets/css/woocommerce.scss
View File

@ -889,7 +889,7 @@ p.demo_store {
}
textarea {
@include box-sizing(border-box);
box-sizing: border-box;
width: 100%;
}
}
@ -1277,7 +1277,7 @@ p.demo_store {
input.input-text,
textarea {
@include box-sizing(border-box);
box-sizing: border-box;
width: 100%;
margin: 0;
outline: 0;

12
package.json
View File

@ -12,14 +12,14 @@
"grunt": "^0.4.5",
"grunt-checktextdomain": "^0.1.1",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-cssmin": "^0.11.0",
"grunt-contrib-cssmin": "^0.12.2",
"grunt-contrib-jshint": "^0.11.0",
"grunt-contrib-sass": "^0.8.1",
"grunt-contrib-uglify": "^0.7.0",
"grunt-contrib-sass": "^0.9.2",
"grunt-contrib-uglify": "^0.8.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-shell": "^1.1.1",
"grunt-wp-i18n": "^0.4.9",
"node-bourbon": "^1.2.3"
"grunt-shell": "^1.1.2",
"grunt-wp-i18n": "^0.5.0",
"node-bourbon": "^4.2.1-beta1"
},
"engines": {
"node": ">=0.8.0",