Skip to content

Commit

Permalink
Merge branch 'fix/mainpage' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
eun-hak committed Mar 26, 2024
2 parents c17e5b0 + 6804f23 commit 213f4c4
Showing 1 changed file with 108 additions and 25 deletions.
133 changes: 108 additions & 25 deletions src/app/globals.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~slick-carousel/slick/slick.css";
@import "~slick-carousel/slick/slick.css";
@import "~slick-carousel/slick/slick-theme.css";

:root {
Expand All @@ -25,18 +25,18 @@
--pink: #F67272;

/* -------------- z-index -------------- */
--header-zindex: 2;
--header-zindex: 8;
--bottomnav-zindex: 10;
--dimmed-zindex: 10;
--modal-zindex: 11;
--loader-zindex: 12;

/* --- default padding --- */
--default-padding : 24px
--default-padding: 24px
}

/* 내부 컨텐츠 패딩 */
.mainContainer{
.mainContainer {
padding: 0 var(--default-padding);
}

Expand All @@ -48,19 +48,87 @@
word-break: break-all;
}

html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
html,
body,
div,
span,
applet,
object,
iframe,
h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote,
pre,
a,
abbr,
acronym,
address,
big,
cite,
code,
del,
dfn,
em,
img,
ins,
kbd,
q,
s,
samp,
small,
strike,
strong,
sub,
sup,
tt,
var,
b,
u,
i,
center,
dl,
dt,
dd,
ol,
ul,
li,
fieldset,
form,
label,
legend,
table,
caption,
tbody,
tfoot,
thead,
tr,
th,
td,
article,
aside,
canvas,
details,
embed,
figure,
figcaption,
footer,
header,
hgroup,
menu,
nav,
output,
ruby,
section,
summary,
time,
mark,
audio,
video {
margin: 0;
padding: 0;
border: 0;
Expand All @@ -70,25 +138,38 @@ time, mark, audio, video {
}

/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section {
display: block;
}

body {
line-height: 1;
}

ol, ul {
ol,
ul {
list-style: none;
}

blockquote, q {
blockquote,
q {
quotes: none;
}

blockquote::before, blockquote::after,
q::before, q::after {
blockquote::before,
blockquote::after,
q::before,
q::after {
content: '';
content: none;
}
Expand All @@ -100,7 +181,9 @@ table {

a {
color: inherit;
text-decoration: none; /* no underline */
text-decoration: none;

/* no underline */
}

button {
Expand All @@ -109,7 +192,7 @@ button {
padding: 0;
overflow: visible;
border: none;
border-style:none;
border-style: none;
background: transparent;

/* inherit font & color from ancestor */
Expand Down

0 comments on commit 213f4c4

Please sign in to comment.