Affix layout improved.

nastachku · Mar 14, 2013 · d2c9ac9 · d2c9ac9
1 parent bda4eeb
commit d2c9ac9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/assets/javascripts/custom.js.coffee b/app/assets/javascripts/custom.js.coffee
@@ -3,8 +3,8 @@ window.onload = ->
   delay 4000, -> $('.alert').fadeOut('slow')
 
   # side bar
-  affixTop = $("#nav_top").outerHeight() + $("#nav_main").outerHeight() + $("header").outerHeight() + $(".content h1:first").outerHeight()
-  affixBottom = $(".sponsors").outerHeight() + parseInt($("#main_container").css("padding-bottom"))
+  affixTop = $("#nav_top").outerHeight() + $("#nav_main").outerHeight() + $("header").outerHeight() + $(".content h1:first").outerHeight() + parseInt($(".content h1:first").css('marginTop')) + parseInt($(".content h1:first").css('marginBottom'))
+  affixBottom = $(".sponsors").outerHeight() + parseInt($("#main_container").css("padding-bottom"))+ parseInt($(".border").css('marginTop'))
   affixHeight = $(".b-affix:first").outerHeight()
   docHeight = $(document).height()
   bottomLimit = docHeight - affixBottom - affixHeight

diff --git a/app/assets/stylesheets/custom/_events.scss b/app/assets/stylesheets/custom/_events.scss
@@ -102,8 +102,9 @@
 
 // bootstrap-affix
 .b-affix {
-  width: 190px;
-  padding-bottom: 20px;
+  width: inherit;
+  box-sizing: border-box;
+  background-color: #f4f4f4 !important;
   &.top {
     position: fixed;
     top: 4px;

diff --git a/app/views/layouts/web/shared/_footer.html.haml b/app/views/layouts/web/shared/_footer.html.haml
@@ -8,7 +8,7 @@
           %p
             Copyright © 2012 – 2013
       .span9
-        = render 'layouts/web/shared/social'
+        =# render 'layouts/web/shared/social'
     .clearfix
 
 = javascript_include_tag "application"