From e1520e674205de80da7e7d811dc2770148b4e0c7 Mon Sep 17 00:00:00 2001 From: Jordan Date: Thu, 29 May 2014 01:01:22 -0500 Subject: [PATCH] Fixed nav toggle Removed campaign_results.html template (not needed - covered in AngularJS template now) --- static/css/flat-ui.css | 14 --------- static/js/app/controllers.js | 1 - templates/base.html | 10 ++++++ templates/campaign_results.html | 56 --------------------------------- 4 files changed, 10 insertions(+), 71 deletions(-) delete mode 100644 templates/campaign_results.html diff --git a/static/css/flat-ui.css b/static/css/flat-ui.css index 067052bd..370c58ad 100644 --- a/static/css/flat-ui.css +++ b/static/css/flat-ui.css @@ -1962,17 +1962,6 @@ fieldset[disabled] .input-group-btn .btn-default.active { height: 53px; line-height: 53px; } -.navbar-toggle:before { - color: #16a085; - content: "\e00c"; - font-family: "Flat-UI-Icons"; - font-size: 22px; - font-style: normal; - font-weight: normal; - -webkit-font-smoothing: antialiased; - -webkit-transition: color 0.25s linear; - transition: color 0.25s linear; -} .navbar-toggle:hover, .navbar-toggle:focus { outline: none; @@ -1981,9 +1970,6 @@ fieldset[disabled] .input-group-btn .btn-default.active { .navbar-toggle:focus:before { color: #1abc9c; } -.navbar-toggle .icon-bar { - display: none; -} @media (min-width: 768px) { .navbar-toggle { display: none; diff --git a/static/js/app/controllers.js b/static/js/app/controllers.js index ca2fc5c3..194a162e 100644 --- a/static/js/app/controllers.js +++ b/static/js/app/controllers.js @@ -329,7 +329,6 @@ app.controller('TemplateCtrl', function($scope, $modal, TemplateService, ngTable }) var TemplateModalCtrl = function($scope, $modalInstance) { - console.log($scope.template) $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; diff --git a/templates/base.html b/templates/base.html index 37af3caa..006c1d6b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -49,6 +49,16 @@