Skip to content

Issue #2505 - Custom checkbox & flexbox order to move checked labels up #2521

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

Merged
magsout merged 2 commits into from
Jun 29, 2018
Merged

Issue #2505 - Custom checkbox & flexbox order to move checked labels up #2521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93d7f94
Issue #2505 - Custom checkbox & flexbox order to move checked labels up
Jun 22, 2018
df4d162
Issue #2505 - Checkboxes only visually hidden. Fix label filtering
Jun 29, 2018
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
30 changes: 29 additions & 1 deletion webcompat/static/css/src/label-editor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@

/* list category */
.label-editor-list {
display: flex;
flex-direction: column;
max-height: 18.75em;
-webkit-overflow-scrolling: touch;
overflow-x: hidden;
Expand All @@ -52,9 +54,22 @@
cursor: pointer;
display: block;
margin: 0;
order: 2;
padding: calc(var(--unit-space) * .75) calc(var(--unit-space) * .5);
}

.label-editor-list-item .small {
vertical-align: middle;
}

.label-editor-list-item::before {
content: "☐";
display: inline-block;
font-size: 1.5em;
margin-top: -4px;
vertical-align: middle;
}

.label-editor-list-item:last-child {
border-bottom: 1px solid #ddd;
}
Expand All @@ -64,14 +79,27 @@
.label-editor-list-item.focused {
border-color: Highlight;
border-style: solid;
border-width: 2px;
border-width: 2px 2px 2px 4px;
outline: none;
}

/* checkbox */
.label-editor-list-item-checkbox {
clip: rect(0 0 0 0);
height: 0;
margin: 0;
padding: 0;
position: absolute;
visibility: hidden;
width: 0;
}

.label-editor-list-item-checkbox:checked + .label-editor-list-item::before {
content: "︎☑︎";
}

.label-editor-list-item-checkbox:checked + .label-editor-list-item {
order: 1;
}

/* Launch Category Editor */
Expand Down
2 changes: 1 addition & 1 deletion webcompat/static/js/lib/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ issues.CategoryEditorView = Backbone.View.extend({
// hide the non-filter matches
_.each(toHide, function(name) {
$("input[name=" + escape(name) + "]")
.closest(".label-editor-list-item")
.next(".label-editor-list-item")
.hide();
});
}, 100),
Expand Down
13 changes: 7 additions & 6 deletions webcompat/templates/web_modules/label-editor.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
</div>
<div class="label-editor-list" tabindex="-1">
<% _.each(labels, function(label) { %>
<label class="label-editor-list-item label-<%= label.remoteName %>" tabindex="0">
<input class="label-editor-list-item-checkbox"
type="checkbox" name="<%= label.name %>"
data-color="<%=label.color%>"
data-remotename="<%= label.remoteName %>"
tabindex="-1">
<input class="label-editor-list-item-checkbox"
type="checkbox" name="<%= label.name %>"
id="label-<%= label.remoteName %>"
data-color="<%=label.color%>"
data-remotename="<%= label.remoteName %>"
tabindex="-1">
<label class="label-editor-list-item label-<%= label.remoteName %>" for="label-<%= label.remoteName %>" tabindex="0">
<span class="small"><%= label.name %></span>
</label>
<% }); %>
Expand Down