1
0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-14 11:23:42 +02:00

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

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 */

View File

@ -1,28 +1,54 @@
<!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" />
<!-- Chrome, Opera, and Firefox OS --> <!-- Chrome, Opera, and Firefox OS -->
<meta name="theme-color" content="#3a3f51"/> <meta name="theme-color" content="#3a3f51" />
<!-- 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>

View File

@ -1,232 +1,291 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<head> <!-- Chrome, Opera, and Firefox OS -->
<meta charset="utf-8"> <meta name="theme-color" content="#3a3f51" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"/> <!-- Windows Phone -->
<meta name="mobile-web-app-capable" content="yes"/> <meta name="msapplication-navbutton-color" content="#3a3f51" />
<meta name="apple-mobile-web-app-capable" content="yes"/>
<!-- Chrome, Opera, and Firefox OS --> <meta name="description" content="Sonarr (Preview)" />
<meta name="theme-color" content="#3a3f51"/>
<!-- Windows Phone -->
<meta name="msapplication-navbutton-color" content="#3a3f51"/>
<meta name="description" content="Sonarr (Preview)"> <link
rel="apple-touch-icon"
sizes="180x180"
href="/Content/Images/Icons/apple-touch-icon.png"
/>
<link
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="apple-touch-icon" sizes="180x180" href="/Content/Images/Icons/apple-touch-icon.png"> <link rel="stylesheet" type="text/css" href="/Content/styles.css" />
<link rel="icon" type="image/png" sizes="32x32" href="/Content/Images/Icons/favicon-32x32.png"> <link rel="stylesheet" type="text/css" href="/Content/Fonts/fonts.css" />
<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"> <title>Login - Sonarr</title>
<title>Login - Sonarr</title> <style>
body {
<style> background-color: #f5f7fa;
body { color: #656565;
background-color: #f5f7fa; font-family: "Roboto", "open sans", "Helvetica Neue", Helvetica, Arial,
color: #656565; sans-serif;
font-family: "Roboto", "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
}
.center {
display: flex;
justify-content: center;
}
.content {
flex: 0 0 325px;
}
.logo {
width: 32px;
height: 32px;
}
.panel {
margin-top: 50px;
border-radius: 4px;
}
.panel-header {
display: flex;
justify-content: center;
padding: 10px;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
background-color: #3a3f51;
}
.panel-body {
padding: 20px;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
background-color: #fff;
}
.sign-in {
padding: 10px 0;
text-align: center;
}
.form-group {
margin: 20px 0;
}
.form-input {
box-sizing: border-box;
padding: 6px 16px;
width: 100%;
height: 35px;
border: 1px solid #dde6e9;
border-radius: 4px;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.form-input:focus {
outline: 0;
border-color: #66afe9;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
}
.button {
overflow: hidden;
margin-top: 20px;
padding: 10px 0;
width: 100%;
border: 1px solid;
border-color: #5899eb;
border-radius: 4px;
background-color: #5d9cec;
color: #fff;
vertical-align: middle;
text-align: center;
white-space: nowrap;
line-height: normal;
}
.button:hover {
border-color: #3483e7;
background-color: #4b91ea;
color: #fff;
text-decoration: none;
}
.copy {
margin-top: 15px;
text-align: center;
font-size: 14px;
}
.remember-me-container {
display: flex;
justify-content: space-between;
line-height: 25px;
}
.remember-me {
font-size: 14px;
}
.forgot-password {
margin-left: auto;
color: #909fa7;
text-decoration: none;
font-size: 13px;
}
.forgot-password:focus,
.forgot-password:hover {
color: #748690;
text-decoration: underline;
}
.forgot-password:visited {
color: #748690;
}
.login-failed {
margin-top: 20px;
color: #f05050;
font-size: 14px;
}
.hidden {
display: none;
}
@media only screen and (min-device-width: 375px) and (max-device-width: 812px) {
.form-input {
font-size: 16px;
} }
}
</style>
</head>
<body> .center {
<div class="center"> display: flex;
<div class="content"> justify-content: center;
<div class="panel"> }
<div class="panel-header">
<img src="/Content/Images/logo.svg" alt="Image" class="logo">
</div>
<div class="panel-body"> .content {
<div class="sign-in"> flex: 0 0 325px;
SIGN IN TO CONTINUE }
.logo {
width: 32px;
height: 32px;
}
.panel {
margin-top: 50px;
border-radius: 4px;
}
.panel-header {
display: flex;
justify-content: center;
padding: 10px;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
background-color: #3a3f51;
}
.panel-body {
padding: 20px;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
background-color: #fff;
}
.sign-in {
padding: 10px 0;
text-align: center;
}
.form-group {
margin: 20px 0;
}
.form-input {
box-sizing: border-box;
padding: 6px 16px;
width: 100%;
height: 35px;
border: 1px solid #dde6e9;
border-radius: 4px;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.form-input:focus {
outline: 0;
border-color: #66afe9;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
0 0 8px rgba(102, 175, 233, 0.6);
}
.button {
overflow: hidden;
margin-top: 20px;
padding: 10px 0;
width: 100%;
border: 1px solid;
border-color: #5899eb;
border-radius: 4px;
background-color: #5d9cec;
color: #fff;
vertical-align: middle;
text-align: center;
white-space: nowrap;
line-height: normal;
}
.button:hover {
border-color: #3483e7;
background-color: #4b91ea;
color: #fff;
text-decoration: none;
}
.copy {
margin-top: 15px;
text-align: center;
font-size: 14px;
}
.remember-me-container {
display: flex;
justify-content: space-between;
line-height: 25px;
}
.remember-me {
font-size: 14px;
}
.forgot-password {
margin-left: auto;
color: #909fa7;
text-decoration: none;
font-size: 13px;
}
.forgot-password:focus,
.forgot-password:hover {
color: #748690;
text-decoration: underline;
}
.forgot-password:visited {
color: #748690;
}
.login-failed {
margin-top: 20px;
color: #f05050;
font-size: 14px;
}
.hidden {
display: none;
}
@media only screen and (min-device-width: 375px) and (max-device-width: 812px) {
.form-input {
font-size: 16px;
}
}
</style>
</head>
<body>
<div class="center">
<div class="content">
<div class="panel">
<div class="panel-header">
<img src="/Content/Images/logo.svg" alt="Image" class="logo" />
</div>
<div class="panel-body">
<div class="sign-in">
SIGN IN TO CONTINUE
</div>
<form
role="form"
data-parsley-validate=""
novalidate=""
class="mb-lg"
method="POST"
>
<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"
/>
</div>
<div class="form-group">
<input
type="password"
name="password"
class="form-input"
placeholder="Password"
required
/>
</div>
<div class="remember-me-container">
<span class="remember-me">
<input
type="checkbox"
name="rememberMe"
id="rememberMe"
checked="checked"
/>
<label for="rememberMe">Remember Me</label>
</span>
<a
href="https://github.com/Sonarr/Sonarr/wiki/Forgot-my-Password"
class="forgot-password"
>Forgot your password?</a
>
</div>
<button type="submit" class="button">Login</button>
<div id="login-failed" class="login-failed hidden">
Incorrect Username or Password
</div>
</form>
</div>
</div> </div>
<form role="form" data-parsley-validate="" novalidate="" class="mb-lg" method="POST"> <div id="copy" class="copy hidden">
<div class="form-group"> <span>&copy;</span>
<input type="email" name="username" class="form-input" placeholder="Username" autocomplete="off" pattern=".{1,}" required title="User name is required" autoFocus="true"> <span id="year"></span>
</div> <span>-</span>
<span>Sonarr</span>
<div class="form-group"> </div>
<input type="password" name="password" class="form-input" placeholder="Password" required>
</div>
<div class="remember-me-container">
<span class="remember-me">
<input type="checkbox" name="rememberMe" id="rememberMe" checked="checked">
<label for="rememberMe">Remember Me</label>
</span>
<a href="https://github.com/Sonarr/Sonarr/wiki/Forgot-my-Password" class="forgot-password">Forgot your password?</a>
</div>
<button type="submit" class="button">Login</button>
<div id="login-failed" class="login-failed hidden">
Incorrect Username or Password
</div>
</form>
</div> </div>
</div> </div>
</body>
<div id="copy" class="copy hidden"> <script type="text/javascript">
<span>&copy;</span> var yearSpan = document.getElementById("year");
<span id="year"></span> yearSpan.innerHTML = "2010-" + new Date().getFullYear();
<span>-</span>
<span>Sonarr</span>
</div>
</div>
</div>
</body>
<script type="text/javascript"> var copyDiv = document.getElementById("copy");
var yearSpan = document.getElementById('year'); copyDiv.classList.remove("hidden");
yearSpan.innerHTML = '2010-' + new Date().getFullYear();
var copyDiv = document.getElementById('copy'); if (window.location.search.indexOf("loginFailed=true") > -1) {
copyDiv.classList.remove('hidden'); var loginFailedDiv = document.getElementById("login-failed");
if (window.location.search.indexOf('loginFailed=true') > -1) { loginFailedDiv.classList.remove("hidden");
var loginFailedDiv = document.getElementById('login-failed'); }
</script>
loginFailedDiv.classList.remove('hidden');
}
</script>
</html> </html>