diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-06-25 11:04:29 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-06-25 11:04:29 -0400 |
| commit | 275218aeaf24d4f9d58589cf68ec6647f0a65050 (patch) | |
| tree | 847dea3dca0a85da29c0aa0f48b2bd0ca9075025 /app | |
| parent | ad80c40944743515a45d70014e8d5ffb88cd74fc (diff) | |
| download | thoughts-275218aeaf24d4f9d58589cf68ec6647f0a65050.tar.gz thoughts-275218aeaf24d4f9d58589cf68ec6647f0a65050.tar.bz2 thoughts-275218aeaf24d4f9d58589cf68ec6647f0a65050.zip | |
Worked on design, and added small bio
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/application.css | 12 | ||||
| -rw-r--r-- | app/assets/stylesheets/records.scss | 4 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 4 |
3 files changed, 13 insertions, 7 deletions
| diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 6fd12b7..40358bb 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css | |||
| @@ -23,8 +23,7 @@ body { | |||
| 23 | 23 | ||
| 24 | #container { | 24 | #container { |
| 25 | margin: 5em auto 0; | 25 | margin: 5em auto 0; |
| 26 | width: 50%; | 26 | width: 70%; |
| 27 | border: 1px solid black; | ||
| 28 | background-color: white; | 27 | background-color: white; |
| 29 | box-sizing: border-box; | 28 | box-sizing: border-box; |
| 30 | -webkit-border-top-left-radius: 15px; | 29 | -webkit-border-top-left-radius: 15px; |
| @@ -33,11 +32,11 @@ body { | |||
| 33 | -moz-border-radius-topright: 15px; | 32 | -moz-border-radius-topright: 15px; |
| 34 | border-top-left-radius: 15px; | 33 | border-top-left-radius: 15px; |
| 35 | border-top-right-radius: 15px; | 34 | border-top-right-radius: 15px; |
| 35 | min-width: 890px; | ||
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | #banner { | 38 | #banner { |
| 39 | width: 100%; | 39 | width: 100%; |
| 40 | border-bottom: 1px solid black; | ||
| 41 | padding: 1em; | 40 | padding: 1em; |
| 42 | box-sizing: border-box; | 41 | box-sizing: border-box; |
| 43 | } | 42 | } |
| @@ -64,11 +63,16 @@ body { | |||
| 64 | #content { | 63 | #content { |
| 65 | width: 75%; | 64 | width: 75%; |
| 66 | box-sizing: border-box; | 65 | box-sizing: border-box; |
| 67 | border-right: 1px solid black; | ||
| 68 | } | 66 | } |
| 69 | 67 | ||
| 70 | #sidebar { | 68 | #sidebar { |
| 71 | width: 25%; | 69 | width: 25%; |
| 72 | box-sizing: border-box; | 70 | box-sizing: border-box; |
| 73 | padding-right: 1em; | 71 | padding-right: 1em; |
| 72 | font-size: .75em; | ||
| 73 | color: #352712; | ||
| 74 | } | ||
| 75 | |||
| 76 | #sidebar h2 { | ||
| 77 | font-size: 1em; | ||
| 74 | } | 78 | } |
| diff --git a/app/assets/stylesheets/records.scss b/app/assets/stylesheets/records.scss index 0054edd..71e203a 100644 --- a/app/assets/stylesheets/records.scss +++ b/app/assets/stylesheets/records.scss | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | .description { | 13 | .description { |
| 14 | a { | 14 | a { |
| 15 | text-decoration: none; | 15 | text-decoration: none; |
| 16 | color: black; | 16 | color: #352712; |
| 17 | font-family: 'Inconsolata', monospace; | 17 | font-family: 'Inconsolata', monospace; |
| 18 | 18 | ||
| 19 | &:hover { | 19 | &:hover { |
| @@ -21,7 +21,7 @@ | |||
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | &:visited { | 23 | &:visited { |
| 24 | color: black; | 24 | color: #352712; |
| 25 | } | 25 | } |
| 26 | } | 26 | } |
| 27 | } | 27 | } |
| diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ad1e8df..55d7805 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml | |||
| @@ -11,4 +11,6 @@ | |||
| 11 | %h1= link_to "Thoughts", root_url | 11 | %h1= link_to "Thoughts", root_url |
| 12 | #main | 12 | #main |
| 13 | #content= yield | 13 | #content= yield |
| 14 | #sidebar I'm Fef. | 14 | #sidebar |
| 15 | %h2 I'm Fef. | ||
| 16 | %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. | ||