Skip to content

Commit

Permalink
fix(layout): fix up various visual assets
Browse files Browse the repository at this point in the history
Also fixes full page layout bug
  • Loading branch information
atruskie committed Sep 13, 2016
1 parent 035d2a8 commit fecd31a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 19 deletions.
19 changes: 3 additions & 16 deletions src/app/error/error.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
//angular.module('home', []).config(function ($routeProvider, $httpProvider) {
//
// $routeProvider.
// when('/', {templateUrl: '/assets/home.html', controller: HomeCtrl}).
// otherwise({redirectTo: '/'});
//
// //$httpProvider.defaults.headers.
// // common['X-CSRF-Token'] = $['meta[name=csrf-token]'].attr('content');
//});
angular.module("bawApp.error", [])
.controller("ErrorCtrl", ["$scope",


function ErrorCtrl($scope) {

.controller("ErrorController", [
"$scope",
function ErrorController($scope) {
$scope.message = "We can't seem to find what you are looking for (404)";


}
]);
File renamed without changes.
2 changes: 1 addition & 1 deletion src/baw.paths.nobuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ module.exports = function (environment) {
// The following intentionally are not prefixed with a '/'
// static files
"files": {
"error404": "error/error_404.tpl.html",
"error404": "error/error404.tpl.html",
"home": "home/home.tpl.html",
"login": {
"loginWidget": "login/widget/loginWidget.tpl.html"
Expand Down
4 changes: 2 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@

<!-- each view must specify the controller they use -->
<div id="content-wrapper"
class="col-md-pull-2 col-sm-12"
ng-class="{ 'col-md-12': fullWidth, 'col-md-8': !fullWidth }"
class="col-sm-12"
ng-class="{ 'col-md-12': fullWidth, 'col-md-8': !fullWidth, 'col-md-pull-2': !fullWidth }"
ng-view autoscroll>
</div>

Expand Down

0 comments on commit fecd31a

Please sign in to comment.