finish qa-ing removal of angular

This commit is contained in:
Quincy Larson
2015-12-04 19:21:19 -06:00
parent 7e9d65675a
commit 676ef0e253
3 changed files with 3 additions and 12 deletions

View File

@ -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%');
}
};

View File

@ -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',

View File

@ -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)