4 files changed, 23 insertions, 29 deletions
diff --git a/.gitignore b/.gitignore
index 7511a24..164d25a 100644
--- a/.gitignore
+++ b/.gitignore

@@ -24,3 +24,4 @@
 tags
 .byebug_history
+.DS_Store
diff --git a/app/assets/images/walk_cycle.png b/app/assets/images/walk_cycle.png
new file mode 100644
index 0000000..43bafe6
--- /dev/null
+++ b/app/assets/images/walk_cycle.png

Binary files differ
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css.scss
index 5ddb0bb..6ec040a 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css.scss

@@ -19,58 +19,52 @@
 body#main-body {
  background-color: #bfefff;
+  height: 100%;
 }
 #container {
-  margin: 5em auto 0;
+  height: 100%;
-  width: 70%;
+  margin: 7em auto 0;
-  background-color: white;
+  width: 66%;
  box-sizing: border-box;
-  -webkit-border-top-left-radius: 15px;
-  -webkit-border-top-right-radius: 15px;
-  -moz-border-radius-topleft: 15px;
-  -moz-border-radius-topright: 15px;
-  border-top-left-radius: 15px;
-  border-top-right-radius: 15px;
  min-width: 890px;
 }
 #banner {
+  background-image: image-url("walk_cycle.png");
+  background-repeat: repeat-x;
  width: 100%;
  padding: 1em;
  box-sizing: border-box;
-}
+  text-indent: -9999px;
+  height: 80px;
-#banner h1 {
+  margin-bottom: -80px;
-  text-align: center;
+  position: relative;
-  margin: 0;
+  top: -70px;
-}
-#banner h1 a {
-  text-decoration: none;
-  color: black;
-}
-#banner h1 a:visited {
-  color: black;
 }
 #main {
  display: -webkit-flex;
  display: flex;
+  height: 100%;
+  background-color: white;
 }
 #content {
-  width: 75%;
+  width: 70%;
  box-sizing: border-box;
+  padding-top: 1em;
 }
 #sidebar {
-  width: 25%;
  box-sizing: border-box;
-  padding-right: 1em;
+  padding: 1em;
+  width: 30%;
+  box-sizing: border-box;
  font-size: .75em;
-  color: #352712;
+  color: black;
+  height: 100%;
+  border-left: 1px solid #eee;
 }
 #sidebar h2 {
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e9d8dfd..f15945e 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml

@@ -11,8 +11,7 @@
    - if flash[:notice]
      %div#flash.flash-notice= flash[:notice]
    #container
-      #banner
+      %header#banner feffernoo.se
-        %h1= link_to "Thoughts", root_url
      #main
        #content= yield
        #sidebar

diff --git a/.gitignore b/.gitignore index 7511a24..164d25a 100644 --- a/.gitignore +++ b/.gitignore
@@ -24,3 +24,4 @@
24	tags	24	tags
25		25
26	.byebug_history	26	.byebug_history
		27	.DS_Store


diff --git a/app/assets/images/walk_cycle.png b/app/assets/images/walk_cycle.png new file mode 100644 index 0000000..43bafe6 --- /dev/null +++ b/app/assets/images/walk_cycle.png
Binary files differ


diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css.scss index 5ddb0bb..6ec040a 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css.scss
@@ -19,58 +19,52 @@
19		19
20	body#main-body {	20	body#main-body {
21	background-color: #bfefff;	21	background-color: #bfefff;
		22	height: 100%;
22	}	23	}
23		24
24	#container {	25	#container {
25	margin: 5em auto 0;	26	height: 100%;
26	width: 70%;	27	margin: 7em auto 0;
27	background-color: white;	28	width: 66%;
28	box-sizing: border-box;	29	box-sizing: border-box;
29	-webkit-border-top-left-radius: 15px;
30	-webkit-border-top-right-radius: 15px;
31	-moz-border-radius-topleft: 15px;
32	-moz-border-radius-topright: 15px;
33	border-top-left-radius: 15px;
34	border-top-right-radius: 15px;
35	min-width: 890px;	30	min-width: 890px;
36	}	31	}
37		32
38	#banner {	33	#banner {
		34	background-image: image-url("walk_cycle.png");
		35	background-repeat: repeat-x;
39	width: 100%;	36	width: 100%;
40	padding: 1em;	37	padding: 1em;
41	box-sizing: border-box;	38	box-sizing: border-box;
42	}	39	text-indent: -9999px;
43		40	height: 80px;
44	#banner h1 {	41	margin-bottom: -80px;
45	text-align: center;	42	position: relative;
46	margin: 0;	43	top: -70px;
47	}
48
49	#banner h1 a {
50	text-decoration: none;
51	color: black;
52	}
53
54	#banner h1 a:visited {
55	color: black;
56	}	44	}
57		45
58	#main {	46	#main {
59	display: -webkit-flex;	47	display: -webkit-flex;
60	display: flex;	48	display: flex;
		49	height: 100%;
		50	background-color: white;
61	}	51	}
62		52
63	#content {	53	#content {
64	width: 75%;	54	width: 70%;
65	box-sizing: border-box;	55	box-sizing: border-box;
		56	padding-top: 1em;
66	}	57	}
67		58
68	#sidebar {	59	#sidebar {
69	width: 25%;
70	box-sizing: border-box;	60	box-sizing: border-box;
71	padding-right: 1em;	61	padding: 1em;
		62	width: 30%;
		63	box-sizing: border-box;
72	font-size: .75em;	64	font-size: .75em;
73	color: #352712;	65	color: black;
		66	height: 100%;
		67	border-left: 1px solid #eee;
74	}	68	}
75		69
76	#sidebar h2 {	70	#sidebar h2 {


diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index e9d8dfd..f15945e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml
@@ -11,8 +11,7 @@
11	- if flash[:notice]	11	- if flash[:notice]
12	%div#flash.flash-notice= flash[:notice]	12	%div#flash.flash-notice= flash[:notice]
13	#container	13	#container
14	#banner	14	%header#banner feffernoo.se
15	%h1= link_to "Thoughts", root_url
16	#main	15	#main
17	#content= yield	16	#content= yield
18	#sidebar	17	#sidebar