From feca7196fabd74a94bb54ae5aff04626277159da Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Fri, 11 Dec 2015 16:20:36 +0100 Subject: [PATCH 1/3] Change positions and arrows of menus in backlogs --- .../stylesheets/backlogs/master_backlog.css.sass | 10 +++++----- app/helpers/rb_master_backlogs_helper.rb | 2 +- app/views/rb_master_backlogs/_backlog.html.erb | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/backlogs/master_backlog.css.sass b/app/assets/stylesheets/backlogs/master_backlog.css.sass index 9db9ab4f53..8477fae93f 100644 --- a/app/assets/stylesheets/backlogs/master_backlog.css.sass +++ b/app/assets/stylesheets/backlogs/master_backlog.css.sass @@ -79,12 +79,12 @@ overflow: visible position: absolute top: 0 - left: 0 + right: 0 width: 29px &.hover, &:hover width: 30px z-index: 1000 - .ui-icon + .icon-context position: absolute top: 7px left: 7px @@ -138,15 +138,15 @@ line-height: 31px padding: 0 position: absolute - right: 0 + left: 0 top: 0 width: 23px cursor: pointer &:before - content: "\e08a" + content: "\e00c" margin-left: 7px &.closed:before - content: "\e089" + content: "\e00b" margin-left: 7px &:hover cursor: pointer diff --git a/app/helpers/rb_master_backlogs_helper.rb b/app/helpers/rb_master_backlogs_helper.rb index 3648c03471..850fb27e51 100644 --- a/app/helpers/rb_master_backlogs_helper.rb +++ b/app/helpers/rb_master_backlogs_helper.rb @@ -39,7 +39,7 @@ module RbMasterBacklogsHelper def render_backlog_menu(backlog) content_tag(:div, class: 'menu') do [ - content_tag(:div, '', class: 'ui-icon ui-icon-carat-1-s'), + content_tag(:div, '', class: "icon-context icon-small icon-arrow-down2 <%= ' closed' if folded %>"), content_tag(:ul, class: 'items') do backlog_menu_items_for(backlog).map { |item| content_tag(:li, item, class: 'item') diff --git a/app/views/rb_master_backlogs/_backlog.html.erb b/app/views/rb_master_backlogs/_backlog.html.erb index 9c3bd26069..111020baa5 100644 --- a/app/views/rb_master_backlogs/_backlog.html.erb +++ b/app/views/rb_master_backlogs/_backlog.html.erb @@ -37,10 +37,10 @@ See doc/COPYRIGHT.rdoc for more details. <% folded = current_user.backlogs_preference(:versions_default_fold_state) == "closed" %>
- <%= render_backlog_menu backlog %> +
<%= render :partial => "rb_sprints/sprint", :object => backlog.sprint %>
-
+ <%= render_backlog_menu backlog %>