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

Fix cursor pointer. #106

Merged
merged 1 commit into from
Sep 30, 2021
Merged

Fix cursor pointer. #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/views/albums/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
</div>
<ul id='test-album-songs-list' class='c-list' data-action='turbo:submit-end->playlist-songs#submitEndHandle turbo:submit-start->playlist-songs#submitStartHandle'>
<% @songs.each do |song| %>
<li class='c-list__item u-cursor-pointer' data-playlist-songs-target='item' data-song-id='<%= song.id %>'>
<li class='c-list__item' data-playlist-songs-target='item' data-song-id='<%= song.id %>'>
<div class='o-flex o-flex--justify-between o-flex--align-center'>
<%= button_to current_playlist_songs_path(song_id: song.id), class: 'u-w-100 o-flex o-flex--justify-between o-flex--align-center', form_class: 'o-flex__item--grow-1', form: { 'data-submit-start-action' => 'check_before_playing', 'data-submit-end-action' => 'play', 'data-turbo-frame' => 'turbo-playlist' } do %>
<%= button_to current_playlist_songs_path(song_id: song.id), class: 'u-w-100 o-flex o-flex--justify-between o-flex--align-center u-cursor-pointer', form_class: 'o-flex__item--grow-1', form: { 'data-submit-start-action' => 'check_before_playing', 'data-submit-end-action' => 'play', 'data-turbo-frame' => 'turbo-playlist' } do %>
<div>
<h4 class='u-mb-tiny u-text-weight-normal test-song-name'><%= song.name %></h4>
<% if @album.artist.is_various? %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/current_playlist/songs/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div data-controller='dropdown' class='c-dropdown'>
<span data-action='click->dropdown#show'><%= icon_tag 'more-vertical', title: t('label.more') %></span>
<div data-dropdown-target='list' class='u-display-none c-dropdown__list'>
<%= button_to t('label.clear'), current_playlist_songs_path(clear_all: true), method: :delete, form_class: 'c-dropdown__item', form: { data: { action: 'turbo:submit-end->playlist-songs#clear' } } %>
<%= button_to t('label.clear'), current_playlist_songs_path(clear_all: true), method: :delete, form_class: 'c-dropdown__item u-cursor-pointer', form: { data: { action: 'turbo:submit-end->playlist-songs#clear' } } %>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/dialog/playlists/_playlist.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<%= button_to playlist_songs_path(playlist, song_id: params[:song_id]), method: :post, class: 'c-list__item', form: { 'data-turbo-frame': 'turbo-playlist' } do %>
<%= button_to playlist_songs_path(playlist, song_id: params[:song_id]), method: :post, class: 'c-list__item u-cursor-pointer', form: { 'data-turbo-frame': 'turbo-playlist' } do %>
<%= playlist.name %>
<% end %>
4 changes: 2 additions & 2 deletions app/views/playlists/songs/_song.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<li id='<%= "#{dom_id(playlist)}_#{dom_id(song)}" %>'class='js-playlist-sortable-item c-list__item u-p-0 u-cursor-pointer' data-playlist-songs-target='item' data-song-id='<%= song.id %>'>
<li id='<%= "#{dom_id(playlist)}_#{dom_id(song)}" %>'class='js-playlist-sortable-item c-list__item u-p-0' data-playlist-songs-target='item' data-song-id='<%= song.id %>'>
<div class='o-flex o-flex--align-center u-py-narrow'>
<div class='js-playlist-sortable-item-handle u-mr-narrow'><%= icon_tag 'drag-indicator', size: 'small' %></div>
<%= button_to current_playlist_songs_path(song_id: song.id), class: 'u-w-100 o-flex o-flex--justify-between o-flex--align-center', form_class: 'o-flex__item--grow-1', form: { 'data-submit-start-action' => 'check_before_playing', 'data-submit-end-action' => 'play' } do %>
<%= button_to current_playlist_songs_path(song_id: song.id), class: 'u-w-100 o-flex o-flex--justify-between o-flex--align-center u-cursor-pointer', form_class: 'o-flex__item--grow-1', form: { 'data-submit-start-action' => 'check_before_playing', 'data-submit-end-action' => 'play' } do %>
<div class='u-mr-narrow'>
<h4 class='u-mb-tiny u-text-weight-normal u-text-line-clamp-2'><%= song.name %></h4>
<%= song.artist.title %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/songs/_song.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div role='row' class='o-grid' cols='8' cols@medium='6' cols@small='5' cols@narrow='4' data-playlist-songs-target='item' data-song-id='<%= song.id %>'>
<%= button_to current_playlist_songs_path(song_id: song.id), form_class: 'o-grid__item', class: 'u-w-100', form: { 'span' => '1-7', 'span@medium' => '1-5', 'span@small' => '1-4', 'span@narrow' => '1-3', 'data-submit-start-action' => 'check_before_playing', 'data-submit-end-action' => 'play', 'data-turbo-frame' => 'turbo-playlist' } do %>
<%= button_to current_playlist_songs_path(song_id: song.id), form_class: 'o-grid__item', class: 'u-w-100 u-cursor-pointer', form: { 'span' => '1-7', 'span@medium' => '1-5', 'span@small' => '1-4', 'span@narrow' => '1-3', 'data-submit-start-action' => 'check_before_playing', 'data-submit-end-action' => 'play', 'data-turbo-frame' => 'turbo-playlist' } do %>
<div class='o-grid' cols='7' cols@medium='5' cols@small='4' cols@narrow='3'>
<span role='cell' class='test-song-name o-grid__item u-text-truncate' span='2' span@medium='4' span@narrow='3'><%= song.name %></span>
<span role='cell' class='o-grid__item u-text-truncate u-display-none@medium' span='2'><%= song.artist.title %></span>
Expand Down