From f23aaa62779a47666080ff9930c04751efeab23d Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Fri, 9 Jan 2015 08:47:49 -0800 Subject: [PATCH] fix the font awesome-specific buttons --- app.js | 3 ++- views/challenges/show.jade | 2 +- views/layout.jade | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app.js b/app.js index 2bbcf68abc..12269cf30d 100644 --- a/app.js +++ b/app.js @@ -125,7 +125,8 @@ var trusted = [ 'http://localhost:3001', 'localhost:3000', 'ws://localhost:3000/', - 'http://localhost:3000' + 'http://localhost:3000', + '*.ionicframework.com' ]; debug(trusted); diff --git a/views/challenges/show.jade b/views/challenges/show.jade index 2881728da5..1696f653b6 100644 --- a/views/challenges/show.jade +++ b/views/challenges/show.jade @@ -27,7 +27,7 @@ block content - if (cc) a.animated.fadeIn.delay-2.btn.btn-lg.btn-primary.btn-block.next-button(name='_csrf', value=_csrf, aria-hidden='true') Take me to my next challenge - if (points && points > 2) - a.animated.fadeIn.delay-2.btn.btn-lg.btn-block.btn-twitter.btn-social.btn-social-tweet(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20Free%20Code%20Camp%20Challenge%20%23#{number}:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{number}&hashtags=learntocode, javascript" target="_blank") + a.animated.fadeIn.delay-2.btn.btn-lg.btn-block.btn-twitter(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20Free%20Code%20Camp%20Challenge%20%23#{number}:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{number}&hashtags=learntocode, javascript" target="_blank") i.fa.fa-twitter   = phrase - else diff --git a/views/layout.jade b/views/layout.jade index f1d2a7e931..3aaabbc3dd 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -1,12 +1,14 @@ doctype html html(ng-app='profileValidation') head - script(src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js") - script(src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.8/angular.min.js") + script(src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") + script(src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js") script(src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js") + script(src='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js') link(rel='shortcut icon', href='https://s3.amazonaws.com/freecodecamp/favicon.ico') link(rel='stylesheet', href='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css') - //link(rel='stylesheet', href='http://code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css') + link(rel='stylesheet', href='https://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css') + link(rel='stylesheet', href='https://code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css') include partials/meta title #{title} | Free Code Camp meta(charset='utf-8')