From f55dd25a93caa24152500badf8b666c214444e93 Mon Sep 17 00:00:00 2001
From: botingli
Date: Mon, 26 Sep 2016 17:59:57 -0400
Subject: [PATCH 01/10] first version from tutorial
---
index.html | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++---
style.css | 42 +++++++++++++++++++++
2 files changed, 146 insertions(+), 5 deletions(-)
create mode 100644 style.css
diff --git a/index.html b/index.html
index 6524157..9536b81 100644
--- a/index.html
+++ b/index.html
@@ -1,8 +1,107 @@
-
- Mashup
-
-
+
+
+ Mashup
+
+
+
+
+
+ An App
+
+
+ By Boting Li
+
+
+
+
+
-
+
+
\ No newline at end of file
diff --git a/style.css b/style.css
new file mode 100644
index 0000000..101d7c0
--- /dev/null
+++ b/style.css
@@ -0,0 +1,42 @@
+section{
+ min-height: 100%;
+}
+
+h1{
+ font-size: 2em;
+ padding: 0 0.3em;
+ line-height: 1em;
+}
+
+p{
+ padding: 0 1em;
+}
+
+a{
+ color: #fff;
+}
+
+footer{
+ position: absolute;
+ bottom: 0;
+ font-size: 0.5em;
+}
+
+#temperature{
+ text-decoration: none;
+ border-bottom:
+}
+
+body{
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ font-family: Arial, sans-serif;
+ font-size: 2em;
+ text-shadow: 0 0 10px #000;
+ color: #fff;
+ background: #888;
+ background-repeat: no-repeat;
+ background-attachment: fixed;
+ background-size: cover;
+}
\ No newline at end of file
From 565310ac9c7a9950e553d31a7a138fd25666baaa Mon Sep 17 00:00:00 2001
From: botingli
Date: Mon, 26 Sep 2016 18:31:51 -0400
Subject: [PATCH 02/10] add random picture
---
index.html | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/index.html b/index.html
index 9536b81..cc5ff94 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,6 @@ An App
By Boting Li
-
@@ -11,9 +12,13 @@
An App
+
By Boting Li
+
+
+