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.

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

Feature/agent track layout #208

Open
wants to merge 43 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
02a2d99
Put the request button in the key vote slot when appropriate.
colons Jun 5, 2021
40bf4d1
Merge branch 'master' into feature/agent-track-layout
colons Jun 5, 2021
1b4fa7b
Put key votes to the left of left-aligned metadata and put others below.
colons Jun 5, 2021
cfc068e
Merge branch 'master' into feature/agent-track-layout
colons Jun 5, 2021
5ada404
Make the spacing of things make sense.
colons Jun 5, 2021
cad5f34
Align the deets hover to the right.
colons Jun 5, 2021
0d5eb06
Make expanded tracks look a bit less horrible.
colons Jun 5, 2021
01ba28c
Top-align track groups.
colons Jun 6, 2021
fd72b86
Draw the vote and admin controls above the album art.
colons Jun 6, 2021
7bf3f53
Make tracks narrower on multi-column pages.
colons Jun 6, 2021
bdd15f8
Fix plusone styling for ineligible tracks.
colons Jun 6, 2021
b722552
Merge branch 'main' into feature/agent-track-layout
colons Jun 6, 2021
ed2dc1a
Organise admin actions into 'useful while live' and 'useful less often'.
colons Jun 6, 2021
f4fa685
Merge branch 'main' into feature/agent-track-layout
colons Jun 11, 2021
fdcb880
Remove the old admin-only page-wide track expansion toggle.
colons Jun 11, 2021
3c58994
Implement per-track expansion controls.
colons Jun 11, 2021
2affc5b
Make track expansion actually do something.
colons Jun 11, 2021
68425e6
Merge branch 'main' into feature/agent-track-layout
colons Jun 11, 2021
4277915
Make the borders and padding on expanded tracks make a bit more sense.
colons Jun 11, 2021
65ca12d
Put key vote after metadata on expanded tracks.
colons Jun 11, 2021
7c64aac
Merge branch 'main' into feature/agent-track-layout
colons Jun 26, 2021
bdb8899
Merge branch 'main' into feature/agent-track-layout
colons Jul 17, 2021
8da5d0c
Add some classes to stuff in the hopes we can test some iconography.
colons Jul 17, 2021
5e07a51
Do some minor less cleanup.
colons Jul 17, 2021
250e9ba
Try to make expanding and collapsing a bit more obvious.
colons Jul 17, 2021
2a5ba20
Show the expand/collapse tooltips above the "New!" annotation.
colons Jul 17, 2021
b9f2175
Try to make the expansion toggle easier to read in dark mode.
colons Jul 17, 2021
10ddd24
Set up some proof-of-concept artist, album, and composer iconography.
colons Jul 17, 2021
15da717
Merge branch 'main' into feature/agent-track-layout
colons Sep 26, 2021
7ec29d9
Settle on @fa-var-microphone as the icon for performing artist.
colons Sep 26, 2021
c0685b1
Merge branch 'main' into feature/agent-track-layout
colons Oct 21, 2021
84b92c3
Placate eslint.
colons Oct 21, 2021
f36eb28
Wrap track expansion in a deferred function.
colons Oct 21, 2021
fab8bd0
Remove composers from non-detail tracks.
colons Oct 21, 2021
8088ac1
Merge branch 'main' into feature/agent-track-layout
colons Oct 22, 2021
35e8afd
Merge branch 'main' into feature/agent-track-layout
colons Oct 22, 2021
65e5f4f
Merge branch 'main' into feature/agent-track-layout
colons Nov 1, 2021
d117c15
Use pen nib to indicate composers consistently.
colons Nov 1, 2021
94e967f
Remove a merge conflict marker.
colons Nov 1, 2021
b15a754
Surface icons against breadcrumbs.
colons Nov 1, 2021
bc93d09
Put the expand triangle next to votes.
colons Nov 1, 2021
d5acf12
Merge branch 'main' into feature/agent-track-layout
colons Nov 6, 2021
25aab8a
Try to align track metadata in a way that makes sense.
colons Nov 6, 2021
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
5 changes: 1 addition & 4 deletions nkdsu/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,13 +223,10 @@
'JAVASCRIPT': {
'base': {
'source_filenames': [
'js/libs/jquery.js',
'js/libs/jquery.cookie.js',
'js/libs/Sortable.js',

'js/csrf.js',

'js/collapse-toggle.js',
'js/expand.js',
'js/select.js',
'js/messages.js',
'js/ajax-actions.js',
Expand Down
9 changes: 0 additions & 9 deletions nkdsu/static/js/collapse-toggle.js

This file was deleted.

22 changes: 22 additions & 0 deletions nkdsu/static/js/expand.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
function bindAllTrackExpansion() {
const trackElements = document.querySelectorAll('.track')

function bindTrackExpansion(trackElement) {
const votingElement = trackElement.querySelector('.voting')
if (!votingElement) {
return
}
const toggleElement = document.createElement('a')
toggleElement.classList.add('expansion-toggle')
toggleElement.addEventListener('click', () => {
trackElement.classList.toggle('expanded')
})
votingElement.prepend(toggleElement)
}

for (let i = 0; i < trackElements.length; i++) {
bindTrackExpansion(trackElements[i])
}
}

document.addEventListener('DOMContentLoaded', bindAllTrackExpansion)
12 changes: 12 additions & 0 deletions nkdsu/static/less/_elements.less
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,15 @@ button.link {
font-family: inherit;
font-size: inherit;
}

.artist, .anime, .composer {
&::before {
.fas();
display: inline-block;
margin-right: .3em;
}
}

.artist::before { content: @fa-var-microphone; }
.anime::before { content: @fa-var-tv; }
.composer::before { content: @fa-var-pen-nib; }
Loading