annotate skip.css @ 2214:a40c0ac999f1

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

yatex.org