Skip to content

Commit

Permalink
cleanup css and code
Browse files Browse the repository at this point in the history
  • Loading branch information
sydseter committed Feb 10, 2025
1 parent 65d2e13 commit 4278b6a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 23 deletions.
6 changes: 3 additions & 3 deletions cornucopia.owasp.org/src/error.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
</head>
<body>

<div class="container.desktop-left">
<div class="text.desktop-left">
<div class="error-container.desktop-left">
<div class="error-text.desktop-left">
<h2>Request failed. Even Cornucopia can't cope with infinity ∞</h2>
<p>Status: %sveltekit.status%</p>
<p>Message: %sveltekit.error.message%</p>
</div>
<div class="image">
<div class="error-image">
<img src="/images/cornucopia_logo_in_devs_we_trust.svg" alt="OWASP Cornucopia - In devs we Trust">
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
let mappings: MobileAppMapping = $state({} as MobileAppCardMapping);
let attacks: Attack[] = $state([] as Attack[]);
run(() => {
mappings = controller.getMobileAppCardMappings(card.id.replace('CM', 'COM'));
mappings = controller.getMobileAppCardMappings(card?.id);
attacks = GetCardAttacks(card.id) as Attack[] | Attack[];
});
Expand Down
10 changes: 5 additions & 5 deletions cornucopia.owasp.org/src/lib/services/deckService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ export class DeckService {
let suitName: string = mapping['suits'][suit] != undefined ? mapping['suits'][suit]['name'] : 'WILD CARD';
for(let card in suitObject['cards']) {
let cardObject = suitObject['cards'][card];
cardObject.id = cardObject['id'].replace("COM", "CM");
cardObject.id = cardObject['id'];
cardObject.edition = deck.edition;
cardObject.suitName = suitName.replace("COM", "CM");
cardObject.suitId = suitObject['id'].replace("COM", "CM");
cardObject.suitName = suitName;
cardObject.suitId = suitObject['id'];
cardObject.name = `${cardObject.suitName} (${cardObject.id})`;
cardObject.suit = cardObject.suitName.replaceAll(' ', '-').toLocaleLowerCase();
cardObject.url = `/cards/${cardObject.id}`;
Expand All @@ -140,8 +140,8 @@ export class DeckService {
} else {
cardObject.next = suitObject['cards'][+card+1]['id'];
}
cardObject.prevous = cardObject.prevous.replace("COM", "CM");
cardObject.next = cardObject.next.replace("COM", "CM");
cardObject.prevous = cardObject.prevous;
cardObject.next = cardObject.next;

cards.set(cardObject.id, cardObject);
}
Expand Down
22 changes: 8 additions & 14 deletions cornucopia.owasp.org/static/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ a:visited
aspect-ratio:16/9;
}

.container {
.error-container {
width: 90%;
margin: auto;
padding: 0rem;
Expand All @@ -89,7 +89,7 @@ a:visited
margin-top: 4rem;
}

.text {
.error-text {
outline: 1px rgb(231, 231, 231) solid;
height: 100%;
min-height: 22vw;
Expand All @@ -101,37 +101,31 @@ a:visited
box-shadow: var(--box-shadow);
}

.text.desktop-left {
.error-text.desktop-left {
padding: 1rem 1rem 1rem 2rem;
}

.image {
.error-image {
width: 50%;
text-align: center;
}

img {
width: 80%;
object-fit: cover;
border-radius: .3rem;
}

.container.desktop-left {
.error.desktop-left {
flex-direction: row;
}

@media (max-aspect-ratio: 1/1) {
.container {
.error-container {
flex-direction: column;
}

.image {
.error-image {
width: 90%;
padding: 0;
margin: auto;
}

.text {
.error-text {
padding: 1rem;
height: 100%;
width: calc(100% - 2rem);
Expand Down

0 comments on commit 4278b6a

Please sign in to comment.