Merge pull request #3340 from ulferts/fix/my_page_left_right_layout

fix my page styling in IE
pull/3347/merge
ulferts 9 years ago
commit 21d076757b
  1. 21
      app/assets/stylesheets/content/_my_page.sass
  2. 4
      app/views/my/page.html.erb
  3. 4
      app/views/my/page_layout.html.erb

@ -42,13 +42,21 @@ div.box-actions
z-index: 500
#invisible-grid
#list-top
padding: 0 4px
#list-right
padding: 0 4px 0 10px
#list-left
#visible-grid,
#invisible-grid
// TODO: this fixes an issue which currently breaks the layout
// It has to be removed once it is fixed upstream
// @see https://github.com/zurb/foundation-apps/issues/575
.left, .right
@extend .medium-6
.left
padding: 0 10px 0px 4px
.right
padding: 0 4px 0 10px
.block-receiver
border: 1px dashed $my-page-edit-box-border-color
@ -57,11 +65,6 @@ div.box-actions
#visible-grid &
min-height: 32px
// TODO: this fixes an issue which currently breaks the layout
// It has to be removed once it is fixed upstream
// @see https://github.com/zurb/foundation-apps/issues/575
&.left, &.right
@extend .medium-6
div.mypage-box
margin-top: 8px

@ -47,7 +47,7 @@ See doc/COPYRIGHT.rdoc for more details.
</div>
</div>
<div class="grid-block">
<div id="list-left" class="grid-content">
<div id="list-left" class="grid-content left">
<% @blocks['left'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<div class="mypage-box">
@ -55,7 +55,7 @@ See doc/COPYRIGHT.rdoc for more details.
</div>
<% end if @blocks['left'] %>
</div>
<div id="list-right" class="grid-content">
<div id="list-right" class="grid-content right">
<% @blocks['right'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<div class="mypage-box">

@ -102,13 +102,13 @@ See doc/COPYRIGHT.rdoc for more details.
</div>
</div>
<div class="grid-block">
<div id="list-left" class="grid-content block-receiver">
<div id="list-left" class="grid-content block-receiver left">
<% @blocks['left'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
<% end if @blocks['left'] %>
</div>
<div id="list-right" class="grid-content block-receiver">
<div id="list-right" class="grid-content block-receiver right">
<% @blocks['right'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>

Loading…
Cancel
Save