about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/application.css.scss26
-rw-r--r--app/views/layouts/application.html.haml24
-rw-r--r--app/views/users/sessions/.new.html.haml.swobin12288 -> 0 bytes
3 files changed, 26 insertions, 24 deletions
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 0fa0535..683cc6d 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss
@@ -27,9 +27,11 @@ body#main-body {
27#container { 27#container {
28 height: 100%; 28 height: 100%;
29 margin: 7em auto 0; 29 margin: 7em auto 0;
30 width: 66%; 30 width: 75%; /* 66% */
31 box-sizing: border-box; 31 box-sizing: border-box;
32 min-width: 890px; 32 min-width: 890px;
33 display: -webkit-flex;
34 display: flex;
33} 35}
34 36
35#banner { 37#banner {
@@ -43,17 +45,23 @@ body#main-body {
43 margin-bottom: -80px; 45 margin-bottom: -80px;
44 position: relative; 46 position: relative;
45 top: -70px; 47 top: -70px;
48
49 a {
50 display: block;
51 width: 100%;
52 height: 55px;
53 }
46} 54}
47 55
48#main { 56#main {
49 display: -webkit-flex;
50 display: flex;
51 height: 100%;
52 background-color: white; 57 background-color: white;
58 -webkit-box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75);
59 -moz-box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75);
60 box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75);
61 width: 75%;
53} 62}
54 63
55#content { 64#content {
56 width: 70%;
57 box-sizing: border-box; 65 box-sizing: border-box;
58 padding-top: 1em; 66 padding-top: 1em;
59} 67}
@@ -61,11 +69,9 @@ body#main-body {
61#sidebar { 69#sidebar {
62 box-sizing: border-box; 70 box-sizing: border-box;
63 padding: 1em; 71 padding: 1em;
64 width: 30%; 72 width: 25%;
65 box-sizing: border-box;
66 font-size: .75em; 73 font-size: .75em;
67 color: black; 74 color: black;
68 height: 100%;
69 border-left: 1px solid #eee; 75 border-left: 1px solid #eee;
70} 76}
71 77
@@ -88,10 +94,6 @@ body#main-body {
88 background-color: #ff6a6a; 94 background-color: #ff6a6a;
89} 95}
90 96
91html {
92 height: 100%;
93}
94
95body#userdata-body { 97body#userdata-body {
96 background-color: #eeeeee; 98 background-color: #eeeeee;
97 height: 100%; 99 height: 100%;
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f15945e..ee028b4 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml
@@ -11,17 +11,17 @@
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 %header#banner feffernoo.se
15 #main 14 #main
15 %header#banner= link_to "feffernoo.se", root_url
16 #content= yield 16 #content= yield
17 #sidebar 17 #sidebar
18 .sidebar-module 18 .sidebar-module
19 %h2 I'm Fef. 19 %h2 I'm Fef.
20 %p I'm a computer science undergrad at Carnegie Mellon University. I make a lot of things, including Twitter bots. I really like Pokémon, and I write about it a lot. 20 %p I'm a computer science undergrad at Carnegie Mellon University. I make a lot of things, including Twitter bots. I really like Pokémon, and I write about it a lot.
21 .sidebar-module 21 .sidebar-module
22 %h2 Meta 22 %h2 Meta
23 %ul 23 %ul
24 - if not user_signed_in? 24 - if not user_signed_in?
25 %li= link_to "Log in", new_user_session_path 25 %li= link_to "Log in", new_user_session_path
26 - if user_signed_in? 26 - if user_signed_in?
27 %li= link_to "Log out", destroy_user_session_path, method: :delete 27 %li= link_to "Log out", destroy_user_session_path, method: :delete
diff --git a/app/views/users/sessions/.new.html.haml.swo b/app/views/users/sessions/.new.html.haml.swo deleted file mode 100644 index 85950d9..0000000 --- a/app/views/users/sessions/.new.html.haml.swo +++ /dev/null
Binary files differ