Skip to content

Commit

Permalink
Merge pull request #182 from jdwillemse/feat/remove-bootstrap
Browse files Browse the repository at this point in the history
feat: convert scss to css
  • Loading branch information
jdwillemse authored May 16, 2024
2 parents 1f15b60 + 0ae0f78 commit c3dbfb1
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 27 deletions.
2 changes: 1 addition & 1 deletion app/layout.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '../styles/vars.css'
import '../styles/index.css'
import '../styles/main.scss'
import '../styles/main.css'

import Layout from '../components/Layout'
import { Karla } from 'next/font/google'
Expand Down
48 changes: 22 additions & 26 deletions styles/main.scss → styles/main.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
@import '~modern-normalize/modern-normalize.css';

@import './typography.scss';

// html,
// body {
// height: 100%;
// scroll-behavior: smooth;
// }
@import './typography.css';

.app {
width: 100%;
Expand All @@ -15,28 +9,23 @@
16px/1.4375em 'Karla',
sans-serif;
word-break: break-word;
// hyphens: auto;
color: var(--color-dark);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-variant-ligatures: common-ligatures;

* {
box-sizing: border-box;
}
}

a {
position: relative;
color: var(--color-dark);
transition: color 0.2s;
text-decoration: underline;
}

&:hover {
color: var(--color-primary-fallback);
color: var(--color-primary);
text-decoration: inherit;
}
a:hover {
color: var(--color-primary-fallback);
color: var(--color-primary);
text-decoration: inherit;
}

img {
Expand All @@ -63,15 +52,6 @@ img {
.container {
padding-left: 16px;
padding-right: 16px;

@media (min-width: 768px) {
padding-left: 32px;
padding-right: 32px;
}
@media (min-width: 992px) {
padding-left: 72px;
padding-right: 72px;
}
}

@media (min-width: 576px) {
Expand All @@ -83,3 +63,19 @@ img {
grid-column: 4 / span 9;
}
}

@media (min-width: 768px) {
.container-fluid,
.container {
padding-left: 32px;
padding-right: 32px;
}
}

@media (min-width: 992px) {
.container-fluid,
.container {
padding-left: 72px;
padding-right: 72px;
}
}
File renamed without changes.

0 comments on commit c3dbfb1

Please sign in to comment.