diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-16 16:31:26 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-16 16:31:26 -0400 |
| commit | 720f1082d3e9456192bcab4050a82ff56845ed7f (patch) | |
| tree | c97471a25d9b971670c901d76a1bf5fad4bddee7 /api/templates | |
| parent | dc74d57611910551939669f0b18f18e798437f5c (diff) | |
| parent | c2829b24e43612a260433be957a2a3b19f3c9f70 (diff) | |
| download | chat-720f1082d3e9456192bcab4050a82ff56845ed7f.tar.gz chat-720f1082d3e9456192bcab4050a82ff56845ed7f.tar.bz2 chat-720f1082d3e9456192bcab4050a82ff56845ed7f.zip | |
Merge pull request #696 from mattermost/PLT-23
PLT-23 error.html pulls files from static
Diffstat (limited to 'api/templates')
| -rw-r--r-- | api/templates/error.html | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/api/templates/error.html b/api/templates/error.html index cac46e223..760578896 100644 --- a/api/templates/error.html +++ b/api/templates/error.html @@ -1,12 +1,22 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> - <title>{{ .ClientProps.SiteName }} - Error</title> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css"> - <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> - <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script> - <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,600,700' rel='stylesheet' type='text/css'> - <link rel="stylesheet" href="/static/css/styles.css"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <title>{{ .ClientProps.SiteName }} - Error</title> + + <link rel="stylesheet" href="/static/css/bootstrap-3.3.5.min.css"> + <link rel="stylesheet" href="/static/css/jasny-bootstrap.min.css" rel="stylesheet"> + + <script src="/static/js/react-with-addons-0.13.3.min.js"></script> + <script src="/static/js/jquery-1.11.1.min.js"></script> + <script src="/static/js/bootstrap-3.3.5.min.js"></script> + <script src="/static/js/react-bootstrap-0.25.1.min.js"></script> + + <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon"> + <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon"> + <link href='/static/css/google-fonts.css' rel='stylesheet' type='text/css'> + <link rel="stylesheet" href="/static/css/styles.css"> + + </head> <body class="white error"> <div class="container-fluid"> |