Commit @9771f7cf6912e9ad2c9b82dc40670a25714305b2

이은진 2024-09-11

240911 이은진 학업일정계획 css 수정

@9771f7cf6912e9ad2c9b82dc40670a25714305b2

20aa779

9771f7c

client/resources/css/reset.css

--- client/resources/css/reset.css

+++ client/resources/css/reset.css


 @charset "utf-8";
 
 @font-face {
-	font-family: 'Pretendard-Bold';
-    src: url('../font/Pretendard-Bold.otf') format('opentype');
+  font-family: "Pretendard-Bold";
+  src: url("../font/Pretendard-Bold.otf") format("opentype");
 }
 @font-face {
-	font-family: 'Pretendard-Black';
-    src: url('../font/Pretendard-Black.otf') format('opentype');
+  font-family: "Pretendard-Black";
+  src: url("../font/Pretendard-Black.otf") format("opentype");
 }
 @font-face {
-	font-family: 'Pretendard-ExtraBold';
-    src: url('../font/Pretendard-ExtraBold.otf') format('opentype');
+  font-family: "Pretendard-ExtraBold";
+  src: url("../font/Pretendard-ExtraBold.otf") format("opentype");
 }
 @font-face {
-	font-family: 'Pretendard-ExtraLight';
-    src: url('../font/Pretendard-ExtraLight.otf') format('opentype');
+  font-family: "Pretendard-ExtraLight";
+  src: url("../font/Pretendard-ExtraLight.otf") format("opentype");
 }
 @font-face {
-	font-family: 'Pretendard-Light';
-    src: url('../font/Pretendard-Light.otf') format('opentype');
+  font-family: "Pretendard-Light";
+  src: url("../font/Pretendard-Light.otf") format("opentype");
 }
 @font-face {
-	font-family: 'Pretendard-Medium';
-    src: url('../font/Pretendard-Medium.otf') format('opentype');
+  font-family: "Pretendard-Medium";
+  src: url("../font/Pretendard-Medium.otf") format("opentype");
 }
 @font-face {
-	font-family: 'Pretendard-Regular';
-    src: url('../font/Pretendard-Regular.otf') format('opentype');
+  font-family: "Pretendard-Regular";
+  src: url("../font/Pretendard-Regular.otf") format("opentype");
 }
 @font-face {
-	font-family: 'Pretendard-SemiBold';
-    src: url('../font/Pretendard-SemiBold.otf') format('opentype');
+  font-family: "Pretendard-SemiBold";
+  src: url("../font/Pretendard-SemiBold.otf") format("opentype");
 }
 @font-face {
-	font-family: 'Pretendard-Thin';
-    src: url('../font/Pretendard-Thin.otf') format('opentype');
-}
-
-
-@font-face {
-	font-family: 'ONEMobilePOP';
-    src: url('../font/ONEMobilePOP.ttf') format('truetype');
-}
-@font-face {
-	font-family: 'ONEMobileOTF-Regular';
-    src: url('../font/ONEMobileOTF-Regular.otf') format('opentype');
-}
-@font-face {
-	font-family: 'ONEMobileOTF-Light';
-    src: url('../font/ONEMobileOTF-Light.otf') format('opentype');
-}
-@font-face {
-	font-family: 'ONEMobileOTF-Bold';
-    src: url('../font/ONEMobileOTF-Bold.otf') format('opentype');
-}
-@font-face {
-	font-family: 'ONEMobilePOPOTF';
-    src: url('../font/ONEMobilePOPOTF.otf') format('opentype');
+  font-family: "Pretendard-Thin";
+  src: url("../font/Pretendard-Thin.otf") format("opentype");
 }
 
 @font-face {
-	font-family: 'neodgm';
-    src: url('../font/neodgm.ttf') format('truetype');
+  font-family: "ONEMobilePOP";
+  src: url("../font/ONEMobilePOP.ttf") format("truetype");
+}
+@font-face {
+  font-family: "ONEMobileOTF-Regular";
+  src: url("../font/ONEMobileOTF-Regular.otf") format("opentype");
+}
+@font-face {
+  font-family: "ONEMobileOTF-Light";
+  src: url("../font/ONEMobileOTF-Light.otf") format("opentype");
+}
+@font-face {
+  font-family: "ONEMobileOTF-Bold";
+  src: url("../font/ONEMobileOTF-Bold.otf") format("opentype");
+}
+@font-face {
+  font-family: "ONEMobilePOPOTF";
+  src: url("../font/ONEMobilePOPOTF.otf") format("opentype");
+}
+
+@font-face {
+  font-family: "neodgm";
+  src: url("../font/neodgm.ttf") format("truetype");
 }
 
 * {
-    padding: 0;
-    margin: 0;
-    box-sizing: border-box;
+  padding: 0;
+  margin: 0;
+  box-sizing: border-box;
 }
 
-html, body, #root, #app{height: 100%;}
+html,
+body,
+#root,
+#app {
+  height: 100%;
+}
 html,
 body,
 #root {
-    font-size: 10px;
-    color: #2E2F30;
-    font-family: 'ONEMobileOTF-Regular';
-    
+  font-size: 10px;
+  color: #2e2f30;
+  font-family: "ONEMobileOTF-Regular";
 }
 html,
-body{ background-color: #eaedf4;}
-body{position:relative;text-align: left; overflow-x: hidden; width: 1920px;}
-::-webkit-scrollbar {width: 10px; height: 10px;}
-::-webkit-scrollbar-track {border-radius: 5px;background-color: #EAEDF4;}
-::-webkit-scrollbar-thumb {	border-radius: 5px; background-color: #FFBA08;}
-#root, #app{
-    /* height: 100%;  */
-   }
-input, select, span,p, label {
-    font-size: 16px;
+body {
+  background-color: #eaedf4;
 }
-input::placeholder{color: #8C8E92;}
-input[type="text"]{ padding:10px 20px; width: 100%; }
-input#file-upload-button{padding: 10px ;} 
-  
-button{
-    border: none;
-    background-color: transparent;
-    cursor: pointer;
+body {
+  position: relative;
+  text-align: left;
+  overflow-x: hidden;
+  width: 1920px;
 }
-textarea{resize: none; border: 0; outline: 0; font-size: 20px; font-family: 'ONEMobileOTF-Regular';}
+::-webkit-scrollbar {
+  width: 7px;
+  height: 10px;
+}
+::-webkit-scrollbar-track {
+  border-radius: 5px;
+  background-color: #eaedf4;
+}
+::-webkit-scrollbar-thumb {
+  border-radius: 5px;
+  background-color: #ffba08;
+}
+#root,
+#app {
+  /* height: 100%;  */
+}
+input,
+select,
+span,
+p,
+label {
+  font-size: 16px;
+}
+input::placeholder {
+  color: #8c8e92;
+}
+input[type="text"] {
+  padding: 10px 20px;
+  width: 100%;
+}
+input#file-upload-button {
+  padding: 10px;
+}
 
-a{text-decoration: none; color: #2E2F30;}
+button {
+  border: none;
+  background-color: transparent;
+  cursor: pointer;
+}
+textarea {
+  resize: none;
+  border: 0;
+  outline: 0;
+  font-size: 20px;
+  font-family: "ONEMobileOTF-Regular";
+}
+
+a {
+  text-decoration: none;
+  color: #2e2f30;
+}
 
 table {
-    font-size: 20px;
-    width: 100%;
-    border-collapse: collapse;
-    table-layout: fixed;
-border: 0;}
-thead{background-color: #eaedf4;}
-tbody tr{border-bottom: #eaedf4 1px solid; cursor: pointer;}
-td{padding: 10px ; text-align: center;} 
+  font-size: 20px;
+  width: 100%;
+  border-collapse: collapse;
+  table-layout: fixed;
+  border: 0;
+}
+thead {
+  background-color: #eaedf4;
+}
+tbody tr {
+  border-bottom: #eaedf4 1px solid;
+  cursor: pointer;
+}
+td {
+  padding: 10px;
+  text-align: center;
+}
 
 /* .btn-upload {
     width: 100px;

   
   #file {
     display: none;
-  } */
+  } */

20aa779

9771f7c

client/views/pages/main/MyPlan.vue

--- client/views/pages/main/MyPlan.vue

+++ client/views/pages/main/MyPlan.vue


                 <div class="text">
                     <p class="title1" style="color: #fff;">스케줄</p>
                 </div>
-                <div class="purple-scroll" style="overflow: auto; height: 85%;">
+                <div class="purple-scroll" style="overflow: auto; height: 85%; margin: 5px">
                     <div style="padding: 10px 20px;">
                         <p style="text-align: right;cursor: pointer;text-decoration: underline;padding-bottom: 5px;"
                             class="title2" @click="goToPage2('MyPlan2')">학습 일정 변경하기</p>

                         <div class="text">
                             <p class="title1" style="color: #fff;">오늘의 뉴스</p>
                         </div>
-                        <div class="green-scroll" style="overflow: auto; height: 75%;">
+                        <div class="green-scroll" style="overflow: auto; height: 73%; margin: 5px;">
                             <div style=" padding: 10px;">
                                 <div v-for="(news, index) in schedules" :key="index">
                                     <div style="display: flex;">

Add a comment

Open 0
Closed 0

List

...	...	@@ -1,118 +1,167 @@
1	1	@charset "utf-8";
2	2
3	3	@font-face {
4		- font-family: 'Pretendard-Bold';
5		- src: url('../font/Pretendard-Bold.otf') format('opentype');
	4	+ font-family: "Pretendard-Bold";
	5	+ src: url("../font/Pretendard-Bold.otf") format("opentype");
6	6	}
7	7	@font-face {
8		- font-family: 'Pretendard-Black';
9		- src: url('../font/Pretendard-Black.otf') format('opentype');
	8	+ font-family: "Pretendard-Black";
	9	+ src: url("../font/Pretendard-Black.otf") format("opentype");
10	10	}
11	11	@font-face {
12		- font-family: 'Pretendard-ExtraBold';
13		- src: url('../font/Pretendard-ExtraBold.otf') format('opentype');
	12	+ font-family: "Pretendard-ExtraBold";
	13	+ src: url("../font/Pretendard-ExtraBold.otf") format("opentype");
14	14	}
15	15	@font-face {
16		- font-family: 'Pretendard-ExtraLight';
17		- src: url('../font/Pretendard-ExtraLight.otf') format('opentype');
	16	+ font-family: "Pretendard-ExtraLight";
	17	+ src: url("../font/Pretendard-ExtraLight.otf") format("opentype");
18	18	}
19	19	@font-face {
20		- font-family: 'Pretendard-Light';
21		- src: url('../font/Pretendard-Light.otf') format('opentype');
	20	+ font-family: "Pretendard-Light";
	21	+ src: url("../font/Pretendard-Light.otf") format("opentype");
22	22	}
23	23	@font-face {
24		- font-family: 'Pretendard-Medium';
25		- src: url('../font/Pretendard-Medium.otf') format('opentype');
	24	+ font-family: "Pretendard-Medium";
	25	+ src: url("../font/Pretendard-Medium.otf") format("opentype");
26	26	}
27	27	@font-face {
28		- font-family: 'Pretendard-Regular';
29		- src: url('../font/Pretendard-Regular.otf') format('opentype');
	28	+ font-family: "Pretendard-Regular";
	29	+ src: url("../font/Pretendard-Regular.otf") format("opentype");
30	30	}
31	31	@font-face {
32		- font-family: 'Pretendard-SemiBold';
33		- src: url('../font/Pretendard-SemiBold.otf') format('opentype');
	32	+ font-family: "Pretendard-SemiBold";
	33	+ src: url("../font/Pretendard-SemiBold.otf") format("opentype");
34	34	}
35	35	@font-face {
36		- font-family: 'Pretendard-Thin';
37		- src: url('../font/Pretendard-Thin.otf') format('opentype');
38		-}
39		-
40		-
41		-@font-face {
42		- font-family: 'ONEMobilePOP';
43		- src: url('../font/ONEMobilePOP.ttf') format('truetype');
44		-}
45		-@font-face {
46		- font-family: 'ONEMobileOTF-Regular';
47		- src: url('../font/ONEMobileOTF-Regular.otf') format('opentype');
48		-}
49		-@font-face {
50		- font-family: 'ONEMobileOTF-Light';
51		- src: url('../font/ONEMobileOTF-Light.otf') format('opentype');
52		-}
53		-@font-face {
54		- font-family: 'ONEMobileOTF-Bold';
55		- src: url('../font/ONEMobileOTF-Bold.otf') format('opentype');
56		-}
57		-@font-face {
58		- font-family: 'ONEMobilePOPOTF';
59		- src: url('../font/ONEMobilePOPOTF.otf') format('opentype');
	36	+ font-family: "Pretendard-Thin";
	37	+ src: url("../font/Pretendard-Thin.otf") format("opentype");
60	38	}
61	39
62	40	@font-face {
63		- font-family: 'neodgm';
64		- src: url('../font/neodgm.ttf') format('truetype');
	41	+ font-family: "ONEMobilePOP";
	42	+ src: url("../font/ONEMobilePOP.ttf") format("truetype");
	43	+}
	44	+@font-face {
	45	+ font-family: "ONEMobileOTF-Regular";
	46	+ src: url("../font/ONEMobileOTF-Regular.otf") format("opentype");
	47	+}
	48	+@font-face {
	49	+ font-family: "ONEMobileOTF-Light";
	50	+ src: url("../font/ONEMobileOTF-Light.otf") format("opentype");
	51	+}
	52	+@font-face {
	53	+ font-family: "ONEMobileOTF-Bold";
	54	+ src: url("../font/ONEMobileOTF-Bold.otf") format("opentype");
	55	+}
	56	+@font-face {
	57	+ font-family: "ONEMobilePOPOTF";
	58	+ src: url("../font/ONEMobilePOPOTF.otf") format("opentype");
	59	+}
	60	+
	61	+@font-face {
	62	+ font-family: "neodgm";
	63	+ src: url("../font/neodgm.ttf") format("truetype");
65	64	}
66	65
67	66	* {
68		- padding: 0;
69		- margin: 0;
70		- box-sizing: border-box;
	67	+ padding: 0;
	68	+ margin: 0;
	69	+ box-sizing: border-box;
71	70	}
72	71
73		-html, body, #root, #app{height: 100%;}
	72	+html,
	73	+body,
	74	+#root,
	75	+#app {
	76	+ height: 100%;
	77	+}
74	78	html,
75	79	body,
76	80	#root {
77		- font-size: 10px;
78		- color: #2E2F30;
79		- font-family: 'ONEMobileOTF-Regular';
80		-
	81	+ font-size: 10px;
	82	+ color: #2e2f30;
	83	+ font-family: "ONEMobileOTF-Regular";
81	84	}
82	85	html,
83		-body{ background-color: #eaedf4;}
84		-body{position:relative;text-align: left; overflow-x: hidden; width: 1920px;}
85		-::-webkit-scrollbar {width: 10px; height: 10px;}
86		-::-webkit-scrollbar-track {border-radius: 5px;background-color: #EAEDF4;}
87		-::-webkit-scrollbar-thumb { border-radius: 5px; background-color: #FFBA08;}
88		-#root, #app{
89		- /* height: 100%; */
90		- }
91		-input, select, span,p, label {
92		- font-size: 16px;
	86	+body {
	87	+ background-color: #eaedf4;
93	88	}
94		-input::placeholder{color: #8C8E92;}
95		-input[type="text"]{ padding:10px 20px; width: 100%; }
96		-input#file-upload-button{padding: 10px ;}
97		-
98		-button{
99		- border: none;
100		- background-color: transparent;
101		- cursor: pointer;
	89	+body {
	90	+ position: relative;
	91	+ text-align: left;
	92	+ overflow-x: hidden;
	93	+ width: 1920px;
102	94	}
103		-textarea{resize: none; border: 0; outline: 0; font-size: 20px; font-family: 'ONEMobileOTF-Regular';}
	95	+::-webkit-scrollbar {
	96	+ width: 7px;
	97	+ height: 10px;
	98	+}
	99	+::-webkit-scrollbar-track {
	100	+ border-radius: 5px;
	101	+ background-color: #eaedf4;
	102	+}
	103	+::-webkit-scrollbar-thumb {
	104	+ border-radius: 5px;
	105	+ background-color: #ffba08;
	106	+}
	107	+#root,
	108	+#app {
	109	+ /* height: 100%; */
	110	+}
	111	+input,
	112	+select,
	113	+span,
	114	+p,
	115	+label {
	116	+ font-size: 16px;
	117	+}
	118	+input::placeholder {
	119	+ color: #8c8e92;
	120	+}
	121	+input[type="text"] {
	122	+ padding: 10px 20px;
	123	+ width: 100%;
	124	+}
	125	+input#file-upload-button {
	126	+ padding: 10px;
	127	+}
104	128
105		-a{text-decoration: none; color: #2E2F30;}
	129	+button {
	130	+ border: none;
	131	+ background-color: transparent;
	132	+ cursor: pointer;
	133	+}
	134	+textarea {
	135	+ resize: none;
	136	+ border: 0;
	137	+ outline: 0;
	138	+ font-size: 20px;
	139	+ font-family: "ONEMobileOTF-Regular";
	140	+}
	141	+
	142	+a {
	143	+ text-decoration: none;
	144	+ color: #2e2f30;
	145	+}
106	146
107	147	table {
108		- font-size: 20px;
109		- width: 100%;
110		- border-collapse: collapse;
111		- table-layout: fixed;
112		-border: 0;}
113		-thead{background-color: #eaedf4;}
114		-tbody tr{border-bottom: #eaedf4 1px solid; cursor: pointer;}
115		-td{padding: 10px ; text-align: center;}
	148	+ font-size: 20px;
	149	+ width: 100%;
	150	+ border-collapse: collapse;
	151	+ table-layout: fixed;
	152	+ border: 0;
	153	+}
	154	+thead {
	155	+ background-color: #eaedf4;
	156	+}
	157	+tbody tr {
	158	+ border-bottom: #eaedf4 1px solid;
	159	+ cursor: pointer;
	160	+}
	161	+td {
	162	+ padding: 10px;
	163	+ text-align: center;
	164	+}
116	165
117	166	/* .btn-upload {
118	167	width: 100px;
...	...	@@ -132,4 +181,4 @@
132	181
133	182	#file {
134	183	display: none;
135		- } */ (No newline at end of file)
	184	+ } */

...	...	@@ -6,7 +6,7 @@
6	6	<div class="text">
7	7	<p class="title1" style="color: #fff;">스케줄</p>
8	8	</div>
9		- <div class="purple-scroll" style="overflow: auto; height: 85%;">
	9	+ <div class="purple-scroll" style="overflow: auto; height: 85%; margin: 5px">
10	10	<div style="padding: 10px 20px;">
11	11	<p style="text-align: right;cursor: pointer;text-decoration: underline;padding-bottom: 5px;"
12	12	class="title2" @click="goToPage2('MyPlan2')">학습 일정 변경하기</p>
...	...	@@ -135,7 +135,7 @@
135	135	<div class="text">
136	136	<p class="title1" style="color: #fff;">오늘의 뉴스</p>
137	137	</div>
138		- <div class="green-scroll" style="overflow: auto; height: 75%;">
	138	+ <div class="green-scroll" style="overflow: auto; height: 73%; margin: 5px;">
139	139	<div style=" padding: 10px;">
140	140	<div v-for="(news, index) in schedules" :key="index">
141	141	<div style="display: flex;">

Delete comment