diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index c0e6fba..27b7a62 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -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;
diff --git a/app/javascript/stylesheets/base.scss b/app/javascript/stylesheets/base.scss
index 1ca5f51..d33fb96 100644
--- a/app/javascript/stylesheets/base.scss
+++ b/app/javascript/stylesheets/base.scss
@@ -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;
}
}
diff --git a/app/javascript/stylesheets/buttons.scss b/app/javascript/stylesheets/buttons.scss
index bb76577..75fd400 100644
--- a/app/javascript/stylesheets/buttons.scss
+++ b/app/javascript/stylesheets/buttons.scss
@@ -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;
}
}
diff --git a/app/javascript/stylesheets/tailwind.config.js b/app/javascript/stylesheets/tailwind.config.js
index c24557e..b8407c9 100644
--- a/app/javascript/stylesheets/tailwind.config.js
+++ b/app/javascript/stylesheets/tailwind.config.js
@@ -13,7 +13,7 @@ module.exports = {
theme: {
extend: {
fontFamily: {
- heading: ['Raleway']
+ sans: ['Open Sans', 'sans-serif']
}
},
},
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 378a47e..df44f3b 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -4,14 +4,12 @@
Admin Panel | Kosmos Accounts
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
-
-
+
<%= 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' %>
-
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9be387d..33ff55b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,14 +4,12 @@
Kosmos Accounts
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
-
-
+
<%= 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' %>
-
diff --git a/app/views/layouts/signup.html.erb b/app/views/layouts/signup.html.erb
index 0f7a658..8d36e38 100644
--- a/app/views/layouts/signup.html.erb
+++ b/app/views/layouts/signup.html.erb
@@ -4,14 +4,12 @@
Sign up | Kosmos Accounts
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
-
-
+
<%= 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' %>
-