Skip to content

Commit 9a70605

Browse files
andyjanssonevilebottnawi
andyjansson
authored and
evilebottnawi
committed
fix(postcss-merge-longhand): not mangle border output (#555)
* Should not mangle border output (#553, #554) * Fix linting issues
1 parent c4f2e59 commit 9a70605

16 files changed

Lines changed: 146 additions & 108 deletions

File tree

‎packages/cssnano-preset-advanced/src/__tests__/integrations/base.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ input:-ms-input-placeholder{color:#999}
573573
.checkbox label,.radio label{display:inline-block;padding-left:20px;padding-top:0}
574574
.checkbox input[type=checkbox],.checkbox input[type=radio],.radio input[type=checkbox],.radio input[type=radio]{left:0;position:absolute;top:4px}
575575
.select{display:block;position:relative}
576-
.select:before{border:6px solid transparent;border-top:6px solid #676767;content:"";margin-top:-3px;pointer-events:none;position:absolute;right:10px;top:50%}
576+
.select:before{border:6px solid transparent;border-top-color:#676767;content:"";margin-top:-3px;pointer-events:none;position:absolute;right:10px;top:50%}
577577
.select select{-moz-appearance:none;-webkit-appearance:none;background:#fff;border:1px solid #ccc;display:block;height:36px;line-height:normal;padding:0 10px;width:100%}
578578
.select select::-ms-expand{display:none}
579579
.select select:focus{border-color:#f7c723}

‎packages/cssnano-preset-advanced/src/__tests__/integrations/helium.css‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ input,label,textarea{color:#444;font-family:Helvetica Neue,Helvetica,Arial,sans-
230230
@media screen and (min-width:981px){
231231
.field-group .fields{position:relative}
232232
.field-group .fields .error-message{left:100%;margin-left:12px;margin-top:0;position:absolute;top:2px;white-space:nowrap}
233-
.field-group .fields .error-message:after{border:6px solid transparent;border-right:6px solid #a01d2b;content:"";display:block;height:0;left:-12px;position:absolute;top:6px;width:0}
233+
.field-group .fields .error-message:after{border:6px solid transparent;border-right-color:#a01d2b;content:"";display:block;height:0;left:-12px;position:absolute;top:6px;width:0}
234234
}
235235
.input-inline{display:inline-block;height:30px;line-height:30px}
236236
.multi-field{zoom:1}
@@ -267,7 +267,7 @@ input.char16{width:182px!important}
267267
select{-webkit-appearance:none;display:block;font-size:14px;opacity:0;padding:0 7px;width:100%;z-index:1}
268268
select option{font-size:11px}
269269
.select-mask{background:#fff;left:0;line-height:1;padding-top:7px;position:absolute;top:0;z-index:-1}
270-
.select-mask:after{border:5px solid transparent;border-top:5px solid #222;content:"";display:block;height:0;position:absolute;right:10px;top:12px;width:0}
270+
.select-mask:after{border:5px solid transparent;border-top-color:#222;content:"";display:block;height:0;position:absolute;right:10px;top:12px;width:0}
271271
::-webkit-input-placeholder{-moz-transition:.2s all;-o-transition:.2s all;-webkit-transition:all .2s;color:#999;transition:all .2s}
272272
:-moz-placeholder{-moz-transition:.2s all;-o-transition:.2s all;-webkit-transition:all .2s;color:#999;transition:all .2s}
273273
::-webkit-input-placeholder:focus{color:#bfbfbf}
@@ -287,7 +287,7 @@ button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
287287
.error label{color:#a01d2b}
288288
.error input{border-color:#a01d2b}
289289
.error-message{-moz-border-radius:2px;-ms-border-radius:2px;-o-border-radius:2px;-webkit-border-radius:2px;background:#a01d2b;border-radius:2px;color:#fff;display:inline-block;font-size:12px;line-height:12px;margin-top:7px;padding:7px;position:relative}
290-
.error-message:after{border:6px solid transparent;border-bottom:6px solid #a01d2b;content:"";display:block;height:0;left:10px;position:absolute;top:-12px;width:0}
290+
.error-message:after{border:6px solid transparent;border-bottom-color:#a01d2b;content:"";display:block;height:0;left:10px;position:absolute;top:-12px;width:0}
291291
.button{-moz-background-clip:border;-moz-background-origin:border;-moz-border-radius:4px;-moz-box-shadow:0 1px 1px rgba(0,0,0,.08);-ms-background-origin:border-box;-ms-border-radius:4px;-o-background-origin:border-box;-o-border-radius:4px;-webkit-background-clip:border;-webkit-background-origin:border;-webkit-border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.08);background-clip:border-box;background-image:linear-gradient(top,#fbfbfb 1px,#fff 0,#fff 2px,#fbfbfb 0,#ececec);background-origin:border-box;border:1px solid rgba(0,0,0,.2);border-radius:4px;box-shadow:0 1px 1px rgba(0,0,0,.08);color:#444;cursor:pointer;display:inline-block;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;font-size:12px;font-weight:600;height:32px;line-height:1;margin:0 3.5px 0 0;padding:9px 12px;text-align:center;text-decoration:none;text-shadow:0 1px 0 #fff;vertical-align:middle;zoom:1}
292292
.button:after,.button:before{content:"";display:table}
293293
.button:after{clear:both}
@@ -318,7 +318,7 @@ button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
318318
.has-dropdown.button-dropdown{display:inline-block;margin-right:3.5px}
319319
.has-dropdown.button-dropdown .button{margin-right:0;padding-right:26px}
320320
.has-dropdown.button-dropdown .button .caret{display:block;height:32px;position:absolute;right:12px;top:0;width:10px}
321-
.has-dropdown.button-dropdown .button .caret:after{border:5px solid transparent;border-top:5px solid #444;content:"";display:block;height:0;left:0;position:absolute;top:13.5px;width:0}
321+
.has-dropdown.button-dropdown .button .caret:after{border:5px solid transparent;border-top-color:#444;content:"";display:block;height:0;left:0;position:absolute;top:13.5px;width:0}
322322
.has-dropdown.button-dropdown .dropdown{border-radius:0 4px 4px 4px;left:0;margin-top:-1px}
323323
.has-dropdown.button-dropdown .dropdown.right{border-radius:4px 0 4px 4px;left:auto;right:0}
324324
.has-dropdown.button-dropdown .dropdown>li>a{padding-left:12px;padding-right:12px}
@@ -352,9 +352,9 @@ button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
352352
.top-bar .top-bar-links>li.active a{background-color:#090909}
353353
.top-bar .top-bar-links>li.has-dropdown>a{padding-right:31px}
354354
.top-bar .top-bar-links>li.has-dropdown>a .caret{display:block;height:50px;position:absolute;right:14px;top:0;width:10px}
355-
.top-bar .top-bar-links>li.has-dropdown>a .caret:after{border:5px solid transparent;border-top:5px solid #fff;content:"";display:block;height:0;left:0;margin-top:-1px;position:absolute;top:50%;width:0}
355+
.top-bar .top-bar-links>li.has-dropdown>a .caret:after{border:5px solid transparent;border-top-color:#fff;content:"";display:block;height:0;left:0;margin-top:-1px;position:absolute;top:50%;width:0}
356356
.top-bar .top-bar-links>li.has-dropdown .dropdown{border-top:0}
357-
.top-bar .top-bar-links>li.has-dropdown.open>a .caret:after{border:5px solid transparent;border-top:5px solid #444;content:"";display:block;height:0;position:absolute;width:0}
357+
.top-bar .top-bar-links>li.has-dropdown.open>a .caret:after{border:5px solid transparent;border-top-color:#444;content:"";display:block;height:0;position:absolute;width:0}
358358
.top-bar .button{-moz-box-shadow:0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2);background-image:linear-gradient(top,#3c3c3c 1px,#484848 0,#484848 2px,#3c3c3c 0,#222);box-shadow:0 1px 0 rgba(0,0,0,.2);color:#fff;margin-top:9px;text-shadow:0 1px 0 rgba(0,0,0,.2)}
359359
.top-bar .button:hover{background-image:linear-gradient(top,#484848 1px,#555 0,#555 2px,#555 0,#2f2f2f)}
360360
.top-bar .button.active,.top-bar .button:active{-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.15);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.15);background-image:linear-gradient(top,#222,#2f2f2f);box-shadow:inset 0 1px 2px rgba(0,0,0,.15)}

‎packages/cssnano-preset-advanced/src/__tests__/integrations/picnic.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ input.stack:focus+input,input.stack:focus+select,input.stack:focus+textarea,sele
901901
[data-tooltip]{position:relative}
902902
[data-tooltip]:after,[data-tooltip]:before{border-width:0;height:0;left:0;margin-top:12px;opacity:0;overflow:hidden;padding:0;position:absolute;top:calc(100% - 6px);transition:opacity .6s ease,height 0s ease .6s;z-index:1}
903903
[data-tooltip]:after{background:#111;content:attr(data-tooltip);font-size:.8em;margin-left:0;white-space:nowrap}
904-
[data-tooltip]:before{border:0 solid transparent;border-bottom:0 solid #111;content:"";height:0;left:10px;margin-top:0;width:0}
904+
[data-tooltip]:before{border:0 solid transparent;border-bottom-color:#111;content:"";height:0;left:10px;margin-top:0;width:0}
905905
[data-tooltip]:focus:after,[data-tooltip]:focus:before,[data-tooltip]:hover:after,[data-tooltip]:hover:before{border-width:6px;height:auto;opacity:1}
906906
[data-tooltip]:focus:after,[data-tooltip]:hover:after{padding:.45em .9em}
907907
.tooltip-top:after,.tooltip-top:before{bottom:calc(100% - 6px);left:0;margin-bottom:12px;top:auto}

‎packages/cssnano-preset-advanced/src/__tests__/integrations/schema.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,15 +437,15 @@ input[type=checkbox],input[type=radio]{line-height:normal;margin-top:1px\9;*marg
437437
.dropdown.open{z-index:1}
438438
.dropdown:hover{box-shadow:0 0 5px rgba(0,0,0,.15)}
439439
.dropdown.focus{box-shadow:0 0 5px rgba(51,102,248,.4)}
440-
.dropdown .carat{border:6px solid transparent;border-top:6px solid #ccc;margin-top:-3px;position:absolute;right:12px;top:50%}
440+
.dropdown .carat{border:6px solid transparent;border-top-color:#ccc;margin-top:-3px;position:absolute;right:12px;top:50%}
441441
.dropdown.open .carat{border-bottom:6px solid #ccc;border-top:6px solid transparent;margin-top:-10px}
442442
.dropdown .old{height:0;overflow:hidden;width:0}
443443
.dropdown .old,.dropdown select{left:0;position:absolute;top:0}
444444
.dropdown.touch .old{height:100%;width:100%}
445445
.dropdown.touch select{height:100%;opacity:0;width:100%}
446446
.dropdown .selected,.dropdown li{color:inherit;display:block;font-size:16px;font-size:1rem;line-height:1;overflow:hidden;padding:9px 12px;white-space:nowrap}
447447
.dropdown .selected:after{bottom:0;content:"";position:absolute;right:0;top:0;width:60px}
448-
.dropdown div{background:#fff;border:1px solid;border-color:#eee #ccc #ccc;border-radius:0 0 6px 6px;height:0;left:-1px;margin-top:-1px;opacity:0;overflow:hidden;position:absolute;right:-1px;top:100%}
448+
.dropdown div{background:#fff;border:1px solid #ccc;border-radius:0 0 6px 6px;border-top-color:#eee;height:0;left:-1px;margin-top:-1px;opacity:0;overflow:hidden;position:absolute;right:-1px;top:100%}
449449
.dropdown.open div{opacity:1;z-index:1}
450450
.dropdown.scrollable div:after{bottom:0;content:"";height:50px;left:0;position:absolute;right:0}
451451
.dropdown.scrollable.bottom div:after{opacity:0}

0 commit comments

Comments
 (0)