김대철 / CafeRecommend

Go to a project
Toggle navigation Toggle navigation pinning
최정민
be2a3391 1 parent 0cf09c75

REFACTOR : jquery boostrap 버전관리

Expand all
Inline Side-by-side
Showing 33 changed files with 219 additions and 84 deletions
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
1 /*! 1 /*!
2 - * Bootstrap Reboot v4.4.1 (https://getbootstrap.com/) 2 + * Bootstrap Reboot v5.0.0-alpha1 (https://getbootstrap.com/)
3 - * Copyright 2011-2019 The Bootstrap Authors 3 + * Copyright 2011-2020 The Bootstrap Authors
4 - * Copyright 2011-2019 Twitter, Inc. 4 + * Copyright 2011-2020 Twitter, Inc.
5 - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) 5 + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
6 * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md) 6 * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
7 */ 7 */
8 *, 8 *,
...@@ -11,26 +11,16 @@ ...@@ -11,26 +11,16 @@
11 box-sizing: border-box; 11 box-sizing: border-box;
12 } 12 }
13 13
14 -html {
15 - font-family: sans-serif;
16 - line-height: 1.15;
17 - -webkit-text-size-adjust: 100%;
18 - -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
19 -}
20 -
21 -article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
22 - display: block;
23 -}
24 -
25 body { 14 body {
26 margin: 0; 15 margin: 0;
27 - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; 16 + font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
28 font-size: 1rem; 17 font-size: 1rem;
29 font-weight: 400; 18 font-weight: 400;
30 line-height: 1.5; 19 line-height: 1.5;
31 color: #212529; 20 color: #212529;
32 - text-align: left;
33 background-color: #fff; 21 background-color: #fff;
22 + -webkit-text-size-adjust: 100%;
23 + -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
34 } 24 }
35 25
36 [tabindex="-1"]:focus:not(:focus-visible) { 26 [tabindex="-1"]:focus:not(:focus-visible) {
...@@ -38,14 +28,70 @@ body { ...@@ -38,14 +28,70 @@ body {
38 } 28 }
39 29
40 hr { 30 hr {
41 - box-sizing: content-box; 31 + margin: 1rem 0;
42 - height: 0; 32 + color: inherit;
43 - overflow: visible; 33 + background-color: currentColor;
34 + border: 0;
35 + opacity: 0.25;
36 +}
37 +
38 +hr:not([size]) {
39 + height: 1px;
44 } 40 }
45 41
46 h1, h2, h3, h4, h5, h6 { 42 h1, h2, h3, h4, h5, h6 {
47 margin-top: 0; 43 margin-top: 0;
48 margin-bottom: 0.5rem; 44 margin-bottom: 0.5rem;
45 + font-weight: 500;
46 + line-height: 1.2;
47 +}
48 +
49 +h1 {
50 + font-size: calc(1.375rem + 1.5vw);
51 +}
52 +
53 +@media (min-width: 1200px) {
54 + h1 {
55 + font-size: 2.5rem;
56 + }
57 +}
58 +
59 +h2 {
60 + font-size: calc(1.325rem + 0.9vw);
61 +}
62 +
63 +@media (min-width: 1200px) {
64 + h2 {
65 + font-size: 2rem;
66 + }
67 +}
68 +
69 +h3 {
70 + font-size: calc(1.3rem + 0.6vw);
71 +}
72 +
73 +@media (min-width: 1200px) {
74 + h3 {
75 + font-size: 1.75rem;
76 + }
77 +}
78 +
79 +h4 {
80 + font-size: calc(1.275rem + 0.3vw);
81 +}
82 +
83 +@media (min-width: 1200px) {
84 + h4 {
85 + font-size: 1.5rem;
86 + }
87 +}
88 +
89 +h5 {
90 + font-size: 1.25rem;
91 +}
92 +
93 +h6 {
94 + font-size: 1rem;
49 } 95 }
50 96
51 p { 97 p {
...@@ -59,7 +105,6 @@ abbr[data-original-title] { ...@@ -59,7 +105,6 @@ abbr[data-original-title] {
59 -webkit-text-decoration: underline dotted; 105 -webkit-text-decoration: underline dotted;
60 text-decoration: underline dotted; 106 text-decoration: underline dotted;
61 cursor: help; 107 cursor: help;
62 - border-bottom: 0;
63 -webkit-text-decoration-skip-ink: none; 108 -webkit-text-decoration-skip-ink: none;
64 text-decoration-skip-ink: none; 109 text-decoration-skip-ink: none;
65 } 110 }
...@@ -71,6 +116,11 @@ address { ...@@ -71,6 +116,11 @@ address {
71 } 116 }
72 117
73 ol, 118 ol,
119 +ul {
120 + padding-left: 2rem;
121 +}
122 +
123 +ol,
74 ul, 124 ul,
75 dl { 125 dl {
76 margin-top: 0; 126 margin-top: 0;
...@@ -103,13 +153,18 @@ strong { ...@@ -103,13 +153,18 @@ strong {
103 } 153 }
104 154
105 small { 155 small {
106 - font-size: 80%; 156 + font-size: 0.875em;
157 +}
158 +
159 +mark {
160 + padding: 0.2em;
161 + background-color: #fcf8e3;
107 } 162 }
108 163
109 sub, 164 sub,
110 sup { 165 sup {
111 position: relative; 166 position: relative;
112 - font-size: 75%; 167 + font-size: 0.75em;
113 line-height: 0; 168 line-height: 0;
114 vertical-align: baseline; 169 vertical-align: baseline;
115 } 170 }
...@@ -123,22 +178,15 @@ sup { ...@@ -123,22 +178,15 @@ sup {
123 } 178 }
124 179
125 a { 180 a {
126 - color: #007bff; 181 + color: #0d6efd;
127 - text-decoration: none;
128 - background-color: transparent;
129 -}
130 -
131 -a:hover {
132 - color: #0056b3;
133 text-decoration: underline; 182 text-decoration: underline;
134 } 183 }
135 184
136 -a:not([href]) { 185 +a:hover {
137 - color: inherit; 186 + color: #024dbc;
138 - text-decoration: none;
139 } 187 }
140 188
141 -a:not([href]):hover { 189 +a:not([href]):not([class]), a:not([href]):not([class]):hover {
142 color: inherit; 190 color: inherit;
143 text-decoration: none; 191 text-decoration: none;
144 } 192 }
...@@ -152,44 +200,83 @@ samp { ...@@ -152,44 +200,83 @@ samp {
152 } 200 }
153 201
154 pre { 202 pre {
203 + display: block;
155 margin-top: 0; 204 margin-top: 0;
156 margin-bottom: 1rem; 205 margin-bottom: 1rem;
157 overflow: auto; 206 overflow: auto;
207 + font-size: 0.875em;
208 + -ms-overflow-style: scrollbar;
158 } 209 }
159 210
160 -figure { 211 +pre code {
161 - margin: 0 0 1rem; 212 + font-size: inherit;
213 + color: inherit;
214 + word-break: normal;
162 } 215 }
163 216
164 -img { 217 +code {
165 - vertical-align: middle; 218 + font-size: 0.875em;
166 - border-style: none; 219 + color: #d63384;
220 + word-wrap: break-word;
167 } 221 }
168 222
223 +a > code {
224 + color: inherit;
225 +}
226 +
227 +kbd {
228 + padding: 0.2rem 0.4rem;
229 + font-size: 0.875em;
230 + color: #fff;
231 + background-color: #212529;
232 + border-radius: 0.2rem;
233 +}
234 +
235 +kbd kbd {
236 + padding: 0;
237 + font-size: 1em;
238 + font-weight: 700;
239 +}
240 +
241 +figure {
242 + margin: 0 0 1rem;
243 +}
244 +
245 +img,
169 svg { 246 svg {
170 - overflow: hidden;
171 vertical-align: middle; 247 vertical-align: middle;
172 } 248 }
173 249
174 table { 250 table {
251 + caption-side: bottom;
175 border-collapse: collapse; 252 border-collapse: collapse;
176 } 253 }
177 254
178 caption { 255 caption {
179 - padding-top: 0.75rem; 256 + padding-top: 0.5rem;
180 - padding-bottom: 0.75rem; 257 + padding-bottom: 0.5rem;
181 color: #6c757d; 258 color: #6c757d;
182 text-align: left; 259 text-align: left;
183 - caption-side: bottom;
184 } 260 }
185 261
186 th { 262 th {
187 text-align: inherit; 263 text-align: inherit;
264 + text-align: -webkit-match-parent;
265 +}
266 +
267 +thead,
268 +tbody,
269 +tfoot,
270 +tr,
271 +td,
272 +th {
273 + border-color: inherit;
274 + border-style: solid;
275 + border-width: 0;
188 } 276 }
189 277
190 label { 278 label {
191 display: inline-block; 279 display: inline-block;
192 - margin-bottom: 0.5rem;
193 } 280 }
194 281
195 button { 282 button {
...@@ -222,10 +309,18 @@ select { ...@@ -222,10 +309,18 @@ select {
222 text-transform: none; 309 text-transform: none;
223 } 310 }
224 311
312 +[role="button"] {
313 + cursor: pointer;
314 +}
315 +
225 select { 316 select {
226 word-wrap: normal; 317 word-wrap: normal;
227 } 318 }
228 319
320 +[list]::-webkit-calendar-picker-indicator {
321 + display: none;
322 +}
323 +
229 button, 324 button,
230 [type="button"], 325 [type="button"],
231 [type="reset"], 326 [type="reset"],
...@@ -240,29 +335,12 @@ button:not(:disabled), ...@@ -240,29 +335,12 @@ button:not(:disabled),
240 cursor: pointer; 335 cursor: pointer;
241 } 336 }
242 337
243 -button::-moz-focus-inner, 338 +::-moz-focus-inner {
244 -[type="button"]::-moz-focus-inner,
245 -[type="reset"]::-moz-focus-inner,
246 -[type="submit"]::-moz-focus-inner {
247 padding: 0; 339 padding: 0;
248 border-style: none; 340 border-style: none;
249 } 341 }
250 342
251 -input[type="radio"],
252 -input[type="checkbox"] {
253 - box-sizing: border-box;
254 - padding: 0;
255 -}
256 -
257 -input[type="date"],
258 -input[type="time"],
259 -input[type="datetime-local"],
260 -input[type="month"] {
261 - -webkit-appearance: listbox;
262 -}
263 -
264 textarea { 343 textarea {
265 - overflow: auto;
266 resize: vertical; 344 resize: vertical;
267 } 345 }
268 346
...@@ -274,35 +352,52 @@ fieldset { ...@@ -274,35 +352,52 @@ fieldset {
274 } 352 }
275 353
276 legend { 354 legend {
277 - display: block; 355 + float: left;
278 width: 100%; 356 width: 100%;
279 - max-width: 100%;
280 padding: 0; 357 padding: 0;
281 - margin-bottom: .5rem; 358 + margin-bottom: 0.5rem;
282 - font-size: 1.5rem; 359 + font-size: calc(1.275rem + 0.3vw);
283 line-height: inherit; 360 line-height: inherit;
284 - color: inherit;
285 white-space: normal; 361 white-space: normal;
286 } 362 }
287 363
288 -progress { 364 +@media (min-width: 1200px) {
289 - vertical-align: baseline; 365 + legend {
366 + font-size: 1.5rem;
367 + }
368 +}
369 +
370 +legend + * {
371 + clear: left;
290 } 372 }
291 373
292 -[type="number"]::-webkit-inner-spin-button, 374 +::-webkit-datetime-edit-fields-wrapper,
293 -[type="number"]::-webkit-outer-spin-button { 375 +::-webkit-datetime-edit-text,
376 +::-webkit-datetime-edit-minute,
377 +::-webkit-datetime-edit-hour-field,
378 +::-webkit-datetime-edit-day-field,
379 +::-webkit-datetime-edit-month-field,
380 +::-webkit-datetime-edit-year-field {
381 + padding: 0;
382 +}
383 +
384 +::-webkit-inner-spin-button {
294 height: auto; 385 height: auto;
295 } 386 }
296 387
297 [type="search"] { 388 [type="search"] {
298 outline-offset: -2px; 389 outline-offset: -2px;
299 - -webkit-appearance: none; 390 + -webkit-appearance: textfield;
300 } 391 }
301 392
302 -[type="search"]::-webkit-search-decoration { 393 +::-webkit-search-decoration {
303 -webkit-appearance: none; 394 -webkit-appearance: none;
304 } 395 }
305 396
397 +::-webkit-color-swatch-wrapper {
398 + padding: 0;
399 +}
400 +
306 ::-webkit-file-upload-button { 401 ::-webkit-file-upload-button {
307 font: inherit; 402 font: inherit;
308 -webkit-appearance: button; 403 -webkit-appearance: button;
...@@ -312,13 +407,17 @@ output { ...@@ -312,13 +407,17 @@ output {
312 display: inline-block; 407 display: inline-block;
313 } 408 }
314 409
410 +iframe {
411 + border: 0;
412 +}
413 +
315 summary { 414 summary {
316 display: list-item; 415 display: list-item;
317 cursor: pointer; 416 cursor: pointer;
318 } 417 }
319 418
320 -template { 419 +progress {
321 - display: none; 420 + vertical-align: baseline;
322 } 421 }
323 422
324 [hidden] { 423 [hidden] {
......
This diff could not be displayed because it is too large.
1 /*! 1 /*!
2 - * Bootstrap Reboot v4.4.1 (https://getbootstrap.com/) 2 + * Bootstrap Reboot v5.0.0-alpha1 (https://getbootstrap.com/)
3 - * Copyright 2011-2019 The Bootstrap Authors 3 + * Copyright 2011-2020 The Bootstrap Authors
4 - * Copyright 2011-2019 Twitter, Inc. 4 + * Copyright 2011-2020 Twitter, Inc.
5 - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) 5 + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
6 * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md) 6 * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
7 - */*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus:not(:focus-visible){outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent}a:hover{color:#0056b3;text-decoration:underline}a:not([href]){color:inherit;text-decoration:none}a:not([href]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important} 7 + */*,::after,::before{box-sizing:border-box}body{margin:0;font-family:system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;background-color:#fff;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}[tabindex="-1"]:focus:not(:focus-visible){outline:0!important}hr{margin:1rem 0;color:inherit;background-color:currentColor;border:0;opacity:.25}hr:not([size]){height:1px}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem;font-weight:500;line-height:1.2}h1{font-size:calc(1.375rem + 1.5vw)}@media (min-width:1200px){h1{font-size:2.5rem}}h2{font-size:calc(1.325rem + .9vw)}@media (min-width:1200px){h2{font-size:2rem}}h3{font-size:calc(1.3rem + .6vw)}@media (min-width:1200px){h3{font-size:1.75rem}}h4{font-size:calc(1.275rem + .3vw)}@media (min-width:1200px){h4{font-size:1.5rem}}h5{font-size:1.25rem}h6{font-size:1rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}ol,ul{padding-left:2rem}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:.875em}mark{padding:.2em;background-color:#fcf8e3}sub,sup{position:relative;font-size:.75em;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#0d6efd;text-decoration:underline}a:hover{color:#024dbc}a:not([href]):not([class]),a:not([href]):not([class]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{display:block;margin-top:0;margin-bottom:1rem;overflow:auto;font-size:.875em;-ms-overflow-style:scrollbar}pre code{font-size:inherit;color:inherit;word-break:normal}code{font-size:.875em;color:#d63384;word-wrap:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:.875em;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:1em;font-weight:700}figure{margin:0 0 1rem}img,svg{vertical-align:middle}table{caption-side:bottom;border-collapse:collapse}caption{padding-top:.5rem;padding-bottom:.5rem;color:#6c757d;text-align:left}th{text-align:inherit;text-align:-webkit-match-parent}tbody,td,tfoot,th,thead,tr{border-color:inherit;border-style:solid;border-width:0}label{display:inline-block}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[role=button]{cursor:pointer}select{word-wrap:normal}[list]::-webkit-calendar-picker-indicator{display:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}::-moz-focus-inner{padding:0;border-style:none}textarea{resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{float:left;width:100%;padding:0;margin-bottom:.5rem;font-size:calc(1.275rem + .3vw);line-height:inherit;white-space:normal}@media (min-width:1200px){legend{font-size:1.5rem}}legend+*{clear:left}::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-fields-wrapper,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-text,::-webkit-datetime-edit-year-field{padding:0}::-webkit-inner-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:textfield}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-color-swatch-wrapper{padding:0}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}iframe{border:0}summary{display:list-item;cursor:pointer}progress{vertical-align:baseline}[hidden]{display:none!important}
8 /*# sourceMappingURL=bootstrap-reboot.min.css.map */ 8 /*# sourceMappingURL=bootstrap-reboot.min.css.map */
...\ No newline at end of file ...\ No newline at end of file
......
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
...@@ -148,7 +148,7 @@ function checkAuthenticated(req, res, next) { ...@@ -148,7 +148,7 @@ function checkAuthenticated(req, res, next) {
148 148
149 router.get("/map", (req, res) => { 149 router.get("/map", (req, res) => {
150 if (req.session.user) { 150 if (req.session.user) {
151 - res.render("map"); 151 + res.render("map", {user:req.session.user});
152 } 152 }
153 res.render("map"); 153 res.render("map");
154 }); 154 });
......
1 -{"cookie":{"originalMaxAge":null,"expires":null,"httpOnly":true,"path":"/"},"__lastAccess":1622066597250,"user":{"name":"최정민","email":"cjm104174@gmail.com","nickname":"Mayf","age":"24","gender":"male"}}
...\ No newline at end of file ...\ No newline at end of file
1 +{"cookie":{"originalMaxAge":null,"expires":null,"httpOnly":true,"path":"/"},"__lastAccess":1622068485937,"user":{"name":"최정민","email":"cjm104174@gmail.com","nickname":"Mayf","age":"24","gender":"male"}}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -91,4 +91,5 @@ ...@@ -91,4 +91,5 @@
91 } 91 }
92 </script> 92 </script>
93 <script src="javascripts/bootstrap.js"></script> 93 <script src="javascripts/bootstrap.js"></script>
94 +<script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
94 </html> 95 </html>
......
...@@ -112,4 +112,5 @@ ...@@ -112,4 +112,5 @@
112 } 112 }
113 </script> 113 </script>
114 <script src="javascripts/bootstrap.js"></script> 114 <script src="javascripts/bootstrap.js"></script>
115 + <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
115 </html> 116 </html>
......
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html> 2 <html>
3 <head> 3 <head>
4 - <link rel="stylesheet" href="stylesheets/bootstrap.css" /> 4 + <link rel="stylesheet" href="stylesheets/bootstrap.css">
5 <title>Cafe Map</title> 5 <title>Cafe Map</title>
6 <style> 6 <style>
7 .navbar { 7 .navbar {
...@@ -116,6 +116,9 @@ ...@@ -116,6 +116,9 @@
116 <a class="navbar-brand" href="/"><strong>Home</strong></a> 116 <a class="navbar-brand" href="/"><strong>Home</strong></a>
117 <ul class="navbar-nav mr-auto mt-2 mt-lg-0"> 117 <ul class="navbar-nav mr-auto mt-2 mt-lg-0">
118 <li class="nav-item active"> 118 <li class="nav-item active">
119 + <a class="nav-link" style="color:#ffffff" href="#" data-toggle="modal" data-target="#profile"><%=user.nickname%>'s Profile<span class="sr-only">(current)</span></a>
120 + </li>
121 + <li class="nav-item active">
119 <a 122 <a
120 class="nav-link" 123 class="nav-link"
121 style="color: #ffffff" 124 style="color: #ffffff"
...@@ -130,8 +133,18 @@ ...@@ -130,8 +133,18 @@
130 <div class="pricing-header px-3 py-1 pt-md-3 pb-md-1 mx-auto text-center"> 133 <div class="pricing-header px-3 py-1 pt-md-3 pb-md-1 mx-auto text-center">
131 <h3 class="display-6 font-weight-bold">Map</h3> 134 <h3 class="display-6 font-weight-bold">Map</h3>
132 </div> 135 </div>
136 + <section id="carousel-3" class="text-center">
137 + <div class="row">
138 + <div class="col-1"></div>
139 +
140 + <div class="col-10"><div id="map" style="width: 100%; height: 575px"></div></div>
141 +
142 +
143 + <div class="col-1"></div>
144 + </div>
145 + </section>
146 +
133 147
134 - <div id="map" style="width: 100%; height: 575px"></div>
135 <script 148 <script
136 type="text/javascript" 149 type="text/javascript"
137 src="//dapi.kakao.com/v2/maps/sdk.js?appkey=68cbccbcd6f0fef0a213e62ad37393ee&libraries=services" 150 src="//dapi.kakao.com/v2/maps/sdk.js?appkey=68cbccbcd6f0fef0a213e62ad37393ee&libraries=services"
...@@ -270,5 +283,26 @@ ...@@ -270,5 +283,26 @@
270 </script> 283 </script>
271 <script src="javascripts/bootstrap.js"></script> 284 <script src="javascripts/bootstrap.js"></script>
272 <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script> 285 <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
286 +
287 +
288 + <!-- 모달 바디 -->
289 + <div class="modal fade" id="profile" tabindex="-1" role="dialog" aria-labelledby="profilemodal" aria-hidden="true">
290 + <div class="modal-dialog modal-lg" role="document">
291 + <div class="modal-content">
292 + <div class="modal-header">
293 + <h5 class="modal-title" id="profilemodal"><%=user.nickname%>'s PROFILE</h5>
294 + <button type="button" class="close" data-dismiss="modal" aria-label="Close">
295 + <span aria-hidden="true">&times;</span>
296 + </button>
297 + </div>
298 + <div class="modal-body text-center">
299 + <p>모달바</p>
300 + </div>
301 + <div class="modal-footer">
302 + <button type="button" class="btn btn-primary" data-dismiss="modal">확인</button>
303 + </div>
304 + </div>
305 + </div>
306 + </div>
273 </body> 307 </body>
274 </html> 308 </html>
......