Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 2676:205d1956e32f

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 20:55:14 +0900
parents e8bd78840142
children 952af8b9d8bc
files syuzai/higawari/higawari.css syuzai/higawari/higawari.html.orig
diffstat 2 files changed, 72 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai/higawari/higawari.css	Mon Nov 16 20:55:14 2015 +0900
@@ -0,0 +1,45 @@
+body {
+     background: linear-gradient(#009aff, #ffffff);
+     background-attachment: fixed;
+     background-position: 1% 1%;
+     background-repeat: repeat; 
+     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;
+       text-decoration: underline;} 
+
+a:visited{color: #782828;
+          text-decoration: underline;} 
+
+a:hover{background-color: #ffc8c8;}
+
+div.menu1{
+	background-color: #ffffff;
+	position: relative;
+	margin: 10px;
+	border: solid black 5px;}
+
+div.menu2{
+	background-color: #ffffff;
+	position: relative;
+	margin: 10px;
+	border: solid black 5px;}
+
+div.menu3{
+	background-color: #ffffff;
+	position: rerative;
+	margin: 10px;
+	border: solid black 5px;}
+
+div.menu4{
+	background-color: #ffffff;
+	position: rerative;
+	margin: 10px;
+	border: solid black 5px;}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syuzai/higawari/higawari.html.orig	Mon Nov 16 20:55:14 2015 +0900
@@ -0,0 +1,27 @@
+<html>
+<head>
+<title>日替わりランチ</title>
+<link rel="stylesheet" type="text/css" href=".css">
+</head>
+
+<body>
+<h1>日替わりランチ</h1>
+<<<<<<< local
+<p>本日のランチは...</p>
+<p>○○亭　からあげ定食</p>
+<p>公益大カフェ　ねぎすき丼、五目ラーメン（1.5玉）、ローストチキン</p>
+<p>ほげほげ定食　ほげほげスパゲッティ</p>
+
+<h1></h1>
+<p>
+<a href="http://skip.koeki-prj.org/syuzai/higawari/higawari2.html">日替わりランチ○○店</a>
+</p>
+=======
+<p><a href="">....</a></p>
+>>>>>>> other
+<p><a href="">...</a></p>
+<p><a href="">..</a></p>
+<p><a href="">.</a></p>
+
+</body>
+</html>

yatex.org