Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

初めてのプリリクエスト #38

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

初めてのプリリクエスト #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
efb38a8
title changed ハワイアンプレミアムリゾートホテル
to30 Nov 12, 2016
a0606a1
add file access.html
to30 Nov 12, 2016
60e6fd7
delete file access.html
to30 Nov 12, 2016
8f2b404
見出しタイポ修正
to30 Nov 12, 2016
3df15eb
ホテルの特典明記
to30 Nov 12, 2016
e886cf8
add file .gitignore
to30 Nov 12, 2016
4b0418a
Merge remote-tracking branch 'origin2/master'
to30 Nov 12, 2016
729fd51
タイトルをアラスカに修正
to30 Nov 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ignoretest.txt
52 changes: 0 additions & 52 deletions access.html
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ h3 {
text-decoration: none;
padding: 10px 20px;
}
.heading01{
.heding01{
background-color: #886E52;
padding: 10px;
color: #fff;
-webkit-border-radius: 8px;
border-radius: 8px;
}
.heading02{
.heding02{
color: #886E52;
}

Expand Down
3 changes: 2 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="css/main.css" media="screen">
<link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
<title>ハワイアンプレミアムリゾートホテル</title>
<title>アラスカプレミアムリゾートホテル</title>
<script type="text/javascript" src="js/main.js"></script>
</head>
<body>
Expand Down Expand Up @@ -39,6 +39,7 @@ <h2 class="heading02">新着情報</h2>
<li>サンキューデー料金のシングルルーム</li>
<li>ネットキャンペーン実施中</li>
<li>お客様用パソコンをご用意しています</li>
<li>全室wifi完備</li>
<li>マイカープランございます</li>
<li>設備点検は、無事終了いたしました</li>
<li>２泊以上の方にお得な連泊プランご用意しています</li>
Expand Down