From 4cffc8c90b5e316baf3e49b665dd67ea9e965272 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Thu, 29 Jun 2017 14:58:05 -0400
Subject: Worked more on overall layout, made ponies clickable

---
 app/assets/stylesheets/application.css.scss |  26 ++++++++++++++------------
 app/views/layouts/application.html.haml     |  24 ++++++++++++------------
 app/views/users/sessions/.new.html.haml.swo | Bin 12288 -> 0 bytes
 3 files changed, 26 insertions(+), 24 deletions(-)
 delete mode 100644 app/views/users/sessions/.new.html.haml.swo

(limited to 'app')

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 {
 #container {
   height: 100%;
   margin: 7em auto 0;
-  width: 66%;
+  width: 75%; /* 66% */
   box-sizing: border-box;
   min-width: 890px;
+  display: -webkit-flex;
+  display: flex;
 }
 
 #banner {
@@ -43,17 +45,23 @@ body#main-body {
   margin-bottom: -80px;
   position: relative;
   top: -70px;
+
+  a {
+    display: block;
+    width: 100%;
+    height: 55px;
+  }
 }
 
 #main {
-  display: -webkit-flex;
-  display: flex;
-  height: 100%;
   background-color: white;
+  -webkit-box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75);
+  -moz-box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75);
+  box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75);
+  width: 75%;
 }
 
 #content {
-  width: 70%;
   box-sizing: border-box;
   padding-top: 1em;
 }
@@ -61,11 +69,9 @@ body#main-body {
 #sidebar {
   box-sizing: border-box;
   padding: 1em;
-  width: 30%;
-  box-sizing: border-box;
+  width: 25%;
   font-size: .75em;
   color: black;
-  height: 100%;
   border-left: 1px solid #eee;
 }
 
@@ -88,10 +94,6 @@ body#main-body {
   background-color: #ff6a6a;
 }
 
-html {
-  height: 100%;
-}
-
 body#userdata-body {
   background-color: #eeeeee;
   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 @@
     - if flash[:notice]
       %div#flash.flash-notice= flash[:notice]
     #container
-      %header#banner feffernoo.se
       #main
+        %header#banner= link_to "feffernoo.se", root_url
         #content= yield
-        #sidebar
-          .sidebar-module
-            %h2 I'm Fef.
-            %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.
-          .sidebar-module
-            %h2 Meta
-            %ul
-              - if not user_signed_in?
-                %li= link_to "Log in", new_user_session_path
-              - if user_signed_in?
-                %li= link_to "Log out", destroy_user_session_path, method: :delete
+      #sidebar
+        .sidebar-module
+          %h2 I'm Fef.
+          %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.
+        .sidebar-module
+          %h2 Meta
+          %ul
+            - if not user_signed_in?
+              %li= link_to "Log in", new_user_session_path
+            - if user_signed_in?
+              %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
Binary files a/app/views/users/sessions/.new.html.haml.swo and /dev/null differ
-- 
cgit 1.4.1