Update deps, redesign 404

This commit is contained in:
Jonathan Cremin 2015-08-22 00:27:55 +01:00
parent eaba18d6f5
commit 51968374dd
5 changed files with 100 additions and 72 deletions

View file

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html style='height:100%;'>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@ -10,31 +10,23 @@
<link href='//fonts.googleapis.com/css?family=Open+Sans:400,300,600' rel='stylesheet' type='text/css'>
<link href="/styles/app.css" rel="stylesheet" />
</head>
<body>
<section class="container header clearfix">
<div class="row">
<div class="col-md-8 col-md-offset-2" style='text-align: center;'>
<div class="logo">
<a href="/"><img src="/images/logo-dark-r.png" height="22" width="26" alt=""></a>
<body class='error'>
<div class='container main'>
<div class='row'>
<div class='col-md-12'>
<div class='error-logo'>
<a href='/'><img src='/images/logo-dark-r.png' width='26' height='22' /></a>
</div>
</div>
</div>
</section>
<section class="jumbotron error-page">
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<h1>404</h1>
<h2>We can't find the file you're looking for :(</h2>
<p class="lead">The owner may have removed it or it may never have existed in the first place.</p>
<a href="/">Try our homepage instead :)</a>
</div>
<div class='row vertical-center'>
<div class='col-md-12'>
<h2>404</h2>
<h1>Sorry, it looks like the file you asked for is gone.</h1>
<a href='/'>Take Me Home</a>
</div>
</div>
</section>
</div>
<script>
var _gaq=[['_setAccount','UA-66209-2'],['_setDomainName', 'hostr.co'],['_trackPageview']];

View file

@ -1,55 +1,58 @@
System.config({
"defaultJSExtensions": true,
"transpiler": "babel",
"babelOptions": {
defaultJSExtensions: true,
transpiler: "babel",
babelOptions: {
"optional": [
"runtime"
]
},
"paths": {
paths: {
"github:*": "jspm_packages/github/*",
"npm:*": "jspm_packages/npm/*"
}
});
},
System.config({
"map": {
"angular": "npm:angular@1.4.3",
map: {
"angular": "npm:angular@1.4.4",
"angular-reconnecting-websocket": "github:adieu/angular-reconnecting-websocket@0.1.1",
"angular-strap": "npm:angular-strap@2.1.2",
"angular/resource": "npm:angular-resource@1.4.3",
"angular/route": "npm:angular-route@1.4.3",
"babel": "npm:babel-core@5.8.5",
"babel-runtime": "npm:babel-runtime@5.8.5",
"angular-strap": "npm:angular-strap@2.3.1",
"angular/resource": "npm:angular-resource@1.4.4",
"angular/route": "npm:angular-route@1.4.4",
"babel": "npm:babel-core@5.8.22",
"babel-runtime": "npm:babel-runtime@5.8.20",
"bootstrap-sass": "npm:bootstrap-sass@3.3.5",
"cferdinandi/smooth-scroll": "github:cferdinandi/smooth-scroll@5.3.7",
"core-js": "npm:core-js@0.9.18",
"core-js": "npm:core-js@1.1.1",
"dropzone": "npm:dropzone@4.0.1",
"jquery": "npm:jquery@2.1.4",
"zeroclipboard": "npm:zeroclipboard@2.2.0",
"github:jspm/nodelibs-buffer@0.1.0": {
"buffer": "npm:buffer@3.4.2"
},
"github:jspm/nodelibs-path@0.1.0": {
"path-browserify": "npm:path-browserify@0.0.0"
},
"github:jspm/nodelibs-process@0.1.1": {
"process": "npm:process@0.10.1"
},
"github:jspm/nodelibs-util@0.1.0": {
"util": "npm:util@0.10.3"
},
"npm:angular-strap@2.1.2": {
"npm:angular-strap@2.3.1": {
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
"fs": "github:jspm/nodelibs-fs@0.1.2",
"path": "github:jspm/nodelibs-path@0.1.0",
"process": "github:jspm/nodelibs-process@0.1.1",
"systemjs-json": "github:systemjs/plugin-json@0.1.0",
"util": "github:jspm/nodelibs-util@0.1.0"
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
},
"npm:angular@1.4.3": {
"npm:angular@1.4.4": {
"process": "github:jspm/nodelibs-process@0.1.1"
},
"npm:babel-runtime@5.8.5": {
"npm:babel-runtime@5.8.20": {
"process": "github:jspm/nodelibs-process@0.1.1"
},
"npm:core-js@0.9.18": {
"npm:buffer@3.4.2": {
"base64-js": "npm:base64-js@0.0.8",
"ieee754": "npm:ieee754@1.1.6",
"is-array": "npm:is-array@1.0.1"
},
"npm:core-js@1.1.1": {
"fs": "github:jspm/nodelibs-fs@0.1.2",
"process": "github:jspm/nodelibs-process@0.1.1",
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
@ -57,22 +60,14 @@ System.config({
"npm:dropzone@4.0.1": {
"process": "github:jspm/nodelibs-process@0.1.1"
},
"npm:inherits@2.0.1": {
"util": "github:jspm/nodelibs-util@0.1.0"
},
"npm:jquery@2.1.4": {
"process": "github:jspm/nodelibs-process@0.1.1"
},
"npm:path-browserify@0.0.0": {
"process": "github:jspm/nodelibs-process@0.1.1"
},
"npm:util@0.10.3": {
"inherits": "npm:inherits@2.0.1",
"process": "github:jspm/nodelibs-process@0.1.1"
},
"npm:zeroclipboard@2.2.0": {
"process": "github:jspm/nodelibs-process@0.1.1"
}
}
});

View file

@ -3,7 +3,9 @@ import ngRoute from 'angular/route';
import ngResource from 'angular/resource';
import ReconnectingWebSocket from 'angular-reconnecting-websocket';
import ngDimensions from 'angular-strap/dist/modules/dimensions';
import ngStrapCore from 'angular-strap/dist/modules/compiler';
import ngTooltip from 'angular-strap/dist/modules/tooltip';
import ngTooltipTemplate from 'angular-strap/dist/modules/tooltip.tpl';
import { FilesController, FileController, AccountController, ProController, BillingController } from './app/controllers';
import { appHeader, appFooter, menuDropdown, searchShortcut, stripeSubscribe } from './app/directives';
@ -17,6 +19,7 @@ var app = angular.module('hostr', [
'ngRoute',
'ngResource',
'reconnectingWebSocket',
'mgcrea.ngStrap.core',
'mgcrea.ngStrap.tooltip'
]);
@ -38,7 +41,6 @@ app.directive('searchShortcut', ['$document', searchShortcut]);
app.directive('stripeSubscribe', ['$http', stripeSubscribe]);
app.config(['$routeProvider', '$locationProvider', '$httpProvider', '$tooltipProvider', function($routeProvider, $locationProvider, $httpProvider, $tooltipProvider) {
$tooltipProvider.defaults.template = '/jspm_packages/npm/angular-strap@2.1.2/src/tooltip/tooltip.tpl.html';
if (typeof window.user !== 'undefined') {
$httpProvider.defaults.headers.common.Authorization = ':' + window.user.token;

View file

@ -1023,8 +1023,46 @@ a {
}
}
.error-page {
background: none;
.error {
// color: #96a9b3;
}
.error h1, .error h2 {
font-weight: 100;
}
.error .main h1 {
font-size: 2em;
margin-bottom: 20px;
}
.error h2 {
color: #b6c7d0;
font-size: 4em;
margin-top: 0px;
margin-bottom: 20px;
}
.error .col-md-12 {
margin-top: -1px;
}
.error a {
color: #96a9b3;
}
.error-logo {
position: absolute;
top: 50px;
left: 15px;
}
.vertical-center {
min-height: 100%; /* Fallback for browsers do NOT support vh unit */
min-height: 100vh; /* These two lines are counted as one :-) */
display: flex;
align-items: center;
}
.stats {