Skip to content

add selectable text. closes #443 #482

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

Merged
merged 1 commit into from
Jan 8, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/public/stylesheets/css/app.css.map

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions app/public/stylesheets/sass/_components/_default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,7 @@ input[type=range]:focus::-webkit-slider-runnable-track {
.ui-db {
display: block;
}

.selectable-text {
-webkit-user-select: initial;
}
2 changes: 1 addition & 1 deletion app/views/about/about.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="modalView">
<div ng-include="'views/common/modals/closeButton.html'"></div>

<div class="modalView_content" ng-bind-html="content"></div>
<div class="modalView_content selectable-text" ng-bind-html="content"></div>

<small class="ui-db" ng-if="isLatest">You have the latest version {{ appVersion }}.</small>
<small class="ui-db" ng-if="!isLatest">Your current version ({{ appVersion }}) isn't the latest ({{ appLatestVersion }}), please download the latest version.</small>
Expand Down
2 changes: 1 addition & 1 deletion app/views/common/queueList.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
ng-click="activateTrackInQueue($event)">

<small class="queueListView_list_item_index">{{ $index + 1 }}</small>
<span class="queueListView_list_item_title" title="{{ item.songTitle }}">{{ item.songTitle }}</span>
<span class="queueListView_list_item_title selectable-text" title="{{ item.songTitle }}">{{ item.songTitle }}</span>
<span class="queueListView_list_item_user" title="by: {{ item.songUser }}">by: {{ item.songUser }} </span>
<div class="queueListView_list_item_options"
ng-class="{ active: hover }"
Expand Down
4 changes: 2 additions & 2 deletions app/views/common/tracks.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
</div>

<section class="songList_item_inner">
<h2 class="songList_item_song_tit" title="{{ data.title }}" ui-sref="track({id: {{data.id}}})">{{ data.title }}</h2>
<h2 class="songList_item_song_tit selectable-text" title="{{ data.title }}" ui-sref="track({id: {{data.id}}})">{{ data.title }}</h2>

<h3 class="songList_item_song_info clearfix">
<div class="songList_item_song_user">
<div class="songList_item_song_user selectable-text">
<a ui-sref="profile({id: {{data.user.id}}})">
{{ data.user.username }}
</a>
Expand Down
2 changes: 1 addition & 1 deletion app/views/followers/followers.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1> {{ title }}</h1>
</div>

<section class="songList_item_inner">
<h3 class="songList_item_song_tit">{{ data.username }}</h3>
<h3 class="songList_item_song_tit selectable-text">{{ data.username }}</h3>
<h4 class="songList_item_song_user">Tracks: {{ data.track_count }}</h4>
</section>

Expand Down
2 changes: 1 addition & 1 deletion app/views/following/following.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1> {{ title }}</h1>
</div>

<section class="songList_item_inner">
<h3 class="songList_item_song_tit">{{ data.username }}</h3>
<h3 class="songList_item_song_tit selectable-text">{{ data.username }}</h3>
<h4 class="songList_item_song_user">Tracks: {{ data.track_count }}</h4>
</section>

Expand Down
2 changes: 1 addition & 1 deletion app/views/news/news.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="contentWrapper">
<h1 class="contentTitle">News</h1>
<div class="modalView_content" ng-bind-html="content"></div>
<div class="modalView_content selectable-text" ng-bind-html="content"></div>
</div>
2 changes: 1 addition & 1 deletion app/views/playlists/playlists.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h4 class="songList_item_song_user" collapsible>{{ data.title }} playlist - <spa
</div>

<div class="songList_item_container_info">
<h2 class="songList_item_song_tit">{{ tracks.title }}</h2>
<h2 class="songList_item_song_tit selectable-text">{{ tracks.title }}</h2>
<h4 class="songList_item_song_user">
<span class="songList_item_song_info" ui-sref="profile({id: {{ tracks.user.id }}})">by: {{ tracks.user.username }} </span>
<span class="songList_item_song_info">{{ formatSongDuration (tracks.duration) }}</span>
Expand Down
4 changes: 2 additions & 2 deletions app/views/profile/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<div class="profile">
<div class="profile_box">
<button ng-click="changeFollowing()" ng-mouseover="hoverIn()" ng-mouseleave="setFollowButtonText()" ng-class="{active: isFollowing}" class="button follow_button">{{follow_button_text}}</button>
<h1>{{profile_data.username}}</h1>
<h1 class="selectable-text">{{profile_data.username}}</h1>
<h3>Followers: {{followers_count}}</h3>
<p class="profile_description" text-collapse text-max-height="205" text-to-collapse="{{profile_data.description}}"></p>
<p class="profile_description selectable-text" text-collapse text-max-height="205" text-to-collapse="{{profile_data.description}}"></p>
</div>
<div class="profile_pic">
<img ng-src="{{ showBigArtwork (profile_data.avatar_url) }}" alt="{{ profile_data.username }}" class="songList_item_artwork">
Expand Down
6 changes: 3 additions & 3 deletions app/views/track/track.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<span ng-if="hover == false">{{track.user_favorite ? 'Liked' : 'Like'}}</span>
<span ng-if="hover == true">{{track.user_favorite ? 'Unlike' : 'Like'}}</span>
</div>
<h1>{{track.title}}</h1>
<h1 class="selectable-text">{{track.title}}</h1>

<h3 ui-sref="profile({id: track.user.id})" class="user_name">{{track.user.username}}</h3>
<h3 ui-sref="profile({id: track.user.id})" class="user_name selectable-text">{{track.user.username}}</h3>
<h4>Created: {{track.created_at | date: short}}</h4>

<p class="track_description" text-collapse text-max-height="196"
<p class="track_description selectable-text" text-collapse text-max-height="196"
text-to-collapse="{{track.description}}">
</p>
<div class="trackActions">
Expand Down