Showing
4 changed files
with
179 additions
and
104 deletions
... | @@ -2,34 +2,9 @@ | ... | @@ -2,34 +2,9 @@ |
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="ffe1a490-8fdb-4611-8537-4d1c03c40b8d" name="Default" comment=""> | 4 | <list default="true" id="ffe1a490-8fdb-4611-8537-4d1c03c40b8d" name="Default" comment=""> |
5 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/01-large.jpg" beforeDir="false" /> | ||
6 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/01-small.jpg" beforeDir="false" /> | ||
7 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/02-large.jpg" beforeDir="false" /> | ||
8 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/02-small.jpg" beforeDir="false" /> | ||
9 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/03-large.jpg" beforeDir="false" /> | ||
10 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/03-small.jpg" beforeDir="false" /> | ||
11 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/04-large.jpg" beforeDir="false" /> | ||
12 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/04-small.jpg" beforeDir="false" /> | ||
13 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/05-large.jpg" beforeDir="false" /> | ||
14 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/05-small.jpg" beforeDir="false" /> | ||
15 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/06-large.jpg" beforeDir="false" /> | ||
16 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/06-small.jpg" beforeDir="false" /> | ||
17 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/07-large.jpg" beforeDir="false" /> | ||
18 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/07-small.jpg" beforeDir="false" /> | ||
19 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/08-large.jpg" beforeDir="false" /> | ||
20 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/08-small.jpg" beforeDir="false" /> | ||
21 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/09-large.jpg" beforeDir="false" /> | ||
22 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/09-small.jpg" beforeDir="false" /> | ||
23 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/10-large.jpg" beforeDir="false" /> | ||
24 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/10-small.jpg" beforeDir="false" /> | ||
25 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/11-large.jpg" beforeDir="false" /> | ||
26 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/11-small.jpg" beforeDir="false" /> | ||
27 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/12-large.jpg" beforeDir="false" /> | ||
28 | - <change beforePath="$PROJECT_DIR$/public/images/portfolio/12-small.jpg" beforeDir="false" /> | ||
29 | - <change beforePath="$PROJECT_DIR$/public/images/team/01.jpg" beforeDir="false" /> | ||
30 | - <change beforePath="$PROJECT_DIR$/public/images/team/02.jpg" beforeDir="false" /> | ||
31 | - <change beforePath="$PROJECT_DIR$/public/images/team/03.jpg" beforeDir="false" /> | ||
32 | <change beforePath="$PROJECT_DIR$/views/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/index.ejs" afterDir="false" /> | 5 | <change beforePath="$PROJECT_DIR$/views/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/index.ejs" afterDir="false" /> |
6 | + <change beforePath="$PROJECT_DIR$/views/mytoons.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/mytoons.ejs" afterDir="false" /> | ||
7 | + <change beforePath="$PROJECT_DIR$/views/setting.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/setting.ejs" afterDir="false" /> | ||
33 | </list> | 8 | </list> |
34 | <ignored path="$PROJECT_DIR$/out/" /> | 9 | <ignored path="$PROJECT_DIR$/out/" /> |
35 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 10 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
... | @@ -141,7 +116,7 @@ | ... | @@ -141,7 +116,7 @@ |
141 | <usages-collector id="statistics.file.extensions.open"> | 116 | <usages-collector id="statistics.file.extensions.open"> |
142 | <counts> | 117 | <counts> |
143 | <entry key="css" value="2" /> | 118 | <entry key="css" value="2" /> |
144 | - <entry key="ejs" value="6" /> | 119 | + <entry key="ejs" value="8" /> |
145 | <entry key="html" value="1" /> | 120 | <entry key="html" value="1" /> |
146 | <entry key="js" value="9" /> | 121 | <entry key="js" value="9" /> |
147 | </counts> | 122 | </counts> |
... | @@ -149,20 +124,20 @@ | ... | @@ -149,20 +124,20 @@ |
149 | <usages-collector id="statistics.file.types.open"> | 124 | <usages-collector id="statistics.file.types.open"> |
150 | <counts> | 125 | <counts> |
151 | <entry key="CSS" value="2" /> | 126 | <entry key="CSS" value="2" /> |
152 | - <entry key="EJS" value="6" /> | 127 | + <entry key="EJS" value="8" /> |
153 | <entry key="HTML" value="1" /> | 128 | <entry key="HTML" value="1" /> |
154 | <entry key="JavaScript" value="9" /> | 129 | <entry key="JavaScript" value="9" /> |
155 | </counts> | 130 | </counts> |
156 | </usages-collector> | 131 | </usages-collector> |
157 | <usages-collector id="statistics.file.extensions.edit"> | 132 | <usages-collector id="statistics.file.extensions.edit"> |
158 | <counts> | 133 | <counts> |
159 | - <entry key="ejs" value="712" /> | 134 | + <entry key="ejs" value="835" /> |
160 | <entry key="js" value="1398" /> | 135 | <entry key="js" value="1398" /> |
161 | </counts> | 136 | </counts> |
162 | </usages-collector> | 137 | </usages-collector> |
163 | <usages-collector id="statistics.file.types.edit"> | 138 | <usages-collector id="statistics.file.types.edit"> |
164 | <counts> | 139 | <counts> |
165 | - <entry key="EJS" value="712" /> | 140 | + <entry key="EJS" value="835" /> |
166 | <entry key="JavaScript" value="1398" /> | 141 | <entry key="JavaScript" value="1398" /> |
167 | </counts> | 142 | </counts> |
168 | </usages-collector> | 143 | </usages-collector> |
... | @@ -173,8 +148,8 @@ | ... | @@ -173,8 +148,8 @@ |
173 | <file pinned="false" current-in-tab="false"> | 148 | <file pinned="false" current-in-tab="false"> |
174 | <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> | 149 | <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> |
175 | <provider selected="true" editor-type-id="text-editor"> | 150 | <provider selected="true" editor-type-id="text-editor"> |
176 | - <state relative-caret-position="-152"> | 151 | + <state relative-caret-position="494"> |
177 | - <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" /> | 152 | + <caret line="26" column="20" lean-forward="true" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" /> |
178 | </state> | 153 | </state> |
179 | </provider> | 154 | </provider> |
180 | </entry> | 155 | </entry> |
... | @@ -182,8 +157,11 @@ | ... | @@ -182,8 +157,11 @@ |
182 | <file pinned="false" current-in-tab="false"> | 157 | <file pinned="false" current-in-tab="false"> |
183 | <entry file="file://$PROJECT_DIR$/views/mytoons.ejs"> | 158 | <entry file="file://$PROJECT_DIR$/views/mytoons.ejs"> |
184 | <provider selected="true" editor-type-id="text-editor"> | 159 | <provider selected="true" editor-type-id="text-editor"> |
185 | - <state relative-caret-position="-1862"> | 160 | + <state relative-caret-position="475"> |
186 | - <caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" /> | 161 | + <caret line="70" column="8" lean-forward="true" selection-start-line="70" selection-start-column="8" selection-end-line="70" selection-end-column="8" /> |
162 | + <folding> | ||
163 | + <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
164 | + </folding> | ||
187 | </state> | 165 | </state> |
188 | </provider> | 166 | </provider> |
189 | </entry> | 167 | </entry> |
... | @@ -191,17 +169,29 @@ | ... | @@ -191,17 +169,29 @@ |
191 | <file pinned="false" current-in-tab="false"> | 169 | <file pinned="false" current-in-tab="false"> |
192 | <entry file="file://$PROJECT_DIR$/views/index.html"> | 170 | <entry file="file://$PROJECT_DIR$/views/index.html"> |
193 | <provider selected="true" editor-type-id="text-editor"> | 171 | <provider selected="true" editor-type-id="text-editor"> |
194 | - <state relative-caret-position="361"> | 172 | + <state relative-caret-position="-988"> |
195 | - <caret line="28" lean-forward="true" selection-start-line="16" selection-end-line="28" /> | 173 | + <caret line="65" column="34" lean-forward="true" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" /> |
196 | </state> | 174 | </state> |
197 | </provider> | 175 | </provider> |
198 | </entry> | 176 | </entry> |
199 | </file> | 177 | </file> |
200 | <file pinned="false" current-in-tab="true"> | 178 | <file pinned="false" current-in-tab="true"> |
179 | + <entry file="file://$PROJECT_DIR$/views/setting.ejs"> | ||
180 | + <provider selected="true" editor-type-id="text-editor"> | ||
181 | + <state relative-caret-position="469"> | ||
182 | + <caret line="135" lean-forward="true" selection-start-line="135" selection-end-line="135" /> | ||
183 | + <folding> | ||
184 | + <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
185 | + </folding> | ||
186 | + </state> | ||
187 | + </provider> | ||
188 | + </entry> | ||
189 | + </file> | ||
190 | + <file pinned="false" current-in-tab="false"> | ||
201 | <entry file="file://$PROJECT_DIR$/views/index.ejs"> | 191 | <entry file="file://$PROJECT_DIR$/views/index.ejs"> |
202 | <provider selected="true" editor-type-id="text-editor"> | 192 | <provider selected="true" editor-type-id="text-editor"> |
203 | - <state relative-caret-position="127"> | 193 | + <state relative-caret-position="380"> |
204 | - <caret line="101" column="6" selection-start-line="101" selection-start-column="6" selection-end-line="101" selection-end-column="6" /> | 194 | + <caret line="104" column="34" lean-forward="true" selection-start-line="93" selection-start-column="2" selection-end-line="104" selection-end-column="34" /> |
205 | <folding> | 195 | <folding> |
206 | <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 196 | <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
207 | <element signature="n#style#0;n#h1#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#header#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 197 | <element signature="n#style#0;n#h1#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#header#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
... | @@ -287,7 +277,6 @@ | ... | @@ -287,7 +277,6 @@ |
287 | <option value="$PROJECT_DIR$/models/user.js" /> | 277 | <option value="$PROJECT_DIR$/models/user.js" /> |
288 | <option value="$PROJECT_DIR$/package.json" /> | 278 | <option value="$PROJECT_DIR$/package.json" /> |
289 | <option value="$APPLICATION_CONFIG_DIR$/consoles/db/01265fc0-37d6-481f-ac14-42262cda0ac3/console.sql" /> | 279 | <option value="$APPLICATION_CONFIG_DIR$/consoles/db/01265fc0-37d6-481f-ac14-42262cda0ac3/console.sql" /> |
290 | - <option value="$PROJECT_DIR$/views/setting.ejs" /> | ||
291 | <option value="$PROJECT_DIR$/views/toonviewer.html" /> | 280 | <option value="$PROJECT_DIR$/views/toonviewer.html" /> |
292 | <option value="$PROJECT_DIR$/views/toonviewer.ejs" /> | 281 | <option value="$PROJECT_DIR$/views/toonviewer.ejs" /> |
293 | <option value="$PROJECT_DIR$/node_modules/phantomjs/lib/phantom/examples/module.js" /> | 282 | <option value="$PROJECT_DIR$/node_modules/phantomjs/lib/phantom/examples/module.js" /> |
... | @@ -301,6 +290,7 @@ | ... | @@ -301,6 +290,7 @@ |
301 | <option value="$PROJECT_DIR$/routes/index.js" /> | 290 | <option value="$PROJECT_DIR$/routes/index.js" /> |
302 | <option value="$PROJECT_DIR$/views/mytoons.ejs" /> | 291 | <option value="$PROJECT_DIR$/views/mytoons.ejs" /> |
303 | <option value="$PROJECT_DIR$/views/index.ejs" /> | 292 | <option value="$PROJECT_DIR$/views/index.ejs" /> |
293 | + <option value="$PROJECT_DIR$/views/setting.ejs" /> | ||
304 | </list> | 294 | </list> |
305 | </option> | 295 | </option> |
306 | </component> | 296 | </component> |
... | @@ -530,7 +520,7 @@ | ... | @@ -530,7 +520,7 @@ |
530 | <workItem from="1543588884449" duration="7362000" /> | 520 | <workItem from="1543588884449" duration="7362000" /> |
531 | <workItem from="1543625351688" duration="5520000" /> | 521 | <workItem from="1543625351688" duration="5520000" /> |
532 | <workItem from="1543732778568" duration="2000" /> | 522 | <workItem from="1543732778568" duration="2000" /> |
533 | - <workItem from="1543986114264" duration="4823000" /> | 523 | + <workItem from="1543986114264" duration="6680000" /> |
534 | </task> | 524 | </task> |
535 | <task id="LOCAL-00001" summary="초기 commit by intellij"> | 525 | <task id="LOCAL-00001" summary="초기 commit by intellij"> |
536 | <created>1512174269218</created> | 526 | <created>1512174269218</created> |
... | @@ -550,7 +540,7 @@ | ... | @@ -550,7 +540,7 @@ |
550 | <servers /> | 540 | <servers /> |
551 | </component> | 541 | </component> |
552 | <component name="TimeTrackingManager"> | 542 | <component name="TimeTrackingManager"> |
553 | - <option name="totallyTimeSpent" value="236984000" /> | 543 | + <option name="totallyTimeSpent" value="238841000" /> |
554 | </component> | 544 | </component> |
555 | <component name="TodoView"> | 545 | <component name="TodoView"> |
556 | <todo-panel id="selected-file"> | 546 | <todo-panel id="selected-file"> |
... | @@ -742,20 +732,6 @@ | ... | @@ -742,20 +732,6 @@ |
742 | </provider> | 732 | </provider> |
743 | </entry> | 733 | </entry> |
744 | <entry file="file://$USER_HOME$/Desktop/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/app.js" /> | 734 | <entry file="file://$USER_HOME$/Desktop/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/app.js" /> |
745 | - <entry file="file://$PROJECT_DIR$/views/toonviewer.ejs"> | ||
746 | - <provider selected="true" editor-type-id="text-editor"> | ||
747 | - <state relative-caret-position="152"> | ||
748 | - <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" /> | ||
749 | - </state> | ||
750 | - </provider> | ||
751 | - </entry> | ||
752 | - <entry file="file://$PROJECT_DIR$/views/setting.ejs"> | ||
753 | - <provider selected="true" editor-type-id="text-editor"> | ||
754 | - <state relative-caret-position="589"> | ||
755 | - <caret line="31" column="15" lean-forward="true" selection-start-line="31" selection-start-column="15" selection-end-line="31" selection-end-column="15" /> | ||
756 | - </state> | ||
757 | - </provider> | ||
758 | - </entry> | ||
759 | <entry file="file://$PROJECT_DIR$/routes/setting.js"> | 735 | <entry file="file://$PROJECT_DIR$/routes/setting.js"> |
760 | <provider selected="true" editor-type-id="text-editor"> | 736 | <provider selected="true" editor-type-id="text-editor"> |
761 | <state relative-caret-position="1007"> | 737 | <state relative-caret-position="1007"> |
... | @@ -804,36 +780,56 @@ | ... | @@ -804,36 +780,56 @@ |
804 | </state> | 780 | </state> |
805 | </provider> | 781 | </provider> |
806 | </entry> | 782 | </entry> |
783 | + <entry file="file://$PROJECT_DIR$/views/toonviewer.ejs"> | ||
784 | + <provider selected="true" editor-type-id="text-editor"> | ||
785 | + <state relative-caret-position="304"> | ||
786 | + <caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" /> | ||
787 | + </state> | ||
788 | + </provider> | ||
789 | + </entry> | ||
807 | <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> | 790 | <entry file="file://$PROJECT_DIR$/routes/mytoons.js"> |
808 | <provider selected="true" editor-type-id="text-editor"> | 791 | <provider selected="true" editor-type-id="text-editor"> |
809 | - <state relative-caret-position="-152"> | 792 | + <state relative-caret-position="494"> |
810 | - <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" /> | 793 | + <caret line="26" column="20" lean-forward="true" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" /> |
794 | + </state> | ||
795 | + </provider> | ||
796 | + </entry> | ||
797 | + <entry file="file://$PROJECT_DIR$/views/index.ejs"> | ||
798 | + <provider selected="true" editor-type-id="text-editor"> | ||
799 | + <state relative-caret-position="380"> | ||
800 | + <caret line="104" column="34" lean-forward="true" selection-start-line="93" selection-start-column="2" selection-end-line="104" selection-end-column="34" /> | ||
801 | + <folding> | ||
802 | + <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
803 | + <element signature="n#style#0;n#h1#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#header#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
804 | + <element signature="n#style#0;n#div#0;n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
805 | + <element signature="n#style#0;n#div#1;n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
806 | + </folding> | ||
811 | </state> | 807 | </state> |
812 | </provider> | 808 | </provider> |
813 | </entry> | 809 | </entry> |
814 | <entry file="file://$PROJECT_DIR$/views/mytoons.ejs"> | 810 | <entry file="file://$PROJECT_DIR$/views/mytoons.ejs"> |
815 | <provider selected="true" editor-type-id="text-editor"> | 811 | <provider selected="true" editor-type-id="text-editor"> |
816 | - <state relative-caret-position="-1862"> | 812 | + <state relative-caret-position="475"> |
817 | - <caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" /> | 813 | + <caret line="70" column="8" lean-forward="true" selection-start-line="70" selection-start-column="8" selection-end-line="70" selection-end-column="8" /> |
814 | + <folding> | ||
815 | + <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
816 | + </folding> | ||
818 | </state> | 817 | </state> |
819 | </provider> | 818 | </provider> |
820 | </entry> | 819 | </entry> |
821 | <entry file="file://$PROJECT_DIR$/views/index.html"> | 820 | <entry file="file://$PROJECT_DIR$/views/index.html"> |
822 | <provider selected="true" editor-type-id="text-editor"> | 821 | <provider selected="true" editor-type-id="text-editor"> |
823 | - <state relative-caret-position="361"> | 822 | + <state relative-caret-position="-988"> |
824 | - <caret line="28" lean-forward="true" selection-start-line="16" selection-end-line="28" /> | 823 | + <caret line="65" column="34" lean-forward="true" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" /> |
825 | </state> | 824 | </state> |
826 | </provider> | 825 | </provider> |
827 | </entry> | 826 | </entry> |
828 | - <entry file="file://$PROJECT_DIR$/views/index.ejs"> | 827 | + <entry file="file://$PROJECT_DIR$/views/setting.ejs"> |
829 | <provider selected="true" editor-type-id="text-editor"> | 828 | <provider selected="true" editor-type-id="text-editor"> |
830 | - <state relative-caret-position="127"> | 829 | + <state relative-caret-position="469"> |
831 | - <caret line="101" column="6" selection-start-line="101" selection-start-column="6" selection-end-line="101" selection-end-column="6" /> | 830 | + <caret line="135" lean-forward="true" selection-start-line="135" selection-end-line="135" /> |
832 | <folding> | 831 | <folding> |
833 | <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 832 | <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
834 | - <element signature="n#style#0;n#h1#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#header#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
835 | - <element signature="n#style#0;n#div#0;n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
836 | - <element signature="n#style#0;n#div#1;n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
837 | </folding> | 833 | </folding> |
838 | </state> | 834 | </state> |
839 | </provider> | 835 | </provider> | ... | ... |
... | @@ -20,13 +20,19 @@ | ... | @@ -20,13 +20,19 @@ |
20 | function daum_click() | 20 | function daum_click() |
21 | { | 21 | { |
22 | if(Daum_webtoons.display == "none") | 22 | if(Daum_webtoons.display == "none") |
23 | - Daum_webtoons.display == "block" | 23 | + Daum_webtoons.display == "block"; |
24 | if(Daum_webtoons.display = "block") | 24 | if(Daum_webtoons.display = "block") |
25 | - Daum_webtoons.display == "none" | 25 | + Daum_webtoons.display == "none"; |
26 | + } | ||
27 | + function naver_click() | ||
28 | + { | ||
29 | + if(Naver_webtoons.display == "none") | ||
30 | + Naver_webtoons.display == "block"; | ||
31 | + if(Naver_webtoons.display = "block") | ||
32 | + Naver_webtoons.display == "none"; | ||
26 | } | 33 | } |
27 | </script> | 34 | </script> |
28 | </head> | 35 | </head> |
29 | - | ||
30 | <body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top"> | 36 | <body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top"> |
31 | <!-- Navigation | 37 | <!-- Navigation |
32 | ==========================================--> | 38 | ==========================================--> |
... | @@ -102,7 +108,6 @@ | ... | @@ -102,7 +108,6 @@ |
102 | 다음 웹툰 | 108 | 다음 웹툰 |
103 | </font> | 109 | </font> |
104 | 110 | ||
105 | - | ||
106 | <a onclick="Daum_webtoons.style.display=(Daum_webtoons.style.display=='none')?'block':'none';" href="javascript:void(0)"> | 111 | <a onclick="Daum_webtoons.style.display=(Daum_webtoons.style.display=='none')?'block':'none';" href="javascript:void(0)"> |
107 | <img src ='/images/daumicon.png' width="83" height="90" onclick="daum_click" /> | 112 | <img src ='/images/daumicon.png' width="83" height="90" onclick="daum_click" /> |
108 | </a> | 113 | </a> | ... | ... |
... | @@ -3,31 +3,19 @@ | ... | @@ -3,31 +3,19 @@ |
3 | <head> | 3 | <head> |
4 | <title>내툰</title> | 4 | <title>내툰</title> |
5 | <link rel='stylesheet' href='/stylesheets/style2.css' /> | 5 | <link rel='stylesheet' href='/stylesheets/style2.css' /> |
6 | - <meta charset="utf-8"> | 6 | + <<!-- Bootstrap --> |
7 | - <meta name="viewport" content="width=device-width, initial-scale=1"> | 7 | + <link rel="stylesheet" type="text/css" href="/stylesheets/bootstrap.css"> |
8 | - <title>Touché</title> | 8 | + <link rel="stylesheet" type="text/css" href="/stylesheets/font-awesome.css"> |
9 | - <meta name="description" content=""> | ||
10 | - <meta name="author" content=""> | ||
11 | - | ||
12 | - <!-- Favicons | ||
13 | - ================================================== --> | ||
14 | - <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon"> | ||
15 | - <link rel="apple-touch-icon" href="img/apple-touch-icon.png"> | ||
16 | - <link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png"> | ||
17 | - <link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png"> | ||
18 | - | ||
19 | - <!-- Bootstrap --> | ||
20 | - <link rel="stylesheet" type="text/css" href="css/bootstrap.css"> | ||
21 | - <link rel="stylesheet" type="text/css" href="fonts/font-awesome/css/font-awesome.css"> | ||
22 | 9 | ||
23 | <!-- Stylesheet | 10 | <!-- Stylesheet |
24 | ================================================== --> | 11 | ================================================== --> |
25 | - <link rel="stylesheet" type="text/css" href="css/style.css"> | 12 | + <link rel="stylesheet" type="text/css" href="/stylesheets/style.css"> |
26 | - <link rel="stylesheet" type="text/css" href="css/nivo-lightbox/nivo-lightbox.css"> | 13 | + <link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/nivo-lightbox.css"> |
27 | - <link rel="stylesheet" type="text/css" href="css/nivo-lightbox/default.css"> | 14 | + <link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/default.css"> |
28 | <link href="https://fonts.googleapis.com/css?family=Raleway:300,400,500,600,700" rel="stylesheet"> | 15 | <link href="https://fonts.googleapis.com/css?family=Raleway:300,400,500,600,700" rel="stylesheet"> |
29 | <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"> | 16 | <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"> |
30 | <link href="https://fonts.googleapis.com/css?family=Dancing+Script:400,700" rel="stylesheet"> | 17 | <link href="https://fonts.googleapis.com/css?family=Dancing+Script:400,700" rel="stylesheet"> |
18 | + <link href="https://fonts.googleapis.com/css?family=Gugi&subset=korean" rel="stylesheet"> | ||
31 | 19 | ||
32 | <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> | 20 | <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> |
33 | <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> | 21 | <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> |
... | @@ -58,11 +46,27 @@ | ... | @@ -58,11 +46,27 @@ |
58 | </style> | 46 | </style> |
59 | 47 | ||
60 | </head> | 48 | </head> |
61 | -<h1>내툰</h1> | 49 | +<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top"> |
62 | -<p>추가한 리스트</p> | 50 | +<!-- Navigation |
63 | -<a href="/auth/logout/kakao">로그아웃</a> | 51 | + ==========================================--> |
64 | -<br> | 52 | +<nav id="menu" class="navbar navbar-default navbar-fixed-top"> |
65 | -<a href="/setting/"><img src = "/images/basket.png" height="50" witdh="50">웹툰 담기</a> | 53 | + <div class="container"> |
54 | + <!-- Brand and toggle get grouped for better mobile display --> | ||
55 | + <div class="navbar-header"> | ||
56 | + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> | ||
57 | + <a class="navbar-brand page-scroll" href="#page-top" style="font-family:Gugi">내툰</a> </div> | ||
58 | + <!-- Collect the nav links, forms, and other content for toggling --> | ||
59 | + <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> | ||
60 | + <ul class="nav navbar-nav navbar-right"> | ||
61 | + <li><a href="#mylist" class="page-scroll">MyList</a></li> | ||
62 | + <li><a href="/setting/"><!--<img src = "/images/basket.png" height="50" witdh="50">-->웹툰 담기</a> | ||
63 | + <li><a href="/auth/logout/kakao" class="page-scroll">Logout</a></li> | ||
64 | + </ul> | ||
65 | + </div> | ||
66 | + <!-- /.navbar-collapse --> | ||
67 | + </div> | ||
68 | +</nav> | ||
69 | + | ||
66 | <table> | 70 | <table> |
67 | <tr> | 71 | <tr> |
68 | <th>썸네일</th> | 72 | <th>썸네일</th> | ... | ... |
... | @@ -2,16 +2,85 @@ | ... | @@ -2,16 +2,85 @@ |
2 | <html lang="en"> | 2 | <html lang="en"> |
3 | <head> | 3 | <head> |
4 | <meta charset="UTF-8"> | 4 | <meta charset="UTF-8"> |
5 | - <title>설정</title> | 5 | + <title>웹툰 담기</title> |
6 | + <link rel='stylesheet' href='/stylesheets/style2.css' /> | ||
7 | + <<!-- Bootstrap --> | ||
8 | + <link rel="stylesheet" type="text/css" href="/stylesheets/bootstrap.css"> | ||
9 | + <link rel="stylesheet" type="text/css" href="/stylesheets/font-awesome.css"> | ||
10 | + | ||
11 | + <!-- Stylesheet | ||
12 | + ================================================== --> | ||
13 | + <link rel="stylesheet" type="text/css" href="/stylesheets/style.css"> | ||
14 | + <link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/nivo-lightbox.css"> | ||
15 | + <link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/default.css"> | ||
16 | + <link href="https://fonts.googleapis.com/css?family=Raleway:300,400,500,600,700" rel="stylesheet"> | ||
17 | + <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"> | ||
18 | + <link href="https://fonts.googleapis.com/css?family=Dancing+Script:400,700" rel="stylesheet"> | ||
19 | + <link href="https://fonts.googleapis.com/css?family=Gugi&subset=korean" rel="stylesheet"> | ||
20 | + | ||
21 | + <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> | ||
22 | + <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> | ||
23 | + <!--[if lt IE 9]> | ||
24 | + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> | ||
25 | + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> | ||
26 | + <![endif]--> | ||
6 | <style> | 27 | <style> |
7 | .registered{ | 28 | .registered{ |
8 | background-color: #AAAAAA; | 29 | background-color: #AAAAAA; |
9 | } | 30 | } |
31 | + .toon_name,.toon_thumbnail{ | ||
32 | + width:10%; | ||
33 | + } | ||
34 | + | ||
35 | + td{ | ||
36 | + vertical-align: middle; | ||
37 | + border-bottom: 1px solid #bcbcbc; | ||
38 | + border-left: 1px solid #bcbcbc; | ||
39 | + border-right: 1px solid #bcbcbc; | ||
40 | + margin:0; | ||
41 | + Text-align:center; | ||
42 | + } | ||
43 | + table{ | ||
44 | + border-collapse:collapse; | ||
45 | + border: 2px solid #474747; | ||
46 | + } | ||
47 | + th{ | ||
48 | + border-bottom:2px solid #474747; | ||
49 | + } | ||
10 | </style> | 50 | </style> |
11 | </head> | 51 | </head> |
12 | -<h1>내툰</h1> | 52 | +<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top"> |
13 | -<p>추가하거나 제거할 웹툰을 선택해주세요.</p> | 53 | +<!-- Navigation |
14 | -<a href="/mytoons">뒤로</a> | 54 | + ==========================================--> |
55 | +<nav id="menu" class="navbar navbar-default navbar-fixed-top"> | ||
56 | + <div class="container"> | ||
57 | + <!-- Brand and toggle get grouped for better mobile display --> | ||
58 | + <div class="navbar-header"> | ||
59 | + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> | ||
60 | + <a class="navbar-brand page-scroll" href="#page-top" style="font-family:Gugi">웹툰담기</a> </div> | ||
61 | + <!-- Collect the nav links, forms, and other content for toggling --> | ||
62 | + <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> | ||
63 | + <ul class="nav navbar-nav navbar-right"> | ||
64 | + <li><a href="/mytoons" class="page-scroll">MyList</a></li> | ||
65 | + <li><a href="/auth/logout/kakao" class="page-scroll">Logout</a></li> | ||
66 | + </ul> | ||
67 | + </div> | ||
68 | + <!-- /.navbar-collapse --> | ||
69 | + </div> | ||
70 | +</nav> | ||
71 | + | ||
72 | +<div id="portfolio"> | ||
73 | + <div class="section-title text-center center"> | ||
74 | + <div class="overlay"> | ||
75 | + <h2>웹툰담기</h2> | ||
76 | + <hr> | ||
77 | + <p>추가하거나 제거할 웹툰을 선택해주세요</p> | ||
78 | + </div> | ||
79 | + </div> | ||
80 | + <div class="container"> | ||
81 | + <div class="row"> | ||
82 | + <div class="categories"> | ||
83 | + | ||
15 | <br> | 84 | <br> |
16 | 85 | ||
17 | <a onclick="daumtoons.style.display=(daumtoons.style.display=='none')?'block':'none';" href="javascript:void(0)"> | 86 | <a onclick="daumtoons.style.display=(daumtoons.style.display=='none')?'block':'none';" href="javascript:void(0)"> |
... | @@ -63,9 +132,7 @@ | ... | @@ -63,9 +132,7 @@ |
63 | </table> | 132 | </table> |
64 | </form> | 133 | </form> |
65 | </div> | 134 | </div> |
66 | -</br> | 135 | + |
67 | -<br> | ||
68 | -<br> | ||
69 | 136 | ||
70 | <a onclick="navertoons.style.display=(navertoons.style.display=='none')?'block':'none';" href="javascript:void(0)"> | 137 | <a onclick="navertoons.style.display=(navertoons.style.display=='none')?'block':'none';" href="javascript:void(0)"> |
71 | <img src ='/images/navericon.png' width="83" height="90"/> | 138 | <img src ='/images/navericon.png' width="83" height="90"/> |
... | @@ -116,7 +183,10 @@ | ... | @@ -116,7 +183,10 @@ |
116 | </table> | 183 | </table> |
117 | </form> | 184 | </form> |
118 | </div> | 185 | </div> |
119 | -<body> | 186 | + </div> |
187 | + </div> | ||
188 | + </div> | ||
120 | 189 | ||
190 | +</div> | ||
121 | </body> | 191 | </body> |
122 | </html> | 192 | </html> | ... | ... |
-
Please register or login to post a comment