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

これはテストですよ #16

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

これはテストですよ #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3c07d32
タイトルをミクロネシアンからハワイアンに変更
HIROSHITAKESHITA Jan 9, 2017
5f7360b
access.htmlを追加
HIROSHITAKESHITA Jan 9, 2017
fb7854b
access.htmlを削除
HIROSHITAKESHITA Jan 9, 2017
18a0a34
hedding→heding
HIROSHITAKESHITA Jan 9, 2017
32b74f9
classをミクロネシア→オセアニア
HIROSHITAKESHITA Jan 9, 2017
ef25dea
アクセス→道案内
HIROSHITAKESHITA Jan 9, 2017
ea537be
Merge branch 'taskA'
HIROSHITAKESHITA Jan 9, 2017
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
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;
}
.hedding01{
.heding01{
background-color: #886E52;
padding: 10px;
color: #fff;
-webkit-border-radius: 8px;
border-radius: 8px;
}
.hedding02{
.heding02{
color: #886E52;
}

Expand Down
1 change: 1 addition & 0 deletions debug.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[0109/131522:ERROR:crash_report_database_win.cc(426)] unexpected header
12 changes: 6 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
<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>
<div id="container">
<div id="header">
<h1 class="site-name">ミクロネシアプレミアムリゾートホテル</h1>
<h1 class="site-name">オセアニアプレミアムリゾートホテル</h1>
<ul id="nav">
<li class="active"><a href="index.html" title="TOPページへ戻る">Home</a></li>
<li><a href="#" title="お部屋の一覧はこちらから"><i class="fa fa-home light">&nbsp;</i>お部屋の種類</a></li>
<li><a href="#" title="お得なプランをご用意しています"><i class="fa fa-jpy light">&nbsp;</i>料金プラン</a></li>
<li><a href="#" title="当ホテルへのアクセス"><i class="fa fa-car light">&nbsp;</i>アクセス</a></li>
<li><a href="#" title="当ホテルへの道案内"><i class="fa fa-car light">&nbsp;</i>アクセス</a></li>
<li><a href="#" title="お問い合わせはメールフォームでお願いします"><i class="fa fa-fax light">&nbsp;</i>お問い合わせ</a></li>
</ul>
</div>
Expand All @@ -24,14 +24,14 @@ <h1 class="site-name">ミクロネシアプレミアムリゾートホテル</h1
</div>
<div id="maincontent" class="fs-text">
<div class="content">
<h1 class="hedding01">当ホテルからのご案内</h1>
<h2 class="hedding02">オンライン宿泊予約特典</h2>
<h1 class="heding01">当ホテルからのご案内</h1>
<h2 class="heding02">オンライン宿泊予約特典</h2>
<p>インターネットで予約すると、特別料金でご宿泊いただけます。</p>
<p>ユーザー登録していただくとお得なご案内をお送りいたします。</p>
<p>【ダイレクトメール可否を「許可する」にされた方にのみお送りいたします】</p>
</div>
<div class="content">
<h2 class="hedding02">新着情報</h2>
<h2 class="heding02">新着情報</h2>
<ul>
<li>リニューアル・スイートルームキャンペーンのお知らせ</li>
<li>リニューアル・スイートルームがオープン</li>
Expand Down