Update Pretty Diff to v1.15.7 and fix broken JSX and TSS tests

This commit is contained in:
Glavin Wiechert 2015-11-02 14:00:15 -04:00
parent 50bb7d737e
commit 9a3a23fc2a
4 changed files with 18 additions and 19 deletions

View File

@ -1,5 +1,4 @@
var Mist = React.createClass({
renderList: function() {
var Mist = React.createClass({renderList: function() {
return this
.props
.items

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.12.19",
"prettydiff": "^1.15.7",
"season": "^5.3.0",
"space-pen": "^5.1.1",
"strip-json-comments": "^1.0.2",