From 63d8195ffb8d22bf3283a12057e7cf873fb6c7fb Mon Sep 17 00:00:00 2001 From: Jan Dennison Date: Wed, 13 May 2015 16:21:35 -0400 Subject: [PATCH 01/11] fix footer to be responsive --- app/assets/stylesheets/footer.scss | 13 +++++++- app/views/layouts/application.html.erb | 42 ++++++++++++-------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/app/assets/stylesheets/footer.scss b/app/assets/stylesheets/footer.scss index 83dbc1a..94ba9e3 100644 --- a/app/assets/stylesheets/footer.scss +++ b/app/assets/stylesheets/footer.scss @@ -18,22 +18,33 @@ footer { color: white; width: 100%; background-color: $black; + margin-top: 3em; + padding-top: 2em; + border-top: 1px solid #000; + overflow: auto; p { margin: 0; } + .nav { + white-space: nowrap; + text-align: center; + padding: 0; + } .footer-content { margin-top: 2em; text-align: center; width: 100%; color: $gray; + .footer-title { font-weight: $font-weight--bold; } ul { list-style-type: none; + padding: 0; li { display: inline; - padding: 0 15px; + padding: 0 5px; a { color: $green; &:hover { diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1a67a08..c0a4f3e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -27,28 +27,26 @@ <%= yield %> From 83c112de32676e1cab9bde6876012a0ebb205532 Mon Sep 17 00:00:00 2001 From: Jan Dennison Date: Wed, 13 May 2015 16:40:21 -0400 Subject: [PATCH 02/11] fix responsive layout on sign in/sign up pages --- app/assets/stylesheets/main.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index b5f6b68..312ec81 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -180,7 +180,8 @@ hr { .portfolio, .dashboard { display: table; } - .light-container { + .portfolio .light-container, + .dashboard .light-container { display: table-cell; float: none; } From acf8a3b61083834c976c7ffa44f13e3390e6a988 Mon Sep 17 00:00:00 2001 From: Jan Dennison Date: Wed, 13 May 2015 18:23:08 -0400 Subject: [PATCH 03/11] fix pie charts on small screens --- .../javascripts/application/templates/users/show.jst.ejs | 8 ++++---- app/assets/stylesheets/profile.scss | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/application/templates/users/show.jst.ejs b/app/assets/javascripts/application/templates/users/show.jst.ejs index 9028e31..6a32789 100644 --- a/app/assets/javascripts/application/templates/users/show.jst.ejs +++ b/app/assets/javascripts/application/templates/users/show.jst.ejs @@ -81,22 +81,22 @@
-
+
Recent Languages
-
+
Total Languages Overall
-
+
Recent Github Events
-
+

  • <%= parseInt(user_github.pushEvents) + parseInt(user_github.pullEvents) + parseInt(user_github.commits) %>

    diff --git a/app/assets/stylesheets/profile.scss b/app/assets/stylesheets/profile.scss index 8291b85..0915273 100644 --- a/app/assets/stylesheets/profile.scss +++ b/app/assets/stylesheets/profile.scss @@ -152,6 +152,7 @@ $font-weight--bold: 900; .graph-container { overflow: visible; margin: 1em auto; + padding: 0; } .graph-container h5 { text-align: center; From bf6396c166c42c8780a9fe401c9aa554e60dbad0 Mon Sep 17 00:00:00 2001 From: Jan Dennison Date: Wed, 13 May 2015 18:30:54 -0400 Subject: [PATCH 04/11] fix footer buttons when logged in --- app/views/layouts/application.html.erb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c0a4f3e..8507a5d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -29,10 +29,8 @@