Skip to content

Commit 0760994

Browse files
committed
css 정리
1 parent fd8816d commit 0760994

File tree

10 files changed

+51
-35
lines changed

10 files changed

+51
-35
lines changed

src/app.scss

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
1-
@import 'normalize.scss';
1+
@import './scss/normalize.scss';
2+
@import './scss/variables.scss';
3+
4+
#app {
5+
min-width: 320px; // iphone5
6+
max-width: 768px; // tablet
7+
margin-left: auto;
8+
margin-right: auto;
9+
}
210

311
.container {
4-
margin: 0 15px 0 15px;
12+
margin-left: $span * 2;
13+
margin-right: $span * 2;
514
}
15+
616
header {
7-
border-bottom: 1px #ccc solid;
8-
padding: 15px 0 15px 0;
17+
border-bottom: 1px solid $border-color;
18+
margin: 0;
919
text-align: center;
1020
}
1121
.content {
12-
border: 1px solid #ccc;
22+
border: 1px solid $border-color;;
1323
}

src/index.html

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,27 @@
22
<html>
33
<head>
44
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
56
<title>검색<%= env %></title>
67
</head>
78
<body>
8-
<header>
9-
<h2 class="container">검색</h2>
10-
</header>
11-
12-
<div class="container">
13-
<form class="FormView">
14-
<input type="text" placeholder="검색어를 입력하세요" autofocus>
15-
<button type="reset" class="btn-reset"></button>
16-
</form>
17-
18-
<div class="content">
19-
<div id="tabs"></div>
20-
<div id="search-keyword"></div>
21-
<div id="search-history"></div>
22-
<div id="search-result"></div>
9+
<div id="app">
10+
<header>
11+
<h2 class="container">검색</h2>
12+
</header>
13+
14+
<div class="container">
15+
<form class="FormView">
16+
<input type="text" placeholder="검색어를 입력하세요" autofocus>
17+
<button type="reset" class="btn-reset"></button>
18+
</form>
19+
20+
<div class="content">
21+
<div id="tabs"></div>
22+
<div id="search-keyword"></div>
23+
<div id="search-history"></div>
24+
<div id="search-result"></div>
25+
</div>
2326
</div>
2427
</div>
2528

src/views/variables.scss renamed to src/scss/mixins.scss

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
$brand-color: #2ac1bc;
2-
$brand-color-light: lighten($brand-color, 30);
3-
$grey-color: #eee;
4-
$grey-color-light: lighten($grey-color, 30);
5-
$grey-color-dark: darken($grey-color, 30);
6-
$white-color: #fff;
7-
$span: 4px;
1+
@import './variables.scss';
82

93
@mixin btn-close {
104
$width: 20px;
File renamed without changes.

src/scss/variables.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
$brand-color: #2ac1bc;
2+
$primary-color: blue;
3+
$secondary-color: #aaa;
4+
$white-color: #fff;
5+
6+
$border-color: lighten($secondary-color, 20);
7+
8+
$span: 4px;
9+

src/views/FormView.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'variables.scss';
1+
@import '../scss/mixins.scss';
22

33

44
.FormView {

src/views/HistoryView.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'variables.scss';
1+
@import '../scss/mixins.scss';
22

33
.HistoryView {
44
@include list();

src/views/KeywordView.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'variables.scss';
1+
@import '../scss/mixins.scss';
22

33
.KeywordView {
44
@include list();

src/views/ResultView.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'variables.scss';
1+
@import '../scss/variables.scss';
22

33
.ResultView {
44
ul {

src/views/TabView.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'variables.scss';
1+
@import '../scss/variables.scss';
22

33
.TabView {
44
display: flex;
@@ -10,9 +10,9 @@
1010
padding: 15px;
1111
text-align: center;
1212
box-sizing: border-box;
13-
border-bottom: 1px solid $grey-color-light;
14-
background-color: $grey-color;
15-
color: $grey-color-dark;
13+
border-bottom: 1px solid $border-color;
14+
background-color: $white-color;
15+
color: $secondary-color;
1616
&:hover {
1717
cursor: pointer;
1818
}

0 commit comments

Comments
 (0)