Skip to content

Commit ff32287

Browse files
authored
Merge pull request #258 from Web-Dev-Path/refactor/to-scss-Container
Refactor/to scss container
2 parents 2f4160f + 5b0f869 commit ff32287

6 files changed

Lines changed: 15 additions & 16 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
168168
- BlogPostsContainer
169169
- RevealContentContainer
170170
- Member
171+
- Container
171172

172173
- Updated ContactUsForm's checkbox wrapper from div to label to enhance its accessibility
173174
- Updated SearchInput width to 100% for better styling
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@use '@/styles/variables' as *;
2+
3+
.container {
4+
margin: 0 auto;
5+
width: 90%;
6+
max-width: $large-desktop-breakpoint;
7+
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import S from './styles';
1+
import styles from './Container.module.scss';
22

3-
export default function Container({ className, children, styles }) {
3+
export default function Container({ className, children, style }) {
44
return (
5-
<S.Container className={className} style={styles}>
5+
<div className={`${styles.container} ${className || ''}`} style={style}>
66
{children}
7-
</S.Container>
7+
</div>
88
);
99
}

components/containers/Container/styles.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

components/containers/Member/Member.module.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@use '@/styles/mixins' as *;
2+
@use '@/styles/variables' as *;
23

34
.card {
45
margin: 1rem 1rem 0 0.5rem;
@@ -25,15 +26,15 @@
2526

2627
.name {
2728
font-style: italic;
28-
font-family: var(--font-heading);
29+
font-family: $heading-font;
2930
font-size: 1.5rem;
3031
color: var(--color-primary-content);
3132
margin-bottom: 0px;
3233
line-height: unset;
3334
}
3435

3536
%headingStyle {
36-
font-family: var(--font-heading);
37+
font-family: $heading-font;
3738
font-size: 1rem;
3839
color: var(--color-primary-content);
3940
text-align: left;

styles/themes.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
--color-box-shadow: rgba(0, 0, 0, 0.08);
1212
--dark-bg: #023047;
1313
--error: #be1313;
14-
--font-heading: 'Open Sans';
1514
}
1615

1716
// placeholder colors

0 commit comments

Comments
 (0)