From 807351b57ee91d0646f2b5db2a8ce8e423424018 Mon Sep 17 00:00:00 2001 From: dsc Date: Sun, 26 Feb 2012 16:05:50 -0800 Subject: [PATCH] Reorders dygraph options, fixes tags. --- lib/scaffold/view.co | 5 +++-- www/css/colors.styl | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/scaffold/view.co b/lib/scaffold/view.co index 4bb31f0..b48e1f5 100644 --- a/lib/scaffold/view.co +++ b/lib/scaffold/view.co @@ -22,7 +22,8 @@ BaseView = exports.BaseView = Backbone.View.extend do # {{{ toTemplateLocals: -> json = {value:v} = @model.toJSON() - json.value = JSON.stringify v if _.isArray(v) or _.isObject(v) + if _.isArray(v) or _.isObject(v) + json.value = JSON.stringify v { $, _, op, @model, view:this } import json $template: (locals={}) -> @@ -37,7 +38,7 @@ BaseView = exports.BaseView = Backbone.View.extend do # {{{ id : outer.attr 'id' class : outer.attr('class') - # @$parent = p if (p = @$el.parent()).length + this render: -> diff --git a/www/css/colors.styl b/www/css/colors.styl index 90f63c1..4c836b6 100644 --- a/www/css/colors.styl +++ b/www/css/colors.styl @@ -18,7 +18,7 @@ $hilite_dkblue = #182B53 $hilite_sky = #0080FF $hilite_ltblue = #4596FF $hilite_steelblue = #A6D9FF -$hilite_cyan = #00FFBC +$hilite_cyan = #51E3C5 $hilite_hurricane = #254A59 $hilite_tourquoise = #32938A $hilite_green = #83BB32 @@ -34,7 +34,7 @@ $hilite_purple = #553DC9 $hilite_periwinkle = #9DA5FF $hilite_lavender = #9323FF -$hilites = ($hilite_dkblue $hilite_sky $hilite_ltblue $hilite_steelblue $hilite_cyan $hilite_hurricane $hilite_tourquoise $hilite_green $hilite_lime $hilite_yellow $hilite_squash $hilite_orange $hilite_watermelon $hilite_red $hilite_pink $hilite_magenta $hilite_purple $hilite_periwinkle $hilite_lavender) +$hilites = ($hilite_dkblue $hilite_sky $hilite_steelblue $hilite_cyan $hilite_hurricane $hilite_tourquoise $hilite_green $hilite_lime $hilite_yellow $hilite_squash $hilite_orange $hilite_watermelon $hilite_red $hilite_pink $hilite_magenta $hilite_purple $hilite_periwinkle $hilite_lavender) $hilite_favs = ($hilite_dkblue $hilite_ltblue $hilite_cyan $hilite_lime $hilite_yellow $hilite_squash $hilite_red $hilite_magenta $hilite_purple) // colors: ["#FF0097", "#EF8158", "#83BB32", "#182B53", "#4596FF", "#553DC9", "#AD3238", "#00FFBC", "#F1D950"] -- 1.7.0.4