Skip to content

Commit defc5f8

Browse files
authored
Merge pull request #5 from ryamakuchi/chapter-6
Chapter 6
2 parents 5fbfe7c + e4a67da commit defc5f8

File tree

3 files changed

+56
-2
lines changed

3 files changed

+56
-2
lines changed

Diff for: my-standard-layout/MEMO.md

+16
Original file line numberDiff line numberDiff line change
@@ -217,3 +217,19 @@ white-space: nowrap;も指定する
217217
* マウスポインタの形を指定できる
218218
* 色々指定できたり、画像に変えたりもできる
219219

220+
221+
# Chapter-06
222+
223+
## border-styleに指定できる線の種類
224+
* none ... (初期値)
225+
* hidden ... (非表示)
226+
* dashed ... (破線)
227+
* dotted ... (点線)
228+
* inset ... (彫り込んだボックス)
229+
* outset ... (浮き出たボックス)
230+
* groove ... (彫り込んだ線)
231+
* ridge ... (浮き出た線)
232+
* noneとhiddenは同じく非表示だが、他の線と重なったとき、
233+
* noneは他の線が優先される
234+
* hiddenはhiddenの線が優先される
235+

Diff for: my-standard-layout/src/css/style.css

+31-2
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,35 @@ a:link, a:visited, a:hover, a:active {
386386
* -------------------------------- */
387387
.footer {
388388
width: 100%;
389-
height: 100px;
390-
background-color: #ccc;
389+
padding: 20px 0 30px;
390+
background: #2d3d54 url('../images/bg-footer.gif');
391+
color: #fff;
392+
}
393+
.horizontal-list {
394+
width: 970px;
395+
margin: 0 auto;
396+
text-align: right;
397+
font-size: 0;
398+
}
399+
.horizontal-list .horizontal-item {
400+
display: inline-block;
401+
padding: 0 15px;
402+
letter-spacing: 1px;
403+
}
404+
.horizontal-list .horizontal-item + .horizontal-item {
405+
border-left: 1px solid #bbb;
406+
}
407+
.horizontal-list .horizontal-item a {
408+
border-bottom: 1px dashed #777;
409+
color: #bbb;
410+
font-size: 1.1rem;
411+
transition: color 0.15s;
391412
}
413+
.horizontal-list .horizontal-item a:hover {
414+
color: #ddd;
415+
}
416+
.copyright {
417+
margin-top: 30px;
418+
text-align: center;
419+
letter-spacing: 1px;
420+
}

Diff for: my-standard-layout/src/index.html

+9
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,17 @@ <h2 class="hidden">SEARCH</h2>
217217
<p class="text">サイト内の文章を検索できます。</p>
218218
</form>
219219
</div>
220+
220221
</div>
222+
221223
<footer class="footer">
224+
<ul class="horizontal-list">
225+
<li class="horizontal-item"><a href="#">ABOUT ME</a></li>
226+
<li class="horizontal-item"><a href="#">SITE MAP</a></li>
227+
<li class="horizontal-item"><a href="#">SNS</a></li>
228+
<li class="horizontal-item"><a href="#">CONTACT</a></li>
229+
</ul>
230+
<p class="copyright">Copyright © 2015 SAMPLE SITE</p>
222231
</footer>
223232
</body>
224233
</html>

0 commit comments

Comments
 (0)