Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Loading of fonts.css with a URL Base 

Fixes #3103
This commit is contained in:
Mark McDowall 2019-05-08 19:33:47 -07:00
parent 3e25d41c0f
commit 2b4519a4ad
3 changed files with 315 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/Styles/globals.css
View File

@ -1,7 +1,6 @@
/* stylelint-disable */ /* stylelint-disable */
@import '~normalize.css/normalize.css'; @import "~normalize.css/normalize.css";
@import 'scaffolding.css'; @import "scaffolding.css";
@import '/Content/Fonts/fonts.css';
/* stylelint-enable */ /* stylelint-enable */

49
frontend/src/index.html
View File

@ -1,8 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="mobile-web-app-capable" content="yes" /> <meta name="mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
@ -12,17 +11,44 @@
<!-- Windows Phone --> <!-- Windows Phone -->
<meta name="msapplication-navbutton-color" content="#3a3f51" /> <meta name="msapplication-navbutton-color" content="#3a3f51" />
<meta name="description" content="Sonarr (Preview)"> <meta name="description" content="Sonarr (Preview)" />
<link rel="apple-touch-icon" sizes="180x180" href="/Content/Images/Icons/apple-touch-icon.png"> <link
<link rel="icon" type="image/png" sizes="32x32" href="/Content/Images/Icons/favicon-32x32.png"> rel="apple-touch-icon"
<link rel="icon" type="image/png" sizes="16x16" href="/Content/Images/Icons/favicon-16x16.png"> sizes="180x180"
<link rel="manifest" href="/Content/Images/Icons/manifest.json"> href="/Content/Images/Icons/apple-touch-icon.png"
<link rel="mask-icon" href="/Content/Images/Icons/safari-pinned-tab.svg" color="#00ccff"> />
<link rel="shortcut icon" type="image/ico" href="/favicon.ico" data-no-hash /> <link
<meta name="msapplication-config" content="/Content/Images/Icons/browserconfig.xml"> rel="icon"
type="image/png"
sizes="32x32"
href="/Content/Images/Icons/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="/Content/Images/Icons/favicon-16x16.png"
/>
<link rel="manifest" href="/Content/Images/Icons/manifest.json" />
<link
rel="mask-icon"
href="/Content/Images/Icons/safari-pinned-tab.svg"
color="#00ccff"
/>
<link
rel="shortcut icon"
type="image/ico"
href="/favicon.ico"
data-no-hash
/>
<meta
name="msapplication-config"
content="/Content/Images/Icons/browserconfig.xml"
/>
<link rel="stylesheet" type="text/css" href="/Content/styles.css"> <link rel="stylesheet" type="text/css" href="/Content/styles.css" />
<link rel="stylesheet" type="text/css" href="/Content/Fonts/fonts.css" />
<title>Sonarr (Preview)</title> <title>Sonarr (Preview)</title>
@ -57,5 +83,4 @@
<script src="/vendor.js"></script> <script src="/vendor.js"></script>
<script src="/preload.js"></script> <script src="/preload.js"></script>
<script src="/index.js"></script> <script src="/index.js"></script>
</html> </html>

111
frontend/src/login.html
View File

@ -1,8 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="mobile-web-app-capable" content="yes" /> <meta name="mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
@ -12,17 +11,44 @@
<!-- Windows Phone --> <!-- Windows Phone -->
<meta name="msapplication-navbutton-color" content="#3a3f51" /> <meta name="msapplication-navbutton-color" content="#3a3f51" />
<meta name="description" content="Sonarr (Preview)"> <meta name="description" content="Sonarr (Preview)" />
<link rel="apple-touch-icon" sizes="180x180" href="/Content/Images/Icons/apple-touch-icon.png"> <link
<link rel="icon" type="image/png" sizes="32x32" href="/Content/Images/Icons/favicon-32x32.png"> rel="apple-touch-icon"
<link rel="icon" type="image/png" sizes="16x16" href="/Content/Images/Icons/favicon-16x16.png"> sizes="180x180"
<link rel="manifest" href="/Content/Images/Icons/manifest.json"> href="/Content/Images/Icons/apple-touch-icon.png"
<link rel="mask-icon" href="/Content/Images/Icons/safari-pinned-tab.svg" color="#00ccff"> />
<link rel="shortcut icon" type="image/ico" href="/favicon.ico" data-no-hash /> <link
<meta name="msapplication-config" content="/Content/Images/Icons/browserconfig.xml"> rel="icon"
type="image/png"
sizes="32x32"
href="/Content/Images/Icons/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="/Content/Images/Icons/favicon-16x16.png"
/>
<link rel="manifest" href="/Content/Images/Icons/manifest.json" />
<link
rel="mask-icon"
href="/Content/Images/Icons/safari-pinned-tab.svg"
color="#00ccff"
/>
<link
rel="shortcut icon"
type="image/ico"
href="/favicon.ico"
data-no-hash
/>
<meta
name="msapplication-config"
content="/Content/Images/Icons/browserconfig.xml"
/>
<link rel="stylesheet" type="text/css" href="/Content/styles.css"> <link rel="stylesheet" type="text/css" href="/Content/styles.css" />
<link rel="stylesheet" type="text/css" href="/Content/Fonts/fonts.css" />
<title>Login - Sonarr</title> <title>Login - Sonarr</title>
@ -30,7 +56,8 @@
body { body {
background-color: #f5f7fa; background-color: #f5f7fa;
color: #656565; color: #656565;
font-family: "Roboto", "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Roboto", "open sans", "Helvetica Neue", Helvetica, Arial,
sans-serif;
} }
.center { .center {
@ -90,7 +117,8 @@
.form-input:focus { .form-input:focus {
outline: 0; outline: 0;
border-color: #66afe9; border-color: #66afe9;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
0 0 8px rgba(102, 175, 233, 0.6);
} }
.button { .button {
@ -172,7 +200,7 @@
<div class="content"> <div class="content">
<div class="panel"> <div class="panel">
<div class="panel-header"> <div class="panel-header">
<img src="/Content/Images/logo.svg" alt="Image" class="logo"> <img src="/Content/Images/logo.svg" alt="Image" class="logo" />
</div> </div>
<div class="panel-body"> <div class="panel-body">
@ -180,22 +208,53 @@
SIGN IN TO CONTINUE SIGN IN TO CONTINUE
</div> </div>
<form role="form" data-parsley-validate="" novalidate="" class="mb-lg" method="POST"> <form
role="form"
data-parsley-validate=""
novalidate=""
class="mb-lg"
method="POST"
>
<div class="form-group"> <div class="form-group">
<input type="email" name="username" class="form-input" placeholder="Username" autocomplete="off" pattern=".{1,}" required title="User name is required" autoFocus="true"> <input
type="email"
name="username"
class="form-input"
placeholder="Username"
autocomplete="off"
pattern=".{1,}"
required
title="User name is required"
autoFocus="true"
/>
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="password" name="password" class="form-input" placeholder="Password" required> <input
type="password"
name="password"
class="form-input"
placeholder="Password"
required
/>
</div> </div>
<div class="remember-me-container"> <div class="remember-me-container">
<span class="remember-me"> <span class="remember-me">
<input type="checkbox" name="rememberMe" id="rememberMe" checked="checked"> <input
type="checkbox"
name="rememberMe"
id="rememberMe"
checked="checked"
/>
<label for="rememberMe">Remember Me</label> <label for="rememberMe">Remember Me</label>
</span> </span>
<a href="https://github.com/Sonarr/Sonarr/wiki/Forgot-my-Password" class="forgot-password">Forgot your password?</a> <a
href="https://github.com/Sonarr/Sonarr/wiki/Forgot-my-Password"
class="forgot-password"
>Forgot your password?</a
>
</div> </div>
<button type="submit" class="button">Login</button> <button type="submit" class="button">Login</button>
@ -217,16 +276,16 @@
</body> </body>
<script type="text/javascript"> <script type="text/javascript">
var yearSpan = document.getElementById('year'); var yearSpan = document.getElementById("year");
yearSpan.innerHTML = '2010-' + new Date().getFullYear(); yearSpan.innerHTML = "2010-" + new Date().getFullYear();
var copyDiv = document.getElementById('copy'); var copyDiv = document.getElementById("copy");
copyDiv.classList.remove('hidden'); copyDiv.classList.remove("hidden");
if (window.location.search.indexOf('loginFailed=true') > -1) { if (window.location.search.indexOf("loginFailed=true") > -1) {
var loginFailedDiv = document.getElementById('login-failed'); var loginFailedDiv = document.getElementById("login-failed");
loginFailedDiv.classList.remove('hidden'); loginFailedDiv.classList.remove("hidden");
} }
</script> </script>
</html> </html>