diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-06-29 18:22:34 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-06-29 18:22:34 -0400 |
| commit | 4fe8ef40ee70bee9d4ad897b51f602231e81bfc3 (patch) | |
| tree | 40b8eeb7fb2ac228f0703e34cf6bea1245181403 /app | |
| parent | 2adb7e70b32ddfec73648795a5313b14074173b9 (diff) | |
| download | thoughts-4fe8ef40ee70bee9d4ad897b51f602231e81bfc3.tar.gz thoughts-4fe8ef40ee70bee9d4ad897b51f602231e81bfc3.tar.bz2 thoughts-4fe8ef40ee70bee9d4ad897b51f602231e81bfc3.zip | |
Worked on sidebar style
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/application.css.scss | 49 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 6 |
2 files changed, 37 insertions, 18 deletions
| diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 44383b4..a1445d6 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss | |||
| @@ -32,6 +32,7 @@ body#main-body { | |||
| 32 | min-width: 890px; | 32 | min-width: 890px; |
| 33 | display: -webkit-flex; | 33 | display: -webkit-flex; |
| 34 | display: flex; | 34 | display: flex; |
| 35 | flex-direction: row-reverse; | ||
| 35 | } | 36 | } |
| 36 | 37 | ||
| 37 | @keyframes trottingPonies { | 38 | @keyframes trottingPonies { |
| @@ -65,6 +66,7 @@ body#main-body { | |||
| 65 | -moz-box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75); | 66 | -moz-box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75); |
| 66 | box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75); | 67 | box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75); |
| 67 | width: 75%; | 68 | width: 75%; |
| 69 | min-width: 720px | ||
| 68 | } | 70 | } |
| 69 | 71 | ||
| 70 | #content { | 72 | #content { |
| @@ -72,19 +74,6 @@ body#main-body { | |||
| 72 | padding-top: 1em; | 74 | padding-top: 1em; |
| 73 | } | 75 | } |
| 74 | 76 | ||
| 75 | #sidebar { | ||
| 76 | box-sizing: border-box; | ||
| 77 | padding: 1em; | ||
| 78 | width: 25%; | ||
| 79 | font-size: .75em; | ||
| 80 | color: black; | ||
| 81 | border-left: 1px solid #eee; | ||
| 82 | } | ||
| 83 | |||
| 84 | #sidebar h2 { | ||
| 85 | font-size: 1em; | ||
| 86 | } | ||
| 87 | |||
| 88 | #flash { | 77 | #flash { |
| 89 | width: 100%; | 78 | width: 100%; |
| 90 | text-align: center; | 79 | text-align: center; |
| @@ -194,12 +183,42 @@ body#userdata-body { | |||
| 194 | font-weight: bold; | 183 | font-weight: bold; |
| 195 | } | 184 | } |
| 196 | 185 | ||
| 197 | .sidebar-module + .sidebar-module { | 186 | #sidebar { |
| 198 | margin-top: 2em; | 187 | box-sizing: border-box; |
| 188 | width: 25%; | ||
| 189 | font-size: .75em; | ||
| 190 | color: black; | ||
| 191 | border-left: 1px solid #eee; | ||
| 192 | margin-top: 1em; | ||
| 193 | margin-bottom: 2em; | ||
| 194 | } | ||
| 195 | |||
| 196 | #sidebar h2 { | ||
| 197 | font-size: 1em; | ||
| 198 | margin: 0; | ||
| 199 | } | ||
| 200 | |||
| 201 | .sidebar-module { | ||
| 202 | padding: 1em; | ||
| 203 | margin-top: 1em; | ||
| 204 | box-shadow: 1px 1px 2px 0px rgba(0, 0, 0, 0.75); | ||
| 205 | } | ||
| 206 | |||
| 207 | .sidebar-module:nth-child(2n+1) { | ||
| 208 | background-color: #feff8f; | ||
| 209 | } | ||
| 210 | |||
| 211 | .sidebar-module:nth-child(2n+2) { | ||
| 212 | background-color: #8fefab; | ||
| 213 | } | ||
| 214 | |||
| 215 | .sidebar-module p { | ||
| 216 | margin-bottom: 0; | ||
| 199 | } | 217 | } |
| 200 | 218 | ||
| 201 | .sidebar-module ul { | 219 | .sidebar-module ul { |
| 202 | padding-left: 0; | 220 | padding-left: 0; |
| 221 | margin-bottom: 0; | ||
| 203 | } | 222 | } |
| 204 | 223 | ||
| 205 | .sidebar-module li { | 224 | .sidebar-module li { |
| diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ee028b4..ed3b9a2 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml | |||
| @@ -11,9 +11,6 @@ | |||
| 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 | #main | ||
| 15 | %header#banner= link_to "feffernoo.se", root_url | ||
| 16 | #content= yield | ||
| 17 | #sidebar | 14 | #sidebar |
| 18 | .sidebar-module | 15 | .sidebar-module |
| 19 | %h2 I'm Fef. | 16 | %h2 I'm Fef. |
| @@ -25,3 +22,6 @@ | |||
| 25 | %li= link_to "Log in", new_user_session_path | 22 | %li= link_to "Log in", new_user_session_path |
| 26 | - if user_signed_in? | 23 | - if user_signed_in? |
| 27 | %li= link_to "Log out", destroy_user_session_path, method: :delete | 24 | %li= link_to "Log out", destroy_user_session_path, method: :delete |
| 25 | #main | ||
| 26 | %header#banner= link_to "feffernoo.se", root_url | ||
| 27 | #content= yield | ||