annotate skip.css @ 1350:fac007242bad

merged
author AMANO Yuka,c113004@e.koeki-u.ac.jp>
date Tue, 15 Dec 2015 19:29:13 +0900
parents fb323694b232
children d2d89793be14
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
276
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
1 /*SKIPTOPy[W*/
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
2 body {
510
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
3 margin: 0;
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
4 }
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
5
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
6 div.base_sheet {
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
7 width: 750px;
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
8 margin: auto;
276
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
9 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
10
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
11 div.fix {
510
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
12 position: fixed !important;
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
13 position: absolute;
312
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 310
diff changeset
14 width: 100%;
314
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 313
diff changeset
15 border: 2px black solid;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 313
diff changeset
16 box-shadow: gray 3px 3px 3px
276
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
17 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
18
313
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 312
diff changeset
19 div.main_title{
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 312
diff changeset
20 text-align:center;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 312
diff changeset
21 }
307
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
22
535
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 510
diff changeset
23 h1 {
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 510
diff changeset
24 text-align: center;
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 510
diff changeset
25 }
276
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
26
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
27 div.side_photo_right{
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
28 text-align:right;
312
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 310
diff changeset
29 margin-top:2em;
316
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 315
diff changeset
30 margin-right:20px;
318
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 317
diff changeset
31 margin-left:1em;
315
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 314
diff changeset
32 width: 152px;
276
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
33 float:right;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
34 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
35
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
36
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
37 div.menu {
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
38 background:#ffd620;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
39 color:blue;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
40 width:11%
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
41 text-align:center;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
42 border-bottom-style:thin solid;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
43 padding:2px 2px 2px 2px;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
44 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
45
310
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 309
diff changeset
46 div.menu div{
276
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
47 margin-left:3%;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
48 float:left;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
49 background:#ffd620;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
50 width:16%;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
51 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
52
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
53 div.menu table {
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
54 text-align:center;
633
fb323694b232 Added and updated
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 535
diff changeset
55 border-collapse: collapse;
449
abeseigo@abeseigo-PC
parents: 417
diff changeset
56 margin-left: auto;
abeseigo@abeseigo-PC
parents: 417
diff changeset
57 margin-right: auto;
276
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
58 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
59
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
60 div.menu table td {
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
61 width:8em;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
62 text-align:center;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
63 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
64
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
65
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
66 div.menu table td a:active {
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
67 background:#ffb820;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
68 color:#ff5a20;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
69 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
70 p.new {
336
3aefa09e705a p.new width:66% 100%
masaki@localhost.localdomain
parents: 319
diff changeset
71 width:100%;
276
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
72 text-align:center;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
73 border-style-bottom:thin solid;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
74 color:blue;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
75 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
76
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
77 p.new span {
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
78 background:#ffd620;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
79 padding:2px 2px 2px 2px;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
80 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
81
336
3aefa09e705a p.new width:66% 100%
masaki@localhost.localdomain
parents: 319
diff changeset
82 p {
451
abeseigo@abeseigo-PC
parents: 449
diff changeset
83 color:#000047;
449
abeseigo@abeseigo-PC
parents: 417
diff changeset
84 text-align:left;
336
3aefa09e705a p.new width:66% 100%
masaki@localhost.localdomain
parents: 319
diff changeset
85 }
3aefa09e705a p.new width:66% 100%
masaki@localhost.localdomain
parents: 319
diff changeset
86
479
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
87 h3 {
404
masaki@negi
parents: 389
diff changeset
88 text-align:center;
479
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
89 <<<<<<< local
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
90 =======
404
masaki@negi
parents: 389
diff changeset
91 border-style-bottom:thin solid;
masaki@negi
parents: 389
diff changeset
92 color:blue;
479
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
93 >>>>>>> other
404
masaki@negi
parents: 389
diff changeset
94 }
masaki@negi
parents: 389
diff changeset
95
479
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
96 <<<<<<< local
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
97 =======
404
masaki@negi
parents: 389
diff changeset
98
masaki@negi
parents: 389
diff changeset
99 h1.topic span {
masaki@negi
parents: 389
diff changeset
100 background:#ffd620;
masaki@negi
parents: 389
diff changeset
101 padding:2px 2px 2px 2px;
masaki@negi
parents: 389
diff changeset
102 }
masaki@negi
parents: 389
diff changeset
103
masaki@negi
parents: 389
diff changeset
104 div.topic{
masaki@negi
parents: 389
diff changeset
105 background:#ffedaa;
masaki@negi
parents: 389
diff changeset
106 margin:1% 20% 1% 10%;
masaki@negi
parents: 389
diff changeset
107 padding:5% 5%;
masaki@negi
parents: 389
diff changeset
108 border:thin soid
masaki@negi
parents: 389
diff changeset
109 }
masaki@negi
parents: 389
diff changeset
110
479
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
111 >>>>>>> other
276
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
112 div.staff {
281
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 276
diff changeset
113 taxt-align: center;
276
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
114 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
115
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
116 /*Lꗗ*/
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
117 h2.article_list {
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
118 border-color:red;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
119 border-right-style:none;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
120 border-left-style:none;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
121 border-top-style:thick solid;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
122 border-bottom:thick solid;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
123 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
124
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
125 div.shop_left {
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
126 float: left;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
127 width:40%
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
128 margin:0 2% 0 8%;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
129 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
130
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
131 div.shop_right {
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
132 float: right;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
133 width:40%;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
134 margin:0 2% 0 8%;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
135 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 203
diff changeset
136
307
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
137 /**/
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
138
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
139 img.shadow, *.shadow img {
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
140 border: white 3px solid; box-shadow: black 3px 3px 3px;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
141 margin-right: 3px; margin-bottom: 3px;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
142 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
143
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
144 div.side_photo_right img{
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
145 border: 2px yellow solid;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
146 box-shadow: orange 3px 3px 3px;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 281
diff changeset
147
318
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 317
diff changeset
148 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 317
diff changeset
149
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 317
diff changeset
150 /*Hו@*/
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 317
diff changeset
151
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 317
diff changeset
152 div.syuzai_pic img{
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 317
diff changeset
153 border: 2px yellow solid;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 317
diff changeset
154 box-shadow: orange 3px 3px 3px;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 317
diff changeset
155 }
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 317
diff changeset
156
451
abeseigo@abeseigo-PC
parents: 449
diff changeset
157
453
Abe Seigo <c111006@g.koeki-u.ac.jp>
parents: 452
diff changeset
158 h2 {background: #ffd620;
Abe Seigo <c111006@g.koeki-u.ac.jp>
parents: 452
diff changeset
159 box-shadow: black 1px 1px 2px;
Abe Seigo <c111006@g.koeki-u.ac.jp>
parents: 452
diff changeset
160 padding: 0 0.5ex;
Abe Seigo <c111006@g.koeki-u.ac.jp>
parents: 452
diff changeset
161 border-top-right-radius: 2ex;
Abe Seigo <c111006@g.koeki-u.ac.jp>
parents: 452
diff changeset
162 border-bottom-right-radius: 2ex;
Abe Seigo <c111006@g.koeki-u.ac.jp>
parents: 452
diff changeset
163 margin-right: 80%;
451
abeseigo@abeseigo-PC
parents: 449
diff changeset
164 color:black;}
453
Abe Seigo <c111006@g.koeki-u.ac.jp>
parents: 452
diff changeset
165
510
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
166 h3 {
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
167 background: #ffd620;
451
abeseigo@abeseigo-PC
parents: 449
diff changeset
168 box-shadow: black 1px 1px 2px;
510
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
169 padding-left: 10px;
451
abeseigo@abeseigo-PC
parents: 449
diff changeset
170 border-top-right-radius: 2ex;
abeseigo@abeseigo-PC
parents: 449
diff changeset
171 border-bottom-right-radius: 2ex;
510
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
172 width: 120px;
5173ab34fa08 Modified
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 479
diff changeset
173 text-align: left;
451
abeseigo@abeseigo-PC
parents: 449
diff changeset
174 color:black;}
abeseigo@abeseigo-PC
parents: 449
diff changeset
175
abeseigo@abeseigo-PC
parents: 449
diff changeset
176
abeseigo@abeseigo-PC
parents: 449
diff changeset
177
abeseigo@abeseigo-PC
parents: 449
diff changeset
178
318
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 317
diff changeset
179
319
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 318
diff changeset
180 /*X^bt@uO*/
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 318
diff changeset
181
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 318
diff changeset
182 div.staff img{
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 318
diff changeset
183 border: 1px blue solid;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 318
diff changeset
184 box-shadow: green 2px 2px 2px;
TAGUCHI Ayae<c112093@h.koeki-u.ac.jp>
parents: 318
diff changeset
185 margin-right: 8px;
371
TAGUCHI Ayae <c112093@h.koeki-u.ac.jp>
parents: 336
diff changeset
186 }
TAGUCHI Ayae <c112093@h.koeki-u.ac.jp>
parents: 336
diff changeset
187
479
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
188 /*city marathon2013*/
371
TAGUCHI Ayae <c112093@h.koeki-u.ac.jp>
parents: 336
diff changeset
189
479
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
190 div.map_nakamachi{
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
191 text-align:left;
417
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 404
diff changeset
192 }
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 404
diff changeset
193
479
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
194 <<<<<<< local
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
195 div.map_nakamachi img{
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
196 margin:2% 15% 2% 2%;
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
197 =======
371
TAGUCHI Ayae <c112093@h.koeki-u.ac.jp>
parents: 336
diff changeset
198 div.mara p{text-align: left}
389
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
199
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
200 div.monologue {
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
201 background: white; box-shadow: black 1px 1px 2px; padding: 1 1ex;
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
202 border-radius: 4ex;
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
203 border-top-left-radius: 0ex;
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
204 margin-left: 130px;
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
205 margin-top: 20px;
479
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
206 >>>>>>> other
389
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
207 }
479
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
208 <<<<<<< local
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
209 =======
389
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
210
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
211 div.monologue p{text-align: left}
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
212
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
213 div.img {
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
214 background: url(kamonkun01_migi.png) no-repeat;
c547c62a3bfa city.html
KAMADA Kei <c110206@f.koeki-u.ac.jp>
parents: 378
diff changeset
215 text-align: left;
479
MURAKAMI Masaki <c112124@h.koeki-u.ac.jp>
parents: 453
diff changeset
216 }>>>>>>> other

yatex.org