From 0c81bcda9b04d3299ffc7abd3f1b601ad5ba55d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Brob=C3=A4ck?= Date: Fri, 6 Jun 2014 11:19:31 +0200 Subject: [PATCH 1/4] Text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tyckte att texten var dålig! --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 15ee1fb..f6f1e68 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,6 @@ Hello World!
Här skriver vi programmeringssidan. Lek och gör vad ni vill. Vi kommer ha ett möte om en kommande design och strukturlektion. Så länge fyller denna i gitten.
- Tills vidare skickar vi dig till en lista över våra projekt + Du får ha en bra dag, önskar akaPROXY! From e0fff08d4e139d807b38b29650e2335f1e7381b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Brob=C3=A4ck?= Date: Fri, 6 Jun 2014 15:17:15 +0200 Subject: [PATCH 2/4] Basic structure added --- css/layout.css | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ css/master.css | 5 ----- css/style.css | 19 +++++++++++++++++++ index.html | 27 +++++++++++++++++++++------ 4 files changed, 90 insertions(+), 11 deletions(-) create mode 100644 css/layout.css delete mode 100644 css/master.css create mode 100644 css/style.css diff --git a/css/layout.css b/css/layout.css new file mode 100644 index 0000000..97bd698 --- /dev/null +++ b/css/layout.css @@ -0,0 +1,50 @@ +* { + margin: 0; + padding: 0; +} + +html, body { + min-height: 100%; +} + +body { + min-height: 100%; + position: relative; +} + +section:last-of-type { + padding-bottom: 60px; +} + +footer { + height: 60px; + position: fixed; + bottom: 0px; + background-color: #000; + width: 100%; + z-index: 2; +} + +section { + min-height: 500px; + height: 100%; + margin-right: 10%; + margin-left: 10%; + z-index: 1; + +} + +header { + height: 100%; +} +#Stadgar { + +} + +#Personer { + +} + +#Projekt { + +} diff --git a/css/master.css b/css/master.css deleted file mode 100644 index 0dc5787..0000000 --- a/css/master.css +++ /dev/null @@ -1,5 +0,0 @@ -body { - color: blue; - background: purple; - //Detta är en kommentar -} diff --git a/css/style.css b/css/style.css new file mode 100644 index 0000000..6748186 --- /dev/null +++ b/css/style.css @@ -0,0 +1,19 @@ +.iconiccol { + color: #FCB944; +} + +.iconiccolback { + background-color: #FCB944; +} + +.back1 { + background-color: rgba(0,0,0,0.1); +} + +.back2 { + background-color: rgba(0,0,0,0.2); +} + +.back3 { + background-color: rgba(0,0,0,0.3); +} \ No newline at end of file diff --git a/index.html b/index.html index f6f1e68..c3ff314 100644 --- a/index.html +++ b/index.html @@ -3,12 +3,27 @@ - akaPROXY + aka.Proxy + - - Hello World!
- Här skriver vi programmeringssidan. Lek och gör vad ni vill. Vi kommer ha ett möte om en kommande design och strukturlektion. Så länge fyller denna i gitten.
- Du får ha en bra dag, önskar akaPROXY! - + +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ From 571ce7a9f298b1525becf036781b964a324d3612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Brob=C3=A4ck?= Date: Fri, 6 Jun 2014 15:40:30 +0200 Subject: [PATCH 3/4] Changed footer A new updated footer --- css/layout.css | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/css/layout.css b/css/layout.css index 97bd698..a85128f 100644 --- a/css/layout.css +++ b/css/layout.css @@ -10,19 +10,23 @@ html, body { body { min-height: 100%; position: relative; + z-index: 1; } section:last-of-type { - padding-bottom: 60px; + padding-bottom: 300px; } footer { - height: 60px; - position: fixed; + height: 300px; + position: absolute; bottom: 0px; background-color: #000; width: 100%; - z-index: 2; + z-index: 1; + background-image: url("http://assets.hardwarezone.com/img/2013/04/Screenshot_2013-05-15_at_12_38_58_AM.jpg"); + background-position: center; + background-attachment: fixed; } section { @@ -30,13 +34,15 @@ section { height: 100%; margin-right: 10%; margin-left: 10%; - z-index: 1; + z-index: 2; } header { height: 100%; + background-color: 3f5; } + #Stadgar { } From c19cef2092f13330c1f2588bf4c1037cad8861c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Brob=C3=A4ck?= Date: Sat, 7 Jun 2014 21:57:28 +0200 Subject: [PATCH 4/4] HTML: Section id and class, CSS: created nav and li Changed the basic structure of the layout.css and index.html --- css/layout.css | 14 ++++++++++++++ index.html | 7 ++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/css/layout.css b/css/layout.css index a85128f..d0295b4 100644 --- a/css/layout.css +++ b/css/layout.css @@ -43,6 +43,20 @@ header { background-color: 3f5; } +nav { + width: 800px; + margin-left: auto; + margin-right: auto; + min-height: 20px; + height: 50px; + bottom: 0px; +} + +li { + display: inline; + margin-left: 125px; +} + #Stadgar { } diff --git a/index.html b/index.html index c3ff314..a5fe025 100644 --- a/index.html +++ b/index.html @@ -5,6 +5,7 @@ aka.Proxy + @@ -14,13 +15,13 @@ -
+
-
+
-
+