diff options
| author | Anike Arni <aarni@thoughtworks.com> | 2017-02-16 18:51:26 -0200 |
|---|---|---|
| committer | Anike Arni <aarni@thoughtworks.com> | 2017-02-16 18:51:26 -0200 |
| commit | 957599ae01687d6b3d02a3c34fdbe2ac6bd920f9 (patch) | |
| tree | 7612fa7cfd33bd9657bce0eb9e8db47b076cedcc /web-ui/src/login | |
| parent | 64780114ae90bb890d3ffa0a9aebe4686c6b74d3 (diff) | |
[#907] Bundles login static files separately
Due to conflicts with public and protected urls, login and interstitial
files have to be on a different public url from inbox and resources that
require login. Therefore, here, we delegate that logic to webpack. Now
we have a '/public' url and a '/assets' url for those static assets.
Diffstat (limited to 'web-ui/src/login')
| -rw-r--r-- | web-ui/src/login/login.css | 2 | ||||
| -rw-r--r-- | web-ui/src/login/login.html | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/web-ui/src/login/login.css b/web-ui/src/login/login.css index f1b54071..51ab2046 100644 --- a/web-ui/src/login/login.css +++ b/web-ui/src/login/login.css @@ -21,7 +21,7 @@ body { height: 100vh; color: #3E3A37; - background-image: url("/assets/images/hive-bg.png"); + background-image: url("/public/images/hive-bg.png"); background-repeat: repeat; } diff --git a/web-ui/src/login/login.html b/web-ui/src/login/login.html index 88d74556..b8c45180 100644 --- a/web-ui/src/login/login.html +++ b/web-ui/src/login/login.html @@ -1,19 +1,19 @@ <!DOCTYPE html> <html xmlns:t="http://twistedmatrix.com/ns/twisted.web.template/0.1"> <head> - <link rel="icon" type="image/png" href="/assets/images/Favicon.png" /> + <link rel="icon" type="image/png" href="/public/images/Favicon.png" /> <meta charset="utf-8"/> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"/> <title>Pixelated - Login</title> - <link rel="stylesheet" type="text/css" href="/assets/normalize.min.css" /> - <link rel="stylesheet" type="text/css" href="/assets/login.css" /> - <link rel="stylesheet" type="text/css" href="/assets/opensans.css" /> + <link rel="stylesheet" type="text/css" href="/public/normalize.min.css" /> + <link rel="stylesheet" type="text/css" href="/public/login.css" /> + <link rel="stylesheet" type="text/css" href="/public/opensans.css" /> </head> <body> <div class="content"> <div class="login"> - <img class="logo" src="/assets/images/logo-orange.svg" alt="Pixelated logo"/> + <img class="logo" src="/public/images/logo-orange.svg" alt="Pixelated logo"/> <p t:render="error_msg" class="error"></p> <div id="root"/> </div> @@ -21,6 +21,6 @@ <div t:render="disclaimer"></div> </div> </div> - <script type="text/javascript" src="/assets/login.js"></script> + <script type="text/javascript" src="/public/login.js"></script> </body> </html> |