Merge pull request 'Switch to shared Kosmos font(s)' (#30) from feature/webfonts_open-sans into master
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Reviewed-on: #30
This commit is contained in:
commit
088961dfec
|
@ -18,7 +18,6 @@
|
|||
}
|
||||
|
||||
h1 {
|
||||
font-size: 1.8rem;
|
||||
color: #fff;
|
||||
|
||||
span.project-name {
|
||||
|
@ -28,8 +27,7 @@
|
|||
span.icon {
|
||||
svg {
|
||||
display: inline-block;
|
||||
height: 1.8rem;
|
||||
margin-top: -0.1rem;
|
||||
height: 1.875rem;
|
||||
vertical-align: top;
|
||||
width: auto;
|
||||
}
|
||||
|
@ -85,18 +83,6 @@ main {
|
|||
margin: 3rem auto;
|
||||
}
|
||||
|
||||
h2, h3 {
|
||||
margin-bottom: 1.5em;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 1.25rem;
|
||||
}
|
||||
|
||||
p {
|
||||
line-height: 1.5rem;
|
||||
margin-bottom: 1rem;
|
||||
|
|
|
@ -1,20 +1,21 @@
|
|||
@layer base {
|
||||
@font-face {
|
||||
font-family: 'Raleway';
|
||||
src: url('/fonts/raleway-light.woff') format('woff2');
|
||||
font-weight: 300;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
body {
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
h1, h2, h3 {
|
||||
@apply font-heading font-light;
|
||||
@apply font-light;
|
||||
}
|
||||
|
||||
h1 {
|
||||
@apply uppercase;
|
||||
@apply text-3xl uppercase;
|
||||
}
|
||||
|
||||
h2 {
|
||||
@apply text-2xl mb-8;
|
||||
}
|
||||
|
||||
h3 {
|
||||
@apply text-xl mb-6;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,16 +16,16 @@
|
|||
|
||||
.btn-gray {
|
||||
@apply bg-gray-100 hover:bg-gray-200
|
||||
focus:ring-gray-300 focus:ring-opacity-75;
|
||||
focus:ring-gray-300 focus:ring-opacity-75;
|
||||
}
|
||||
|
||||
.btn-blue {
|
||||
@apply bg-blue-500 hover:bg-blue-600 text-white
|
||||
focus:ring-blue-400 focus:ring-opacity-75;
|
||||
focus:ring-blue-400 focus:ring-opacity-75;
|
||||
}
|
||||
|
||||
.btn-red {
|
||||
@apply bg-red-600 hover:bg-red-700 text-white
|
||||
focus:ring-red-500 focus:ring-opacity-75;
|
||||
focus:ring-red-500 focus:ring-opacity-75;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ module.exports = {
|
|||
theme: {
|
||||
extend: {
|
||||
fontFamily: {
|
||||
heading: ['Raleway']
|
||||
sans: ['Open Sans', 'sans-serif']
|
||||
}
|
||||
},
|
||||
},
|
||||
|
|
|
@ -4,14 +4,12 @@
|
|||
<title>Admin Panel | Kosmos Accounts</title>
|
||||
<%= csrf_meta_tags %>
|
||||
<%= csp_meta_tag %>
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<link href="https://assets.kosmos.org/fonts/open-sans/open-sans.css" rel="stylesheet">
|
||||
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
|
||||
<%= stylesheet_pack_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
|
||||
<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
|
||||
</head>
|
||||
|
||||
<body id="admin-panel">
|
||||
<div id="wrapper">
|
||||
<header>
|
||||
|
|
|
@ -4,14 +4,12 @@
|
|||
<title>Kosmos Accounts</title>
|
||||
<%= csrf_meta_tags %>
|
||||
<%= csp_meta_tag %>
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<link href="https://assets.kosmos.org/fonts/open-sans/open-sans.css" rel="stylesheet">
|
||||
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
|
||||
<%= stylesheet_pack_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
|
||||
<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="wrapper">
|
||||
<header>
|
||||
|
|
|
@ -4,14 +4,12 @@
|
|||
<title>Sign up | Kosmos Accounts</title>
|
||||
<%= csrf_meta_tags %>
|
||||
<%= csp_meta_tag %>
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<link href="https://assets.kosmos.org/fonts/open-sans/open-sans.css" rel="stylesheet">
|
||||
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
|
||||
<%= stylesheet_pack_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
|
||||
<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
|
||||
</head>
|
||||
|
||||
<body class="layout-signup">
|
||||
<div id="wrapper">
|
||||
<header>
|
||||
|
|
Loading…
Reference in New Issue