Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 2684:b13b20e6400f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author GOTO Sakuya <c113061@e.koeki-u.ac.jp>
date Mon, 16 Nov 2015 21:04:42 +0900
parents 952af8b9d8bc
children 4bddae89d2be
files syuzai/higawari/higawari.css syuzai/higawari/higawari.html
diffstat 2 files changed, 13 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/syuzai/higawari/higawari.css	Mon Nov 16 20:58:23 2015 +0900
+++ b/syuzai/higawari/higawari.css	Mon Nov 16 21:04:42 2015 +0900
@@ -1,18 +1,14 @@
 body {
-     background: linear-gradient(#009aff, #ffffff);
-     background-attachment: fixed;
-     background-position: 1% 1%;
-     background-repeat: repeat; 
+     background-color: #fb5;
      ration: underline; color: #682e08;
      color: black; 
      font-size: ;
      text-shadow: 1px 1px 3px white;
      text-align: left;
-     text-decolation: underline;
      margin-left: 5%;
       }
 
-a:link{color: blue;
+a:link{color: white;
        text-decoration: underline;} 
 
 a:visited{color: #782828;
@@ -21,25 +17,25 @@
 a:hover{background-color: #ffc8c8;}
 
 div.menu1{
-	background-color: #ffffff;
+	background-color: none;
 	position: relative;
 	margin: 10px;
-	border: solid black 5px;}
+	border: solid #ff9900 5px;}
 
 div.menu2{
-	background-color: #ffffff;
+	background-color: none;
 	position: relative;
 	margin: 10px;
-	border: solid black 5px;}
+	border: solid #ff9900 5px;}
 
 div.menu3{
-	background-color: #ffffff;
+	background-color: none;
 	position: rerative;
 	margin: 10px;
-	border: solid black 5px;}
+	border: solid #ff9900 5px;}
 
 div.menu4{
-	background-color: #ffffff;
+	background-color: none;
 	position: rerative;
 	margin: 10px;
-	border: solid black 5px;}
+	border: solid #ff9900 5px;}
--- a/syuzai/higawari/higawari.html	Mon Nov 16 20:58:23 2015 +0900
+++ b/syuzai/higawari/higawari.html	Mon Nov 16 21:04:42 2015 +0900
@@ -8,7 +8,6 @@
 
 
 <body>
-<<<<<<< local
 <h1>ランチ特集</h1>
 <p>本日のランチは...</p>
 
@@ -29,12 +28,14 @@
 <p>公益定食</p>
 <p>公益屋</p>
 </div>
+<!--二つ目のお店-->
 
 <div class="menu3">
 <p><img src=""alt=""width=""hight=""></p>
 <p>公益ラーメン</p>
 <p>touhoku-university-of-service-and-science</p>
 </div>
+<!--三つ目のお店-->
 
 <div class="menu4">
 <p><img src=""alt="東北公益文科大学カフェテリア"width=""hight=""></p>
@@ -42,7 +43,7 @@
 <li>丼もの：マーボー丼</li>
 <li>気まぐれメニュー：</li>
 </div>
-
+<!--四つ目のお店-->
 
 </body>
 </html>

yatex.org