Merge remote-tracking branch 'airsonic/pr/922'
This commit is contained in:
@@ -14,8 +14,6 @@
|
||||
<!-- Included before airsonic stylesheet to allow overriding -->
|
||||
<link type="text/css" rel="stylesheet" href="<c:url value="/script/mediaelement/mediaelementplayer.min.css"/>">
|
||||
<link rel="stylesheet" href="<c:url value="/${styleSheet}"/>" type="text/css">
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu&subset=latin,cyrillic-ext,greek-ext,greek,latin-ext,cyrillic" type="text/css"/>
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400,300,400italic,500,300italic,500italic,700,700italic,100,100italic" type="text/css"/>
|
||||
<title>Airsonic</title>
|
||||
|
||||
<!-- Import Mousetrap and enable shortcuts if necessary -->
|
||||
|
||||
@@ -83,19 +83,6 @@ body {
|
||||
scrollbar-darkshadow-color: #98AAB1;
|
||||
}
|
||||
|
||||
body, form, label, table, a {
|
||||
font-family: 'Roboto', arial, sans-serif;
|
||||
}
|
||||
|
||||
h1, h1 a {
|
||||
font-family: 'Ubuntu', arial, sans-serif;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
h2, h2 a, .topHeader a {
|
||||
font-family: 'Roboto', arial, sans-serif;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
/* Login page */
|
||||
|
||||
@@ -156,6 +143,7 @@ body {
|
||||
padding:0;
|
||||
border:0;
|
||||
margin:0.75em;
|
||||
font-family: Verdana, Tahoma, Geneva, arial, sans-serif;
|
||||
font-size: 10.5pt;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user