Mirrors
/
atom-beautify
mirror of https://github.com/Glavin001/atom-beautify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade Pretty Diff to v1.16.0 and fix failing tests

This commit is contained in:
Glavin Wiechert 2015-12-10 21:41:35 -04:00
parent adcbaf3e4e
commit bb91eab955
10 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/nested-jsbeautifyrc/less/expected/test.less
View File

@ -11,15 +11,18 @@ a {
text-decoration: none; text-decoration: none;
} }
&:visited { &:visited {
color: @white; color: @white;
} }
&:hover { &:hover {
color: @orange; color: @orange;
} }
&.green { &.green {
color: @green; color: @green;
&:hover { &:hover {
color: @white; color: @white;
background-color: @green; background-color: @green;
} }
} }

25
examples/nested-jsbeautifyrc/less/expected/test2.less
View File

@ -1,6 +1,7 @@
// main: style.less // main: style.less
@import (reference)"variables.less"; @import (reference)"variables.less";
@import (reference)"mixins.less"; @import (reference)"mixins.less";
.modal { .modal {
position: fixed; position: fixed;
height: 100%; height: 100%;
@ -9,6 +10,7 @@
z-index: 10; z-index: 10;
opacity: 0; opacity: 0;
display: none; display: none;
.innerModal { .innerModal {
margin: auto; margin: auto;
background-color: @white; background-color: @white;
@ -18,6 +20,7 @@
-ms-transform: translateY(-100%); -ms-transform: translateY(-100%);
-o-transform: translateY(-100%); -o-transform: translateY(-100%);
transform: translateY(-100%); transform: translateY(-100%);
.fa { .fa {
float: right; float: right;
color: @white; color: @white;
@ -33,6 +36,7 @@
} }
} }
} }
&.modal-2text { &.modal-2text {
.innerModal { .innerModal {
width: @container-width; width: @container-width;
@ -41,9 +45,11 @@
padding: 10px 25px; padding: 10px 25px;
background-color: gainsboro; background-color: gainsboro;
border-radius: 4px; border-radius: 4px;
h2 { h2 {
margin: 0 0 7px; margin: 0 0 7px;
} }
div { div {
height: 70%; height: 70%;
overflow-y: scroll; overflow-y: scroll;
@ -51,27 +57,30 @@
padding: 15px; padding: 15px;
border-radius: 4px; border-radius: 4px;
} }
.large-cta { .large-cta {
margin-top: 25px; margin-top: 25px;
} }
} }
} }
} }
#modal-video { #modal-video {
.innerModal { .innerModal {
left: 10%; left: 10%;
margin-top: 30px; margin-top: 30px;
width: 1000px; width: 1000px;
background-color: lighten(@black, 25%); background-color: lighten(@black, 25%);
iframe { iframe {
width: 600px; width: 600px;
height: 340px; height: 340px;
margin: 2% auto; margin: 2% auto;
} }
//container //container
> div { > div {
text-align: center; text-align: center;
a { a {
.styleLinks(@white, darken(@white, 10%)); .styleLinks(@white, darken(@white, 10%));
padding: 5px; padding: 5px;
@ -83,58 +92,72 @@
background-color: fade(@white, 30%); background-color: fade(@white, 30%);
} }
} }
h3 { h3 {
color: @white; color: @white;
font-size: 3em; font-size: 3em;
margin: 20px auto; margin: 20px auto;
} }
button { button {
margin-bottom: 50px; margin-bottom: 50px;
} }
} }
} }
} }
.slideIn { .slideIn {
.animation(SlideIn, 0.5s); .animation(SlideIn, 0.5s);
} }
@-webkit-keyframes SlideIn { @-webkit-keyframes SlideIn {
0% { 0% {
.transform(translateY(-100%)); .transform(translateY(-100%));
} }
100% { 100% {
.transform(translateY(0px)); .transform(translateY(0px));
} }
} }
.fadeIn { .fadeIn {
display: block; display: block;
.animation(FadeIn, 0.5s); .animation(FadeIn, 0.5s);
} }
@-webkit-keyframes FadeIn { @-webkit-keyframes FadeIn {
0% { 0% {
opacity: 0; opacity: 0;
} }
100% { 100% {
opacity: 1; opacity: 1;
} }
} }
.slideOut { .slideOut {
.animation(SlideOut, 0.5s); .animation(SlideOut, 0.5s);
} }
@-webkit-keyframes SlideOut { @-webkit-keyframes SlideOut {
0% { 0% {
.transform(translateY(0%)); .transform(translateY(0%));
} }
100% { 100% {
.transform(translateY(-100%)); .transform(translateY(-100%));
} }
} }
.fadeOut { .fadeOut {
.animation(FadeOut, 0.5s); .animation(FadeOut, 0.5s);
} }
@-webkit-keyframes FadeOut { @-webkit-keyframes FadeOut {
0% { 0% {
opacity: 1; opacity: 1;
} }
100% { 100% {
opacity: 0; opacity: 0;
display: none; display: none;

14
examples/nested-jsbeautifyrc/less/expected/test3.less
View File

@ -1,14 +1,6 @@
// Breaks (fixed now) // Breaks (fixed now)
.mixin(@variable, @anotherVariable) { .mixin(@variable, @anotherVariable) {}
}
// Works // Works
.mixin(@variable; @anotherVariable) { .mixin(@variable; @anotherVariable) {}
}
// Ok // Ok
.mixin(@variable) { .mixin(@variable) {}
}

2
examples/nested-jsbeautifyrc/less/expected/test4.less
View File

@ -2,6 +2,7 @@ section#photo-details {
width: 1140px; width: 1140px;
margin: 60px auto 70px; margin: 60px auto 70px;
} }
div.photo-view { div.photo-view {
text-align: center; text-align: center;
figure { figure {
@ -13,4 +14,5 @@ div.photo-view {
display: block; display: block;
} }
} }
} }

4
examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss
View File

@ -1,6 +1,6 @@
/* kendo UI */ /* kendo UI */
@import "variables";
@import "variables";
// slider // slider
.k-slider-track { .k-slider-track {
background-color: $gray-light; background-color: $gray-light;
@ -18,4 +18,4 @@
background-color: $brand-primary; background-color: $brand-primary;
color: #fff; color: #fff;
} }
} }

2
examples/nested-jsbeautifyrc/sass/expected/test.scss
View File

@ -2,11 +2,9 @@
.container { .container {
.cta--primary { .cta--primary {
&:visited { &:visited {
//whatever //whatever
} }
&::before { &::before {
//whatever //whatever
} }
} }

4
examples/nested-jsbeautifyrc/xml/expected/test.xml
View File

@ -1,5 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE stylesheet [<!ENTITY nbsp "<xsl:text disable-output-escaping='yes'>&amp;nbsp;</xsl:text>">]> <!DOCTYPE stylesheet [
<!ENTITY nbsp "<xsl:text disable-output-escaping='yes'>&amp;nbsp;</xsl:text>">
]>
<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

28
examples/simple-jsbeautifyrc/titanium-style-sheets/expected/random_indent.tss
View File

@ -1,27 +1,27 @@
"Window" : { "Window": {
exitOnClose: true, exitOnClose: true,
backgroundColor: "#fff", backgroundColor: "#fff",
title: "Kochgut" title: "Kochgut"
} }
"Label" : { "Label": {
width: Ti.UI.SIZE, width: Ti.UI.SIZE,
height: Ti.UI.SIZE, height: Ti.UI.SIZE,
color: "#555", color: "#555",
touchEnabled: false touchEnabled: false
} }
"Button" : { "Button": {
backgroundColor: "#03a9f4", backgroundColor: "#03a9f4",
color: "#fff", color: "#fff",
borderRadius: 2 borderRadius: 2
} }
"#menu" : { "#menu": {
backgroundImage: "/images/bg.png" backgroundImage: "/images/bg.png"
} }
".button" : { ".button": {
backgroundColor: "#03a9f4", backgroundColor: "#03a9f4",
color: "#fff", color: "#fff",
borderRadius: 2, borderRadius: 2,
@ -31,13 +31,13 @@
bottom: 16 bottom: 16
} }
".lbl_button" : { ".lbl_button": {
left: 20, left: 20,
right: 20, right: 20,
color: "#fff" color: "#fff"
} }
".headline" : { ".headline": {
color: "#aaa", color: "#aaa",
left: 16, left: 16,
height: 48, height: 48,
@ -46,40 +46,40 @@
} }
} }
".grid" : { ".grid": {
left: 2, left: 2,
right: 2, right: 2,
layout: "horizontal", layout: "horizontal",
height: Ti.UI.SIZE height: Ti.UI.SIZE
} }
".card [platform=tablet]" : { ".card [platform=tablet]": {
width: "33%", width: "33%",
height: 150, height: 150,
bottom: 2 bottom: 2
} }
".card" : { ".card": {
width: "50%", width: "50%",
height: 150, height: 150,
bottom: 2 bottom: 2
} }
".padding" : { ".padding": {
right: 2, right: 2,
left: 0, left: 0,
top: 0, top: 0,
bottom: 0, bottom: 0,
backgroundImage: "/images/essen.jpg" backgroundImage: "/images/essen.jpg"
} }
".card_overlay" : { ".card_overlay": {
bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0, right: 0,
height: 48 height: 48
} }
".card_overlay_bg" : { ".card_overlay_bg": {
left: 0, left: 0,
right: 0, right: 0,
bottom: 0, bottom: 0,
@ -88,7 +88,7 @@
opacity: 0.3 opacity: 0.3
} }
".card_lbl" : { ".card_lbl": {
color: "#fff", color: "#fff",
left: 16, left: 16,
font: { font: {

4
examples/simple-jsbeautifyrc/titanium-style-sheets/expected/test2.tss
View File

@ -1,11 +1,11 @@
".container" : { ".container": {
backgroundImage: 'images/bgbg-builder.png', backgroundImage: 'images/bgbg-builder.png',
width: 1024, width: 1024,
height: 752, height: 752,
top: 0, top: 0,
left: 0 left: 0
}, },
"#blackArrow" : { "#blackArrow": {
touchEnabled: false, touchEnabled: false,
backgroundImage: 'images/arrow-builder.png', backgroundImage: 'images/arrow-builder.png',
width: 15, width: 15,

2
package.json
View File

@ -86,7 +86,7 @@
"loophole": "^1.0.0", "loophole": "^1.0.0",
"node-dir": "^0.1.8", "node-dir": "^0.1.8",
"node-uuid": "^1.4.3", "node-uuid": "^1.4.3",
"prettydiff": "^1.15.16", "prettydiff": "^1.16.0",
"season": "^5.3.0", "season": "^5.3.0",
"space-pen": "^5.1.1", "space-pen": "^5.1.1",
"strip-json-comments": "^1.0.2", "strip-json-comments": "^1.0.2",