Fixed: Loading of fonts.css with a URL Base

Fixes #854
pull/6/head
Mark McDowall 6 years ago committed by ta264
parent 814e44b7e4
commit 361908d431

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

@ -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="Lidarr"> <meta name="description" content="Lidarr">
<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>Lidarr</title> <title>Lidarr</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>

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

Loading…
Cancel
Save