Skip to content

Commit

Permalink
Merge pull request #139 from roodjong/feature/add-admin-link
Browse files Browse the repository at this point in the history
Various improvements and fixes
  • Loading branch information
Nowa-Ammerlaan authored Jan 28, 2024
2 parents 9fb311a + fd5d2fa commit f99328b
Show file tree
Hide file tree
Showing 31 changed files with 207 additions and 312 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ORGANIZATION_EMAIL='[email protected]'
NOREPLY_ADDRESS='[email protected]'
HOMEPAGE='roodjongeren.nl'
ORGANIZATION_NAME_SHORT='ROOD'
ORG_LOGO='assets/image/rood-jongeren.svg'
ORG_LOGO='assets/image/logo.png'
PRIVACY_POLICY_URL='https://roodjongeren.nl/privacybeleid/'
LISTMONK_URL='https://listmonk.roodjongeren.nl/admin'

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ID will be incremented because of auto-increment options in the database.

Go to `http://localhost:8080/` and you should be greeted by the MijnRood login page.

You can log in with `admindebaas@localhost` as email, and `admin` as password.
You can log in with `admindebaas@example.com` as email, and `admin` as password.
Look at `src/DataFixtures/` to see an overview of all test data, including other accounts.

## License
Expand Down
Binary file added assets/image/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion assets/image/mijn-rood-jongeren.svg

This file was deleted.

1 change: 0 additions & 1 deletion assets/image/rood-jongeren.svg

This file was deleted.

57 changes: 1 addition & 56 deletions assets/style/common.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@desktop: ~"only screen and (min-width: 901px)";
@tablet: ~"only screen and (min-width: 601px) and (max-width: 900px)";
@mobile: ~"only screen and (max-width: 600px)";
@mobile: ~"only screen and (max-width: 900px)";

*, *::before, *::after {
box-sizing: border-box;
Expand Down Expand Up @@ -58,56 +56,3 @@ h1, h2, h3 {
}
}
}

// .incomes {
// input[type="radio"] {
// -webkit-appearance: none;
// background-color: #fff;
// appearance: none;
// background-color: #fff;
// margin: 0;
// font: inherit;
// width: 1.5em;
// height: 1.5em;
// border: 0.2em solid @rood;
// border-radius: 50%;
// display: grid;
// place-content: center;
// }
// input[type="radio"]::before {
// content: "";
// width: 0.65em;
// height: 0.65em;
// border-radius: 50%;
// transform: scale(0);
// transition: 120ms transform ease-in-out;
// box-shadow: inset 1em 1em @rood;
// }
// input[type="radio"]:checked::before {
// transform: scale(1);
// }
// .option {
// margin-left: 20px;
// line-height: 1.5;
// display: grid;
// grid-template-columns: 1em auto;
// gap: 1em;
// }
// .option + .option {
// margin-top: .75em;
// }
// .options {
// margin-top: .75em;
// margin-bottom: 0.75em;
// }
// .other-amount {
// margin-left: 40px;
// input {
// margin-left: 8px;
// }
// }
// .submit-button {
// margin-top: 20px;
// margin-bottom: 20px;
// }
// }
Loading

0 comments on commit f99328b

Please sign in to comment.