Skip to content

Commit

Permalink
Merge branch 'master' into language-rewrite
Browse files Browse the repository at this point in the history
  • Loading branch information
Herkarl committed Jul 2, 2024
2 parents 0d8e606 + 8afa534 commit c8f8db0
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"express": "^4.18.2",
"is-in-browser": "^2.0.0",
"lodash": "^4.17.21",
"methone": "datasektionen/Methone",
"methone": "github:datasektionen/Methone",
"razzle": "^4.2.18",
"razzle-heroku": "^3.0.0",
"react": "^18.3.1",
Expand Down
10 changes: 9 additions & 1 deletion src/components/Frontpage/FixMe.css
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,19 @@ a.action {
text-align: center;
margin: 20px auto 0;
}
a.action:hover, a.action:focus {
background: #ec5f99;
border-bottom: 4px solid #e83d84;
}
.inline_link {
color: #e83d84;
text-decoration: underline !important;
}

.inline_link:hover,
.inline_link:focus {
color: #ec5f99;
text-decoration: underline !important;
}
#footer {
background: #333333;
margin: -50px 0;
Expand Down
15 changes: 14 additions & 1 deletion src/components/Frontpage/Frontpage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@
color: #828ca2;
}

.content.hero .more-btn:hover {
.content.hero .more-btn:hover,
.content.hero .more-btn:focus {
transform: scale(1.05);
box-shadow: 0 3px 3px rgba(0, 0, 0, .1);
}
Expand Down Expand Up @@ -129,6 +130,12 @@
text-shadow: 1px 1px #fff;
margin: 20px;
text-transform: uppercase;
transition: color 0.1s ease-out;
}

.content .news h2:hover,
.content .news h2:focus {
color: #ec5f99;
}

.content .news ul {
Expand All @@ -151,6 +158,12 @@
overflow: hidden;
text-overflow: ellipsis;
color: #6a758f;
transition: color 0.1s ease-out;
}

.content .news ul li h3:hover,
.content .news ul li h3:focus {
color: #4a5164;
}

.content .news ul div {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Frontpage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Translate, English, Swedish } from '../Translate'

import styles from './Frontpage.module.css'
import skold from './skold.svg'
import EventCalendar, { getWeekTimeSpan } from '../EventCalendar/index.jsx';
import EventCalendar, { getWeekTimeSpan } from '../EventCalendar';
import './FixMe.css'
import { addLangToUrl } from '../../utility/lang.js'

Expand Down
2 changes: 1 addition & 1 deletion src/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ server
<meta name="msapplication-TileColor" content="#e83d84">
<meta name="msapplication-TileImage" content="/icons/ms-icon-144x144.png">
<meta name="theme-color" content="#e83d84">
<link rel="stylesheet" href="//aurora.datasektionen.se/">
<link rel="stylesheet" href="https://aurora.datasektionen.se/">
${assets.client.css
? `<link rel="stylesheet" href="${assets.client.css}">`
: ''
Expand Down

0 comments on commit c8f8db0

Please sign in to comment.