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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
/* kendo UI */
@import "variables";
@import "variables";
// slider
.k-slider-track {
background-color: $gray-light;

View File

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

View File

@ -1,5 +1,7 @@
<?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">

View File

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

View File

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

View File

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