From 4aea12abca23c5c72e5fda013a4b35cbe0653c43 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Thu, 2 Apr 2015 15:53:38 -0700 Subject: [PATCH] make slight modifications to the d3 calendar heatmap on the portfolio page --- views/account/show.jade | 7 +++---- views/nonprofits/show.jade | 2 +- views/partials/css-cdns.jade | 14 +++++++++++++- views/partials/universal-head.jade | 2 -- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/views/account/show.jade b/views/account/show.jade index 1ab23dd6ad..49348ce1fb 100644 --- a/views/account/show.jade +++ b/views/account/show.jade @@ -100,7 +100,6 @@ block content #cal-heatmap.img-center script(src="//d3js.org/d3.v3.min.js") script(src="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.min.js") - link(rel="stylesheet", href="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.css") script. var cal = new CalHeatMap(); var calendar = !{JSON.stringify(calender)}; @@ -121,6 +120,6 @@ block content }); .row .hidden-xs.col-sm-12.text-center - .row - h3.col-sm-6.text-right Longest Streak: #{longestStreak} - h3.col-sm-6.text-left Current Streak: #{currentStreak} + .row.text-primary + h4.col-sm-6.text-right Longest Streak: #{longestStreak} + h4.col-sm-6.text-left Current Streak: #{currentStreak} diff --git a/views/nonprofits/show.jade b/views/nonprofits/show.jade index 4491541b10..80e0ffeb92 100644 --- a/views/nonprofits/show.jade +++ b/views/nonprofits/show.jade @@ -23,7 +23,7 @@ block content a(href=websiteLink)= websiteLink h3 Project Description: .col-xs-12 - h4 #{projectDescription} (About #{estimatedHours} hours per camper) + h4.negative-15 #{projectDescription} (About #{estimatedHours} hours per camper) h3 This project involves building: .col-xs-12 if (approvedWebsite) diff --git a/views/partials/css-cdns.jade b/views/partials/css-cdns.jade index 6f76033d43..3aade4da1e 100644 --- a/views/partials/css-cdns.jade +++ b/views/partials/css-cdns.jade @@ -32,4 +32,16 @@ script. var raf = requestAnimationFrame || mozRequestAnimationFrame || webkitRequestAnimationFrame || msRequestAnimationFrame; if (raf) raf(cb); - else window.addEventListener('load', cb); \ No newline at end of file + else window.addEventListener('load', cb); + + var cb = function () { + var l = document.createElement('link'); + l.rel = 'stylesheet'; + l.href = '//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.css'; + var h = document.getElementsByTagName('head')[0]; + h.parentNode.insertBefore(l, h); + }; + var raf = requestAnimationFrame || mozRequestAnimationFrame || + webkitRequestAnimationFrame || msRequestAnimationFrame; + if (raf) raf(cb); + else window.addEventListener('load', cb); diff --git a/views/partials/universal-head.jade b/views/partials/universal-head.jade index 4928e35797..27ef5ba82e 100644 --- a/views/partials/universal-head.jade +++ b/views/partials/universal-head.jade @@ -1,8 +1,6 @@ script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.min.js") script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js") -script(src="//d3js.org/d3.v3.min.js") -script(src="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.min.js") include meta title #{title} | Free Code Camp meta(charset='utf-8')