From 2b2d4152a57b86b7cbce5600224f4d1937aa9eb8 Mon Sep 17 00:00:00 2001 From: Kevan Ahlquist Date: Sun, 2 Nov 2014 23:37:34 -0600 Subject: [PATCH] Updated dashboard and modal form markup for bootstrap 3. --- css/app.css | 13 ------ index.html | 2 +- js/controllers.js | 4 -- partials/builder.html | 28 +++++++------ partials/dashboard.html | 71 +++++++++++++++++---------------- partials/image.html | 20 ++++++---- partials/masthead.html | 2 +- partials/startcontainer.html | 77 ++++++++++++++++++++---------------- 8 files changed, 111 insertions(+), 106 deletions(-) diff --git a/css/app.css b/css/app.css index 6dd3155e0..970e2ad85 100644 --- a/css/app.css +++ b/css/app.css @@ -3,11 +3,6 @@ body { padding-bottom: 60px; } -.container { - margin: 0 auto; - max-width: 1000px; -} - .container > hr { margin: 60px 0; } @@ -40,14 +35,6 @@ body { margin-top: 28px; } -.navbar .navbar-inner { - padding: 0; -} - -.navbar .nav { - margin: 0; -} - .navbar .nav li { display: table-cell; width: 1%; diff --git a/index.html b/index.html index 7c88dc8f9..56c667b69 100644 --- a/index.html +++ b/index.html @@ -47,7 +47,7 @@ -
+
diff --git a/js/controllers.js b/js/controllers.js index c1c6ff9a6..a01586ea5 100644 --- a/js/controllers.js +++ b/js/controllers.js @@ -418,10 +418,6 @@ function ImageController($scope, $q, $routeParams, $location, Image, Container, }); }; - $scope.create = function() { - $('#create-modal').modal('show'); - }; - Image.get({id: $routeParams.id}, function(d) { $scope.image = d; $scope.tag = d.id; diff --git a/partials/builder.html b/partials/builder.html index eef12bbd3..8aaf49494 100644 --- a/partials/builder.html +++ b/partials/builder.html @@ -1,13 +1,17 @@ -