diff --git a/.editorconfig b/.editorconfig index ff7e2f1..1707d87 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,17 +1,11 @@ -# EditorConfig helps developers define and maintain consistent -# coding styles between different editors and IDEs # editorconfig.org - root = true - [*] - # Change these settings to your own preference indent_style = space -indent_size = 4 +indent_size = 2 max_line_length = 120 - # We recommend you to keep these unchanged end_of_line = lf charset = utf-8 @@ -20,7 +14,3 @@ insert_final_newline = true [*.md] trim_trailing_whitespace = false - -[package.json] -indent_style = space -indent_size = 2 diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..75383b3 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +app/main.css \ No newline at end of file diff --git a/app/index.html b/app/index.html index 1d6501b..c017816 100644 --- a/app/index.html +++ b/app/index.html @@ -1,15 +1,14 @@ - - + EDB-gjengen, Medieavdelingen, Chateau Neuf, Det Norske Studentersamfund - + - +
-

- EDB-gjengen logo EDB-gjengen -

- Medieavdelingen, Det Norske Studentersamfund, Chateau Neuf, - Oslo +

EDB-gjengen logo EDB-gjengen

+ Medieavdelingen, Det Norske Studentersamfund, Chateau Neuf, Oslo
-

Kontaktinfo

- +

Kontaktinfo

+
- +
-

Verktøy

- - +

Verktøy

+
-

Bli med

-
- -
+

Bli med

+
+ +
- Laget med av - EDB-gjengen + Laget med av + EDB-gjengen
- - - \ No newline at end of file + + diff --git a/app/main.scss b/app/main.scss index e15ac86..9b3fe4e 100644 --- a/app/main.scss +++ b/app/main.scss @@ -4,13 +4,17 @@ --primary-color-light: hsl(211deg 100% 60%); } +// FIXME: use CSS props for media query breakpoints +$small: 540px; +$large: 992px; + body { font-family: monospace; text-align: center; font-size: 110%; margin: 1rem; - @media screen and (min-width: 540px) { + @media screen and (min-width: $small) { text-align: left; } } @@ -68,7 +72,7 @@ a { .cta { display: block; - @media screen and (min-width: 540px) { + @media screen and (min-width: $small) { display: none; } } @@ -91,13 +95,13 @@ a { padding: 0; max-width: var(--container-width); - @media screen and (min-width: 540px) { + @media screen and (min-width: $small) { display: grid; gap: 2rem; grid-template-columns: repeat(2, 1fr); } - @media screen and (min-width: 992px) { + @media screen and (min-width: $large) { grid-template-columns: repeat(3, 1fr); }