From f04081fe01cea9db6ff38527da7ce4b5cdb5cedd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20K=C3=A4ttstr=C3=B6m?= Date: Mon, 8 Sep 2014 13:25:41 +0200 Subject: [PATCH 1/6] New row in hello.txt --- hello.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.txt b/hello.txt index cfd2219..7e3f2d1 100644 --- a/hello.txt +++ b/hello.txt @@ -1,2 +1,3 @@ Hello World Hello Universe +Hello myOwn gitproject. \ No newline at end of file From f0c48f11e7cd499234fcae6a4e92e371b0843176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20K=C3=A4ttstr=C3=B6m?= Date: Mon, 8 Sep 2014 13:37:04 +0200 Subject: [PATCH 2/6] New index.html --- html/index.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 html/index.html diff --git a/html/index.html b/html/index.html new file mode 100644 index 0000000..faebbc0 --- /dev/null +++ b/html/index.html @@ -0,0 +1,18 @@ + + + + Git excerise + + + + + +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse + cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non + proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+ + + \ No newline at end of file From 4eb10390a2a9533b1fd74bd0a148ba232d4aac34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20K=C3=A4ttstr=C3=B6m?= Date: Mon, 8 Sep 2014 13:40:00 +0200 Subject: [PATCH 3/6] Added headline --- html/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/html/index.html b/html/index.html index faebbc0..e4645d1 100644 --- a/html/index.html +++ b/html/index.html @@ -7,6 +7,8 @@ +

Lorem ipsum!

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo From 6771cade4b7a5621db9a288bdb5163300a45bb21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20K=C3=A4ttstr=C3=B6m?= Date: Mon, 8 Sep 2014 13:42:30 +0200 Subject: [PATCH 4/6] Stylesheet added --- html/css/style.css | 8 ++++++++ html/index.html | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 html/css/style.css diff --git a/html/css/style.css b/html/css/style.css new file mode 100644 index 0000000..e5254aa --- /dev/null +++ b/html/css/style.css @@ -0,0 +1,8 @@ +html { + overflow-y:scroll; +} + +body { + font-family:Arial,Hevetica,sans-serif; + font-size:16px; +} \ No newline at end of file diff --git a/html/index.html b/html/index.html index e4645d1..bf48b06 100644 --- a/html/index.html +++ b/html/index.html @@ -3,7 +3,7 @@ Git excerise - + From 79522b85b1bcc4fa442f5d34f8f84ae3d8182a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20K=C3=A4ttstr=C3=B6m?= Date: Mon, 8 Sep 2014 14:25:02 +0200 Subject: [PATCH 5/6] Footer added --- html/index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/html/index.html b/html/index.html index bf48b06..3437e62 100644 --- a/html/index.html +++ b/html/index.html @@ -16,5 +16,11 @@

Lorem ipsum!

cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+
+ +
+

Copyright © Viktor Kättstöm 2014

+
+ \ No newline at end of file From 5e3515f3c24bfa906181594ad8ad41918019bdef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20K=C3=A4ttstr=C3=B6m?= Date: Mon, 8 Sep 2014 14:47:31 +0200 Subject: [PATCH 6/6] updated hello.txt --- hello.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hello.txt b/hello.txt index 7e3f2d1..42009ba 100644 --- a/hello.txt +++ b/hello.txt @@ -1,3 +1 @@ -Hello World -Hello Universe -Hello myOwn gitproject. \ No newline at end of file +Hello Git, you're so funny! :) :) :) \ No newline at end of file