Skip to content

Commit

Permalink
Iterate on the introduction of Inter
Browse files Browse the repository at this point in the history
Small styling changes here and there. Among other things, the background is now less "blue".
  • Loading branch information
ivarnakken committed Jan 29, 2023
1 parent 2ee5763 commit c60dcce
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 59 deletions.
2 changes: 1 addition & 1 deletion app/components/Footer/index.tsx
Expand Up @@ -130,7 +130,7 @@ const Footer = ({ loggedIn }: Props) => (
Informasjonskapsler (cookies)
</Link>
<Link to="/pages/personvern/124-personvernserklring">
Personvernserklæring
Personvernerklæring
</Link>
<span>© {moment().year()} Abakus</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/components/Header/toggleTheme.css
Expand Up @@ -16,7 +16,7 @@
}

.moon:hover {
color: var(--color-blue-1);
color: var(--color-blue-8);
}

.sun:hover {
Expand Down
5 changes: 2 additions & 3 deletions app/components/RandomQuote/RandomQuote.css
Expand Up @@ -13,9 +13,8 @@
}

.quoteText {
font-weight: 600;
font-weight: 500;
font-size: 15px;
color: var(--color-dark-gray-3);
}

.quoteReactions {
Expand All @@ -32,5 +31,5 @@

.rotateIcon {
transform: rotate(360deg);
transition: 1s;
transition: var(--easing-slow);
}
2 changes: 0 additions & 2 deletions app/routes/overview/components/ArticleItem.css
Expand Up @@ -19,8 +19,6 @@
margin: 0 5px;
line-height: 1.1;
font-size: 1.2rem;
letter-spacing: 2px;
text-transform: uppercase;
word-break: break-word;
}

Expand Down
1 change: 1 addition & 0 deletions app/routes/overview/components/LatestReadme.css
Expand Up @@ -7,6 +7,7 @@
.heading {
font-size: 27px;
width: 100%;
color: var(--lego-font-color);
}

.thumb {
Expand Down
50 changes: 22 additions & 28 deletions app/routes/quotes/components/AddQuote.tsx
Expand Up @@ -52,40 +52,34 @@ const AddQuote = ({

<div className={styles.clear} />

<Button
type="submit"
className={styles.submitQuote}
disabled={disabledButton}
>
<Button type="submit" disabled={disabledButton}>
Send inn sitat
</Button>
</form>
</div>

<h2>Forhåndsvisning</h2>
<div className={styles.outerPreview}>
<h2>OVERHØRT</h2>
<div className={styles.innerPreview}>
<RandomQuote
fetchRandomQuote={() => Promise.resolve()}
addReaction={() => Promise.resolve()}
deleteReaction={() => Promise.resolve()}
fetchEmojis={() => Promise.resolve()}
fetchingEmojis={false}
emojis={[]}
currentQuote={{
id: 1,
text: text || 'Det er bare å gjøre det',
source: source || 'Esso',
approved: true,
contentTarget: '',
reactionsGrouped: [],
reactions: [],
}}
loggedIn={true}
useReactions={false}
/>
</div>
<h3 className="u-ui-heading">Overhørt</h3>
<div className={styles.innerPreview}>
<RandomQuote
fetchRandomQuote={() => Promise.resolve()}
addReaction={() => Promise.resolve()}
deleteReaction={() => Promise.resolve()}
fetchEmojis={() => Promise.resolve()}
fetchingEmojis={false}
emojis={[]}
currentQuote={{
id: 1,
text: text || 'Det er bare å gjøre det',
source: source || 'Esso',
approved: true,
contentTarget: '',
reactionsGrouped: [],
reactions: [],
}}
loggedIn={true}
useReactions={false}
/>
</div>
</div>
);
Expand Down
1 change: 0 additions & 1 deletion app/routes/quotes/components/Quote.tsx
Expand Up @@ -21,7 +21,6 @@ type Props = {
displayAdmin: boolean;
currentUser: any;
loggedIn: boolean;
emojis: Array<EmojiEntity>;
addReaction: (arg0: { emoji: string; contentTarget: string }) => Promise<any>;
deleteReaction: (arg0: {
reactionId: ID;
Expand Down
24 changes: 2 additions & 22 deletions app/routes/quotes/components/Quotes.css
Expand Up @@ -41,18 +41,9 @@
font-weight: 600;
}

.submitQuote {
padding: 10px 20px;
font-size: 14px;
margin: 10px 0 50px;
}

.submitQuote:disabled {
color: var(--color-mono-gray-3);
}

.addQuote {
max-width: 550px;
margin-bottom: 3rem;
}

.addQuote label {
Expand Down Expand Up @@ -148,7 +139,7 @@
}

.singleQuote h3 a:hover {
color: var(--color-orange-3);
color: var(--color-orange-6);
}

.quoteDefault {
Expand Down Expand Up @@ -264,19 +255,8 @@
}
}

.outerPreview {
background: var(--lego-background-color);
border-radius: 10px;
width: 560px;
padding: 100px;
}

.innerPreview {
composes: withShadow from '~app/styles/utilities.css';
background: var(--lego-card-color);
width: 360px;
border-radius: 10px;
padding: 10px;
}

.select {
Expand Down
2 changes: 1 addition & 1 deletion app/styles/variables.css
Expand Up @@ -4,7 +4,7 @@
@custom-media --lego-max-width (max-width: 1100px);

:root {
--lego-background-color: #f9fafe;
--lego-background-color: #fefefe;
--lego-font-color: var(--color-gray-1);
--lego-link-color: #c0392b;
--lego-red: #c0392b;
Expand Down

0 comments on commit c60dcce

Please sign in to comment.