From: Jakub Pawlowicz Date: Sun, 19 Apr 2015 08:45:44 +0000 (+0100) Subject: Fixes regression in restructuring vendor prefixed properties. X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=b24039fbed4fff3ffe540348eaab4c59600d61e4;p=clean-css.git Fixes regression in restructuring vendor prefixed properties. --- diff --git a/lib/selectors/reorderable.js b/lib/selectors/reorderable.js index 50b39c59..8c14dba8 100644 --- a/lib/selectors/reorderable.js +++ b/lib/selectors/reorderable.js @@ -29,6 +29,8 @@ function canReorderSingle(left, right) { return false; if (FLEX_PROPERTIES.test(leftName) && FLEX_PROPERTIES.test(rightName)) return false; + if (leftNameRoot == rightNameRoot && (vendorPrefixed(leftName) ^ vendorPrefixed(rightName))) + return false; if (leftNameRoot != rightNameRoot) return true; if (leftName == rightName && leftNameRoot == rightNameRoot && leftValue == rightValue) @@ -43,6 +45,10 @@ function canReorderSingle(left, right) { return false; } +function vendorPrefixed(name) { + return /^\-(?:moz|webkit|ms|o)\-/.test(name); +} + function selectorsDoNotOverlap(s1, s2) { for (var i = 0, l = s1.length; i < l; i++) { for (var j = 0, m = s2.length; j < m; j++) { diff --git a/test/fixtures/big-min.css b/test/fixtures/big-min.css index 67a96a7d..eca6856b 100644 --- a/test/fixtures/big-min.css +++ b/test/fixtures/big-min.css @@ -2,7 +2,6 @@ small,sub,sup{font-size:75%} .alpha,.ie .une_normale .liste_carre_999.liste_une .ie_impair,.liste_carre_999.liste_une li:nth-child(2n+3){clear:left} .bt_fonce a,.btn,.btn_abo,.btn_fonce,.btn_petit{filter:progid:dximagetransform.microsoft.gradient(enabled=false)} -.btn:hover,.btn_abo:hover,.btn_fonce:hover,.btn_petit:hover,.conteneur_pagination .next:hover,.conteneur_pagination .prev:hover{-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-ms-transition:background-position .1s linear} .bt_abo:hover,a{text-decoration:none} .clear,.clearfix:after,.deplier{visibility:hidden} article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block} @@ -263,8 +262,7 @@ img[width="202"]{margin-bottom:4px} .btn_abo{color:#000b15;background-color:#ffc600;background-image:-moz-linear-gradient(top,#ffe562,#ffc600);background-image:-ms-linear-gradient(top,#ffe562,#ffc600);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ffe562),to(#ffc600));background-image:-webkit-linear-gradient(top,#ffe562,#ffc600);background-image:-o-linear-gradient(top,#ffe562,#ffc600);background-image:linear-gradient(top,#ffe562,#ffc600);background-repeat:repeat-x;border-color:#ffc600;border-color:rgba(0,0,0,.1)} .btn.large{width:100%;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} .btn_petit{padding:2px 4px;font-size:11px;line-height:16px} -.btn:hover,.btn_abo:hover,.btn_fonce:hover,.btn_petit:hover{text-decoration:none;background-position:0 -15px;-o-transition:background-position .1s linear;transition:background-position .1s linear} -.edito_ensemble_lien.resize_maxi .double_chevron,.edito_ensemble_lien.resize_mini .double_chevron{-moz-transition-property:transform;-moz-transition-duration:.5s;-moz-transition-timing-function:ease-in;-webkit-transition-property:transform;-webkit-transition-duration:.5s;-webkit-transition-timing-function:ease-in} +.btn:hover,.btn_abo:hover,.btn_fonce:hover,.btn_petit:hover{text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-ms-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear} .btn:hover,.btn_petit:hover{color:#2e3942;background-color:#e6e6e6} .btn.active,.btn.disabled,.btn.disabled:hover,.btn:active,.btn[disabled],.btn_petit.active,.btn_petit:active,.btn_petit[disabled],input[type=submit].disabled{background-color:#e6e6e6;color:#d2d6db} .btn.disabled:hover,input[type=submit].disabled{background-image:none;background-color:#e6e6e6;cursor:default} @@ -277,7 +275,6 @@ img[width="202"]{margin-bottom:4px} .btn_fonce:active{background-color:#000b15} .btn_abo:active{background-color:#ffc600} input.btn,input.btn_abo,input.btn_fonce,input.btn_petit{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box} -#bar-liberation .other .god a,.bloc_part.empruntis .contenu .texte,.bloc_part.gymglish .contenu{-webkit-box-sizing:border-box;-moz-box-sizing:border-box} button::-moz-focus-inner,input[type=submit]::-moz-focus-inner{padding:0;border:0} .bt_abo{display:inline-block;padding:3px 12px;background:#ffd500;font-weight:700;color:#650} .bt_abo:hover{background:#ffc600;color:#000;font-weight:700;cursor:pointer} @@ -352,7 +349,6 @@ button::-moz-focus-inner,input[type=submit]::-moz-focus-inner{padding:0;border:0 .chevron,.chevron_en_dur{display:inline-block} .chevron:before,.liste_chevron .obf:before,.liste_chevron a:before{color:#a2a9ae;content:'\203A';font-family:arial;display:inline-block;font-size:13px;left:0;position:relative;width:7px;font-weight:400} .liste_chevron a:before,.liste_chevron span:before{position:absolute} -.confirmation,.conteneur_autocompletion{position:relative} .chevron_en_dur{color:#a2a9ae;width:5px} .bull:before,.square:before{content:'\25A0';color:#d2d6db;position:relative;bottom:.2em;margin-right:.5em;font-size:1.2rem} .liste_carre_999{color:#d2d6db;padding:0 0 0 14px} @@ -512,7 +508,7 @@ input[type=checkbox],input[type=radio]{vertical-align:bottom;margin-bottom:.2rem .saisie_erreur,.saisie_erreur input{border-color:#d50303} .saisie_erreur input{color:#000;text-shadow:0 0 0 transparent} .champs_erreur{border:1px solid #d50303} -.confirmation{padding:10px;background:#dff0d8;color:#468847} +.confirmation{position:relative;padding:10px;background:#dff0d8;color:#468847} .confirmation .fermer{position:absolute;right:10px;top:10px;width:10px;height:10px;background:url(/medias/web/img/sprites/icos_petites.png)-22px -191px no-repeat;text-indent:-9999px;cursor:pointer} .bandeau_info_importante{padding:10px;background:#fff1ae;color:#c09853} .bandeau_important{padding:6px 16px;background:#d50303;color:#fff;font-weight:700} @@ -520,8 +516,8 @@ input[disabled=disabled]{background:#eef1f5} .entete_abonnes{display:block;padding-top:8px;padding-bottom:9px;border-top:3px solid #ffd500;border-bottom:1px solid #e9edf0;color:#464f57;font-weight:700} .entete_abonnes_bg{display:block;padding:4px 16px 2px;background:#ffd500;color:#464f57;font-weight:700} .rnd5{-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;-o-border-radius:5px;border-radius:5px} -#header .acces_compte .avatar_nom,#header_utilisateur .recherche p{-webkit-border-radius:4px;border-radius:4px;-moz-border-radius:4px} .rnd4{-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;-o-border-radius:4px;border-radius:4px} +.conteneur_autocompletion{position:relative} .conteneur_autocompletion>ul{position:absolute;top:-4px!important;max-height:160px;overflow:auto;padding:16px 8px 8px;border:solid #8b9299;border-width:0 1px 1px;background:#f8f9fb;-webkit-box-shadow:0 4px 8px -3px #444;-moz-box-shadow:0 4px 8px -3px #444;-o-box-shadow:0 4px 8px -3px #444;-ms-box-shadow:0 4px 8px -3px #444;box-shadow:0 4px 8px -3px #444;-webkit-border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px;border-bottom-right-radius:4px;border-bottom-left-radius:4px} .img_ico{position:relative;display:block;margin:0} .liste_img_lien .img_ico{float:left;width:92px;height:61px} @@ -562,6 +558,7 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} .edito_ensemble_lien{cursor:pointer} .edito_ensemble_lien .double_chevron{display:inline-block;width:9px;height:9px;margin-left:10px;background:url(/medias/web/img/pictos/chevrons_double_haut_bas.png)no-repeat} .edito_ensemble_lien.resize_mini .double_chevron{transform:rotate(0);-ms-transform:rotate(0);-moz-transform:rotate(0);-webkit-transform:rotate(0);-o-transform:rotate(0);transition-property:transform;transition-duration:.5s;transition-timing-function:ease-in} +.edito_ensemble_lien.resize_maxi .double_chevron,.edito_ensemble_lien.resize_mini .double_chevron{-moz-transition-property:transform;-moz-transition-duration:.5s;-moz-transition-timing-function:ease-in;-webkit-transition-property:transform;-webkit-transition-duration:.5s;-webkit-transition-timing-function:ease-in} .edito_ensemble_lien.resize_maxi .double_chevron{transform:rotate(180deg);-ms-transform:rotate(180deg);-moz-transform:rotate(180deg);-webkit-transform:rotate(180deg);-o-transform:rotate(180deg);transition-property:transform;transition-duration:.5s;transition-timing-function:ease-in} .conteneur_onglets{height:35px;border:solid #d2d6db;border-width:0 0 1px} .conteneur_onglets .onglet{float:left;background:#fff;text-align:center} @@ -605,7 +602,7 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} .pagination_large{margin-top:10px} .pagination .adroite{float:right} .conteneur_pagination .next,.conteneur_pagination .prev{display:block;float:left;width:27px;height:26px;text-shadow:0 1px 1px rgba(255,255,255,.75);background-color:#fafafa;background-image:-webkit-gradient(linear,0 0,0 100%,from(#fefefe),color-stop(25%,#fefefe),to(#e4e6e9));background-image:-webkit-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:-moz-linear-gradient(left,#fefefe,#fefefe 25%,#e4e6e9);background-image:-ms-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:-o-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#e4e6e9', GradientType=0);text-align:center;line-height:26px;font-size:15px;color:#2e3942} -.conteneur_pagination .next:hover,.conteneur_pagination .prev:hover{color:#2e3942;text-decoration:none;background-color:#e4e6e9;background-position:0 -15px;-o-transition:background-position .1s linear;transition:background-position .1s linear} +.conteneur_pagination .next:hover,.conteneur_pagination .prev:hover{color:#2e3942;text-decoration:none;background-color:#e4e6e9;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-ms-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear} #footer .obf:hover,#footer a:hover,#footer_services .entete .obf:hover{text-decoration:underline} .conteneur_pagination .prev{border-right:1px solid #d2d6db} .conteneur_pagination .next{border-left:1px solid #d2d6db;float:right} @@ -789,7 +786,7 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} #header_utilisateur{height:34px;border-bottom:1px solid #d2d6db;background:#fff} #header_utilisateur .recherche{margin-top:5px;padding:0;float:left} #header_utilisateur .recherche label{display:none} -#header_utilisateur .recherche p{width:195px;margin:0;padding:2px 5px;background-color:#f8f9fb;border:1px solid #d2d6db;overflow:hidden} +#header_utilisateur .recherche p{width:195px;margin:0;padding:2px 5px;background-color:#f8f9fb;border:1px solid #d2d6db;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;overflow:hidden} #header_utilisateur .recherche input[type=search]{border:none;background:0 0;width:165px;float:left;-webkit-box-sizing:border-box} #header_utilisateur .loupe{width:15px;height:15px;margin:0 0 0 5px;border:none;background:url(/medias/web/img/sprites/icos_petites.png)-17px -173px no-repeat;text-indent:-9999px;font-size:0;color:#f8f9fb;float:right} #header_utilisateur .sociaux{float:left;margin:7px 20px 0;color:#747b83;font-weight:700;font-size:12px} @@ -817,7 +814,7 @@ img[height="97"]+.ico29x29{bottom:6%;left:3.5%} #header_abonne .ea109x13{margin:0 14px 0 0} #header .acces_compte{position:relative;float:right} #header .acces_compte:hover{cursor:pointer} -#header .acces_compte .avatar_nom{height:26px;margin:3px 0 0;background-color:#fafafa;background-image:-webkit-gradient(linear,0 0,0 100%,from(#fefefe),color-stop(25%,#fefefe),to(#e4e6e9));background-image:-webkit-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:-moz-linear-gradient(top,#fefefe,#fefefe 25%,#e4e6e9);background-image:-ms-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:-o-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e4e6e9', GradientType=0);border:1px solid #d2d6db} +#header .acces_compte .avatar_nom{height:26px;margin:3px 0 0;background-color:#fafafa;background-image:-webkit-gradient(linear,0 0,0 100%,from(#fefefe),color-stop(25%,#fefefe),to(#e4e6e9));background-image:-webkit-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:-moz-linear-gradient(top,#fefefe,#fefefe 25%,#e4e6e9);background-image:-ms-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:-o-linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-image:linear-gradient(#fefefe,#fefefe 25%,#e4e6e9);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e4e6e9', GradientType=0);border:1px solid #d2d6db;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px} #header .acces_compte .avatar_nom span{display:block;height:26px;line-height:26px;float:left} #header .acces_compte .avatar{width:28px;border-right:1px solid #d2d6db} #header .acces_compte .avatar img{display:block;margin:4px auto 0;vertical-align:middle} @@ -1089,7 +1086,7 @@ label i{font-style:normal;display:none} .bloc_part.attractive.format-text .img img{padding:15px 15px 9px} .services .bloc_part.darqroom.grid_12.promo,.services .bloc_part.gymglish.grid_12{background-color:#e9ecf0;background-image:-moz-linear-gradient(top,#fff,#e9ecf0);background-image:-ms-linear-gradient(top,#fafbfc #e9ecf0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fafbfc),to(#e9ecf0));background-image:-webkit-linear-gradient(top,#fafbfc,#e9ecf0);background-image:-o-linear-gradient(top,#fafbfc,#e9ecf0);background-image:linear-gradient(top,#fff,#e9ecf0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafbfc', endColorstr='#e9ecf0', GradientType=0)} .services .bloc_part.gymglish.grid_6{background:0 0} -.bloc_part.gymglish .contenu{padding:12px 15px 0;height:182px;box-sizing:border-box;overflow:hidden;clear:both} +.bloc_part.gymglish .contenu{padding:12px 15px 0;height:182px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;overflow:hidden;clear:both} .bloc_part.gymglish .exercice .texte,.bloc_part.gymglish .mot_mois .texte{width:166px;height:126px;padding:0} .bloc_part.gymglish .mot_mois .texte{width:155px;padding:4px 15px 0 0} .bloc_part.gymglish .cours .texte{width:145px;height:170px;padding:0 15px 0 0} @@ -1107,7 +1104,7 @@ label i{font-style:normal;display:none} .bloc_part.gymglish .contenu.mot_mois{bottom:42px;left:15px;height:143px} .bloc_part.gymglish .contenu.mot_mois .img{width:110px;float:right;margin:4px 0} .bloc_part.empruntis .contenu{padding:0 15px;background:url(/medias/web/img/partenaires/empruntis/stylo.jpg)no-repeat} -.bloc_part.empruntis .contenu .texte{box-sizing:border-box;width:190px;color:#16212c} +.bloc_part.empruntis .contenu .texte{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;width:190px;color:#16212c} .bloc_part.empruntis .contenu .texte strong{display:block;color:#16212c} .bloc_part.empruntis .contenu .texte .lien_chevron{display:block;font-weight:700;color:#16212c} .bloc_part.empruntis .footer img{margin-top:-10px} @@ -1539,7 +1536,7 @@ body.access-bas .offers-hide-quo,body.access-ess .block-ad,body.access-ess .offe .float-right{float:right} .float-left{float:left} .rounded,.rounded3{border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px} -#core-liberation .block-basic-rounded .block-content,.block .block-content.rounded,.block.rounded,.rounded5{border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px} +.rounded5{border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px} .hand-cursor{cursor:pointer;cursor:hand} .m-auto{margin:auto} .m-bot-2{margin-bottom:2px} @@ -1607,11 +1604,12 @@ img.spacer{width:1px;height:1px} ul.errorlist{background:#fafafa;border:1px solid #e20000;color:#2e2e2e;margin:0 0 5px;padding:5px} ul.errorlist li{font-size:11px;font-weight:400;color:#e20000} #core-liberation .block .block-top h5,#core-liberation .headrest h5{font-size:12px} +.block .block-content.rounded,.block.rounded{border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px} #core-liberation .block .right{float:right} #core-liberation .block .block-top img.icon{width:30px;float:left;margin:0 5px 5px 14px} #core-liberation .block .block-bottom span.right{float:right;display:block} #core-liberation .block-basic-rounded .block-top h5{text-tranform:uppercase;font-weight:400} -#core-liberation .block-basic-rounded .block-content{border:1px solid #D8D8D8} +#core-liberation .block-basic-rounded .block-content{border:1px solid #D8D8D8;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px} #core-liberation .block-basic-curled{position:relative} #core-liberation .block-basic-curled .shadow-left,#core-liberation .block-basic-curled .shadow-right,#core-liberation .block-basic-curled .shadow-top-left,#core-liberation .block-basic-curled .shadow-top-right{display:block;position:absolute;z-index:0;width:35%;max-width:100%;max-height:100%} #core-liberation .block-basic-curled .shadow-left,#core-liberation .block-basic-curled .shadow-right{bottom:-4px} @@ -1623,10 +1621,10 @@ ul.errorlist li{font-size:11px;font-weight:400;color:#e20000} #core-liberation .headrest h4{font-size:18px} #core-liberation .headrest span.right{float:right} #core-liberation .headrest-basic-rounded{border:1px solid #D8D8D8;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px} -#core-liberation .cartridge-basic-rounded,#core-liberation .form-https{border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px} #core-liberation .cartridge{display:block} #core-liberation .cartridge .segment{display:block;float:right;height:100%} #core-liberation .cartridge span.br{display:block} +#core-liberation .cartridge-basic-rounded{border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px} #core-liberation .cartridge-basic-bubble .plain,#core-liberation .cartridge-basic-bubble .segment{display:block;float:left;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px} #core-liberation .pagination{height:21px} #core-liberation .pagination a{display:block;float:left;background:#e6e6e6;height:19px;margin-right:5px;padding:1px 6px} @@ -1714,13 +1712,13 @@ body.iframe{padding-top:0} #header-liberation .header-base .links{display:block;width:280px;height:110px;padding-top:10px} #header-liberation .header-base .links .lnk1,#header-liberation .header-base .links .lnk2{float:left} #header-liberation .header-base .links .lnk1{position:relative;width:123px} -#header-liberation .header-base .links .lnk2{width:136px;padding-left:21px;box-shadow:-9px 0 10px -11px #6c6c6c;-moz-box-shadow:-9px 0 10px -11px #6c6c6c;-webkit-box-shadow:-9px 0 10px -11px #6c6c6c} +#header-liberation .header-base .links .lnk2{width:136px;padding-left:21px} #header-liberation .header-base .links h2{margin-bottom:3px} #header-liberation .header-base .links ul li{margin-bottom:1px;height:13px} #header-liberation .header-base .digitalpaper{position:relative;float:right;width:196px} #header-liberation .header-base .digitalpaper a.abo,#header-liberation .header-base .digitalpaper a.dl{display:block;position:absolute;top:15px;right:0;width:79px;height:34px;padding-left:10px;padding-top:7px;font-size:11px;font-family:Arial,Verdana,sans-serif} #header-liberation .header-base .digitalpaper a.abo{top:56px;padding-top:5px} -#header-liberation .header-base .digitalpaper a.une{position:absolute;right:88px;width:79px;height:102px;bottom:8px;box-shadow:0 -1px 7px 0 grey;-webkit-box-shadow:0 -1px 7px 0 grey;-moz-box-shadow:0 -1px 7px 0 grey} +#header-liberation .header-base .digitalpaper a.une{position:absolute;right:88px;width:79px;height:102px;bottom:8px} #header-liberation .header-base .digitalpaper a.une img{width:79px;height:102px} #header-liberation .header-base .digitalpaper .mask{display:block;position:absolute;bottom:0;right:0;width:180px;height:23px} #header-liberation .header-base .nav{height:59px} @@ -1817,7 +1815,7 @@ body.auth-unlogged #core-liberation .form-monlibe-unlogged form{opacity:.3;-ms-f #core-liberation .form-contacts p input[type=text]{width:372px} #core-liberation .form-contacts p textarea{resize:vertical;width:378px;height:200px} #core-liberation .form-contacts p select{width:300px} -#core-liberation .form-https{width:388px;margin:28px auto;padding:14px;-o-border-radius:5px;border:1px solid} +#core-liberation .form-https{width:388px;margin:28px auto;padding:14px;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;border:1px solid} #core-liberation .form-https p:last-child{margin-bottom:0} #core-liberation .form-https p label{display:inline-block;font-weight:400;margin-bottom:7px} #core-liberation .form-https p input[type=password],#core-liberation .form-https p input[type=text]{display:block;width:372px;border-radius:2px;-moz-border-radius:2px;-webkit-border-radius:2px;-o-border-radius:2px;margin-bottom:14px;padding:7px} @@ -2004,7 +2002,7 @@ a.god:hover{background:#3c3c3c;color:#fff} #bar-liberation .god{font-weight:700;text-align:center;height:94%;border:1px solid #000;background-color:#fff} #bar-liberation .god ul{display:block;text-align:left} #bar-liberation .god li{display:inline-block;text-align:center;width:86px;vertical-align:top;height:38px} -#bar-liberation .other .god a{padding:5px} +#bar-liberation .other .god a{padding:5px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} #bar-liberation .other .god a:hover{background-color:#ff0;color:#000} #bar-liberation .god .godenabled a{background:#3c3c3c;color:#fff} #bar-liberation .god a.godenter{background:url(http://s0.libe.com/libe/img/common/icon_godenter.png?9ffa63824b5c)center center no-repeat #fff} @@ -2615,7 +2613,9 @@ body.slideshow .ad-top .megaban{background:#333} .site-liberation .hot-topics h1{border-right-color:#bbbaba} .site-liberation .hot-topics li{background:#fff} .site-liberation .hot-topics .event{background:#b1b1b1} +#header-liberation .header-base .links .lnk2{box-shadow:-9px 0 10px -11px #6c6c6c;-moz-box-shadow:-9px 0 10px -11px #6c6c6c;-webkit-box-shadow:-9px 0 10px -11px #6c6c6c} #header-liberation .header-base .digitalpaper a.abo{background-color:#f2f2f2;color:#2e2e2e} +#header-liberation .header-base .digitalpaper a.une{box-shadow:0 -1px 7px 0 grey;-webkit-box-shadow:0 -1px 7px 0 grey;-moz-box-shadow:0 -1px 7px 0 grey} #header-liberation .header-base .digitalpaper .mask{background:#fff;box-shadow:7px -12px 8px -10px grey;-webkit-box-shadow:7px -12px 8px -10px grey;-moz-box-shadow:7px -12px 8px -10px grey} #header-liberation .header-base .nav .nav1 a:hover,#header-liberation .header-base .nav .on .nav1 a,#header-liberation .header-base .nav-no-js>li:hover .nav1 a{color:#fff} #header-liberation .header-base .nav .nav1 a:hover span,#header-liberation .header-base .nav .on .nav1 a span,#header-liberation .header-base .nav-no-js>li:hover .nav1 a span{background-color:#fff} @@ -2868,7 +2868,6 @@ body.slideshow .ad-top .megaban{background:#333} .site-liberation .toolbox li.fold-options,.site-liberation .toolbox li.fold-options ul{background:#f8f8f8} .site-liberation .toolbox li.fold-options>a{color:#818181} #bar-liberation{background-color:#fff;box-shadow:0 1px 2px 0 #E2E2E2;-webkit-box-shadow:0 1px 2px 0 #E2E2E2;-moz-box-shadow:0 1px 2px 0 #E2E2E2} -#bar-liberation #login-box-content,#bar-liberation #personal-options-content{background-color:#fff;box-shadow:0 1px 1px 0 #E2E2E2;-webkit-box-shadow:0 1px 1px 0 #E2E2E2} #bar-liberation,#bar-liberation a{color:#3c3c3c} #bar-liberation .content .activities-stream,#bar-liberation .content .close,#bar-liberation .content .login,#bar-liberation .content .mail-box,#bar-liberation .content .open,#bar-liberation .content .other,#bar-liberation .content .personal-options{background:#fff;border-left-color:#dadada;border-right-color:#dadada;border-bottom-color:#dadada} #bar-liberation .content ul.list li,#bar-liberation .content ul.list li a,#core-liberation .block-activities .block-content ul li,#core-liberation .block-activities .block-content ul li a{color:#222} @@ -2876,8 +2875,8 @@ body.slideshow .ad-top .megaban{background:#333} #bar-liberation .content .open a .arrow{border-left-color:1px solid #dadada;border-right-color:1px solid #dadada} #bar-liberation .content .login a.subscribe{background-color:#656565;color:#fff} #bar-liberation .content .login a.subscribe:hover{background-color:#3c3c3c} -#bar-liberation #login-box-content{border-left-color:#dadada;border-right-color:#dadada;-moz-box-shadow:0 1px 1px 0 #E2E2E2} -#bar-liberation #personal-options-content{border-left-color:1px solid #dadada;border-right-color:1px solid #dadada;border-bottom-color:1px solid #dadada;-moz-box-shadow:0 1px 1px 0 #E2E2E2} +#bar-liberation #login-box-content{background-color:#fff;border-left-color:#dadada;border-right-color:#dadada;box-shadow:0 1px 1px 0 #E2E2E2;-webkit-box-shadow:0 1px 1px 0 #E2E2E2;-moz-box-shadow:0 1px 1px 0 #E2E2E2} +#bar-liberation #personal-options-content{background-color:#fff;border-left-color:1px solid #dadada;border-right-color:1px solid #dadada;border-bottom-color:1px solid #dadada;box-shadow:0 1px 1px 0 #E2E2E2;-webkit-box-shadow:0 1px 1px 0 #E2E2E2;-moz-box-shadow:0 1px 1px 0 #E2E2E2} #bar-liberation #personal-options-content ul.subscription li.subscribe,#bar-liberation #personal-options-content ul.subscription li.subscribe a,#bar-liberation #personal-options-content ul.subscription strong{color:#a40000} #bar-liberation #personal-options-content ul li{color:#878787} #bar-liberation #personal-options-content ul li a,#bar-liberation #personal-options-content ul li strong{color:#3c3c3c} diff --git a/test/selectors/optimizer-test.js b/test/selectors/optimizer-test.js index a8ca567c..0390840f 100644 --- a/test/selectors/optimizer-test.js +++ b/test/selectors/optimizer-test.js @@ -216,6 +216,10 @@ vows.describe(SelectorsOptimizer) 'with charset and import and comments': [ '@charset "UTF-8";@import url(http://fonts.googleapis.com/css?family=Lora:400,700);__ESCAPED_COMMENT_SPECIAL_CLEAN_CSS0__a{width:100px}div{color:red}.one{display:block}.two{display:inline;color:red}', '@charset "UTF-8";@import url(http://fonts.googleapis.com/css?family=Lora:400,700);__ESCAPED_COMMENT_SPECIAL_CLEAN_CSS0__.two,div{color:red}a{width:100px}.one{display:block}.two{display:inline}' + ], + 'with vendor prefixed value group': [ + 'a{-moz-box-sizing:content-box;box-sizing:content-box}div{color:red}p{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}', + 'a{box-sizing:content-box}a,p{-moz-box-sizing:content-box}div{color:red}p{-webkit-box-sizing:content-box;box-sizing:content-box}' ] }, { advanced: true }) ) diff --git a/test/selectors/reorderable-test.js b/test/selectors/reorderable-test.js index 05b3a1a2..b6171742 100644 --- a/test/selectors/reorderable-test.js +++ b/test/selectors/reorderable-test.js @@ -184,6 +184,22 @@ vows.describe(canReorderSingle) 'must be true': function (result) { assert.isTrue(result); } + }, + 'same but one vendor prefixed': { + 'topic': function () { + return canReorderSingle(propertiesIn('a{-moz-box-sizing:content-box}')[0], propertiesIn('a{box-sizing:content-box}')[0]); + }, + 'must be false': function (result) { + assert.isFalse(result); + } + }, + 'same and both vendor prefixed': { + 'topic': function () { + return canReorderSingle(propertiesIn('a{-moz-box-sizing:content-box}')[0], propertiesIn('a{-moz-box-sizing:content-box}')[0]); + }, + 'must be true': function (result) { + assert.isTrue(result); + } } }) .addBatch({