kosmos/akkounts
kosmos/akkounts
8
1
Fork 0
Code Issues 19 Pull Requests 1 Actions Packages Releases 12 Activity

Merge pull request 'Switch to shared Kosmos font(s)' (#30) from feature/webfonts_open-sans into master
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #30
This commit is contained in:
Râu Cao 2021-02-25 17:11:39 +00:00
commit 088961dfec
7 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/stylesheets/layout.scss
View File

@ -18,7 +18,6 @@
} }
h1 { h1 {
font-size: 1.8rem;
color: #fff; color: #fff;
span.project-name { span.project-name {
@ -28,8 +27,7 @@
span.icon { span.icon {
svg { svg {
display: inline-block; display: inline-block;
height: 1.8rem; height: 1.875rem;
margin-top: -0.1rem;
vertical-align: top; vertical-align: top;
width: auto; width: auto;
} }
@ -85,18 +83,6 @@ main {
margin: 3rem auto; margin: 3rem auto;
} }
h2, h3 {
margin-bottom: 1.5em;
}
h2 {
font-size: 1.5rem;
}
h3 {
font-size: 1.25rem;
}
p { p {
line-height: 1.5rem; line-height: 1.5rem;
margin-bottom: 1rem; margin-bottom: 1rem;

19
app/javascript/stylesheets/base.scss
View File

@ -1,20 +1,21 @@
@layer base { @layer base {
@font-face {
font-family: 'Raleway';
src: url('/fonts/raleway-light.woff') format('woff2');
font-weight: 300;
font-style: normal;
}
body { body {
line-height: 1; line-height: 1;
} }
h1, h2, h3 { h1, h2, h3 {
@apply font-heading font-light; @apply font-light;
} }
h1 { h1 {
@apply uppercase; @apply text-3xl uppercase;
}
h2 {
@apply text-2xl mb-8;
}
h3 {
@apply text-xl mb-6;
} }
} }

6
app/javascript/stylesheets/buttons.scss
View File

@ -16,16 +16,16 @@
.btn-gray { .btn-gray {
@apply bg-gray-100 hover:bg-gray-200 @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 { .btn-blue {
@apply bg-blue-500 hover:bg-blue-600 text-white @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 { .btn-red {
@apply bg-red-600 hover:bg-red-700 text-white @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;
} }
} }

2
app/javascript/stylesheets/tailwind.config.js
View File

@ -13,7 +13,7 @@ module.exports = {
theme: { theme: {
extend: { extend: {
fontFamily: { fontFamily: {
heading: ['Raleway'] sans: ['Open Sans', 'sans-serif']
} }
}, },
}, },

4
app/views/layouts/admin.html.erb
View File

@ -4,14 +4,12 @@
<title>Admin Panel | Kosmos Accounts</title> <title>Admin Panel | Kosmos Accounts</title>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<%= csp_meta_tag %> <%= csp_meta_tag %>
<meta name="viewport" content="width=device-width, initial-scale=1"> <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_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_pack_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' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body id="admin-panel"> <body id="admin-panel">
<div id="wrapper"> <div id="wrapper">
<header> <header>

4
app/views/layouts/application.html.erb
View File

@ -4,14 +4,12 @@
<title>Kosmos Accounts</title> <title>Kosmos Accounts</title>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<%= csp_meta_tag %> <%= csp_meta_tag %>
<meta name="viewport" content="width=device-width, initial-scale=1"> <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_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_pack_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' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body> <body>
<div id="wrapper"> <div id="wrapper">
<header> <header>

4
app/views/layouts/signup.html.erb
View File

@ -4,14 +4,12 @@
<title>Sign up | Kosmos Accounts</title> <title>Sign up | Kosmos Accounts</title>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<%= csp_meta_tag %> <%= csp_meta_tag %>
<meta name="viewport" content="width=device-width, initial-scale=1"> <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_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_pack_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' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="layout-signup"> <body class="layout-signup">
<div id="wrapper"> <div id="wrapper">
<header> <header>