Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed inconsistent sidebar styles bug #10

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed inconsistent sidebar styles bug #10

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d65a8ea
Fixed inconsistent sidebar styles bug
Feb 5, 2016
d89a2af
fixes #1
Feb 5, 2016
0033731
Removed changes
Feb 5, 2016
ab655a3
Fixes #1, ahh I get it now
Feb 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/admin/sidebar/_target_sidebar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<li id="sidebar_<%= sidebar.id %>" class="sidebar_item" data-sortable="sidebar_<%= sidebar.id %>" >
<li id="sidebar_<%= sidebar.id %>" class="sidebar-item" data-sortable="sidebar_<%= sidebar.id %>" >
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will not merge.

This fix introduces new bugs in existing styles and javascript.

See:
app/assets/stylesheets/sidebar_admin.css.scss#L25
app/assets/javascripts/sidebar.js#L31

<%= link_to 'X', admin_sidebar_path(sidebar), {class: 'deletion_link', remote: true, method: :delete, :'data-confirm'=>'Are you sure?'} %>
<%= form_tag admin_sidebar_path(sidebar.id), {remote: true, method: :put} do |f| %>
<div class="active alert <%= class_for_admin_state(sidebar, sortable_index)%>">
Expand Down
4 changes: 2 additions & 2 deletions lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% unless sidebar.archives.blank? %>
<h3 class="sidebar_title"><%= sidebar.title %></h3>
<div class="sidebar_body">
<h3 class="sidebar-title"><%= sidebar.title %></h3>
<div class="sidebar-body">
<ul id="archives">
<% sidebar.archives.each do |month| %>
<% counter = sidebar.show_count ? "<em>(#{month[:article_count]})</em>" : "" %>
Expand Down