Skip to content

Commit

Permalink
Merge pull request #1 from Toy2-team10/TALK-22--feat/layout/styles
Browse files Browse the repository at this point in the history
TALK-22--feat/layout/styles 공통 styles 파일 수정 및 추가
  • Loading branch information
jseo9732 authored Nov 10, 2023
2 parents 8014a4e + 2558fcd commit 21f29b6
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 12 deletions.
26 changes: 20 additions & 6 deletions styles/_mixin.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './variables' as *;
@import '@/styles/variables.scss';

@mixin a11y-hidden() {
position: absolute;
Expand All @@ -10,21 +10,35 @@
clip-path: polygon(0 0, 0 0, 0 0);
}

@mixin container {
max-width: 76.8rem;
width: 100%;
margin: 0 auto;
font-size: $font-size-base;
}

@mixin flex-center-row() {
display: flex;
justify-content: center;
align-items: center;
}

@mixin flex-between-row() {
display: flex;
justify-content: space-between;
align-items: center;
}

@mixin flex-center-col() {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}

@mixin shadow() {
box-shadow:
0 4px 6px -1px rgba(0, 0, 0, 0.1),
0 2px 4px -1px rgba(0, 0, 0, 0.06);
}
@mixin shadow-top() {
box-shadow: 0 0 0.4rem 0 rgba(0, 0, 0, 0.16);
}
@mixin shadow-bottom() {
box-shadow: 0 4px 4px -4px rgba(0, 0, 0, 0.3);
}
21 changes: 15 additions & 6 deletions styles/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
$bg-color: #ff3478;
$text-color: #000;
$font-size-logo: 40px;
$font-size-title: 17px;
$font-size-subtitle: 12px;
$font-size: 14px;
$black: #151515;
$brand-pink: #ff3478;
$brand-blue: #002d79;
$light-pink: #ff5991;
$light-gray: #f2f2f2;
$light-blue: rgba(1, 82, 204, 0.1);
$blue: #0152cc;

$failed: #e74a3b;
$success: #1cc88a;

$font-size-logo: 4rem;
$font-size-lg: 1.7rem;
$font-size-base: 1.4rem;
$font-size-s: 1.2rem;
2 changes: 2 additions & 0 deletions styles/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import '@/styles/variables';
@import '@/styles/mixin';
10 changes: 10 additions & 0 deletions styles/normalize.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
html {
line-height: 1.15; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
font-size: 62.5%;
}

/* Sections
Expand Down Expand Up @@ -76,6 +77,9 @@ pre {

a {
background-color: transparent;
text-decoration: none;
color: #000;
cursor: pointer;
}

/**
Expand Down Expand Up @@ -350,3 +354,9 @@ template {
[hidden] {
display: none;
}

ul {
list-style: none;
margin: 0;
padding: 0;
}

0 comments on commit 21f29b6

Please sign in to comment.