Commit b22ad9a
Style/main header (#149)
* 헤더 변경, 마이페이지,로그인 반영
스타일 변경
# Conflicts:
# src/main/java/org/ezcode/codetest/presentation/view/ViewController.java
# src/main/resources/static/css/header.css
# src/main/resources/static/css/test-login.css
# src/main/resources/static/css/test-main.css
# src/main/resources/static/html/header.html
# src/main/resources/templates/test-login.html
# src/main/resources/templates/test-main.html
* style: 로그인 로그아웃 hover 헤더 변경
* fix:chatting
* dasd
* chore : ui 변경
---------
Co-authored-by: minjee2758 <[email protected]>
Co-authored-by: thezz9 <[email protected]>1 parent a15e29a commit b22ad9a
File tree
3 files changed
+74
-9
lines changed- src/main/resources
- static/html
- templates
3 files changed
+74
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
47 | 63 | | |
48 | 64 | | |
49 | 65 | | |
50 | 66 | | |
51 | | - | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
52 | 70 | | |
53 | 71 | | |
54 | 72 | | |
| |||
76 | 94 | | |
77 | 95 | | |
78 | 96 | | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
79 | 109 | | |
80 | 110 | | |
81 | 111 | | |
| |||
93 | 123 | | |
94 | 124 | | |
95 | 125 | | |
96 | | - | |
| 126 | + | |
97 | 127 | | |
98 | 128 | | |
99 | 129 | | |
| |||
115 | 145 | | |
116 | 146 | | |
117 | 147 | | |
118 | | - | |
| 148 | + | |
119 | 149 | | |
120 | 150 | | |
121 | 151 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| |||
199 | 200 | | |
200 | 201 | | |
201 | 202 | | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
202 | 211 | | |
203 | 212 | | |
204 | 213 | | |
| |||
213 | 222 | | |
214 | 223 | | |
215 | 224 | | |
| 225 | + | |
216 | 226 | | |
217 | 227 | | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
222 | 232 | | |
223 | | - | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
224 | 236 | | |
225 | 237 | | |
226 | 238 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
346 | 346 | | |
347 | 347 | | |
348 | 348 | | |
349 | | - | |
| 349 | + | |
| 350 | + | |
350 | 351 | | |
351 | 352 | | |
352 | 353 | | |
| 354 | + | |
353 | 355 | | |
354 | 356 | | |
355 | 357 | | |
| |||
689 | 691 | | |
690 | 692 | | |
691 | 693 | | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
692 | 705 | | |
693 | 706 | | |
694 | 707 | | |
| |||
1032 | 1045 | | |
1033 | 1046 | | |
1034 | 1047 | | |
| 1048 | + | |
| 1049 | + | |
| 1050 | + | |
| 1051 | + | |
| 1052 | + | |
| 1053 | + | |
| 1054 | + | |
| 1055 | + | |
| 1056 | + | |
| 1057 | + | |
1035 | 1058 | | |
1036 | 1059 | | |
1037 | 1060 | | |
| |||
0 commit comments