From 676ef0e253757b1d6b3406c54fc67f851fa52d5e Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Fri, 4 Dec 2015 19:21:19 -0600 Subject: [PATCH] finish qa-ing removal of angular --- client/commonFramework/phone-scroll-lock.js | 4 ++-- gulpfile.js | 3 --- server/views/coursewares/showBonfire.jade | 8 +------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/client/commonFramework/phone-scroll-lock.js b/client/commonFramework/phone-scroll-lock.js index bf5af55c4f..32b40c8a1d 100644 --- a/client/commonFramework/phone-scroll-lock.js +++ b/client/commonFramework/phone-scroll-lock.js @@ -22,7 +22,7 @@ window.common = (function({ common = { init: [] }}) { $('.scroll-locker') .css('min-height', $('.editorScrollDiv').height()) - .css('height', magiVal - 185); + .css('height', magiVal - 50); } else { $('.editorScrollDiv').css('max-height', 500 + 'px'); @@ -30,7 +30,7 @@ window.common = (function({ common = { init: [] }}) { .css('position', 'inherit') .css('top', 'inherit') .css('width', '100%') - .css('max-height', '85%'); + .css('max-height', '100%'); } }; diff --git a/gulpfile.js b/gulpfile.js index b58517ee9d..b1e28b9c0f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -93,9 +93,6 @@ var paths = { vendorMain: [ 'public/bower_components/jquery/dist/jquery.min.js', 'public/bower_components/bootstrap/dist/js/bootstrap.min.js', - 'public/bower_components/angular/angular.min.js', - 'public/bower_components/angular-bootstrap/ui-bootstrap.min.js', - 'public/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js', 'public/bower_components/d3/d3.min.js', 'public/bower_components/moment/min/moment.min.js', 'public/bower_components/lightbox2/dist/js/lightbox.min.js', diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index d348523e64..41c16da1f5 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -5,7 +5,7 @@ block content link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css') link(rel='stylesheet', href='/css/ubuntu.css') - .row(ng-controller="pairedWithController") + .row .col-md-4.col-lg-3 .scroll-locker(id = "scroll-locker") .innerMarginFix(style=' width: 99%') @@ -24,12 +24,6 @@ block content ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]} if (user) - form.form-horizontal(name='completedWithForm') - .form-group.text-center.negative-10 - .col-xs-12 - // extra field to distract password tools like lastpass from injecting css into our username field - input.form-control.hidden - input.form-control#completed-with(name="existingUser", placeholder="Your pair's username if pairing") label.negative-10.btn.btn-primary.btn-block.btn-lg#submitButton i.fa.fa-play |   Run tests (ctrl + enter)