Skip to content

Commit

Permalink
Merge pull request #5444 from avalonmediasystem/btn_wrapping
Browse files Browse the repository at this point in the history
Add text-nowrap class to item page buttons
  • Loading branch information
masaball authored Nov 2, 2023
2 parents 47fc6ea + b6f085f commit c6725bd
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions app/javascript/components/Ramp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ const Ramp = ({
<div className="ramp--rails-content">
<Col className="ramp-button-group-1">
{ timeline.canCreate && <div className="mr-1" dangerouslySetInnerHTML={{ __html: timeline.content }} /> }
{ playlist.canCreate &&
<button className="btn btn-outline mr-1"
{ playlist.canCreate &&
<button className="btn btn-outline mr-1 text-nowrap"
id="addToPlaylistBtn"
type="button"
data-toggle="collapse"
Expand All @@ -79,9 +79,9 @@ const Ramp = ({
Add to Playlist
</button>
}
{ share.canShare &&
<button
className="btn btn-outline"
{ share.canShare &&
<button
className="btn btn-outline text-nowrap"
type="button"
data-toggle="collapse"
data-target="#shareResourcePanel"
Expand Down
4 changes: 2 additions & 2 deletions app/views/media_objects/_administrative_links.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Unless required by applicable law or agreed to in writing, software distributed
%>
<% if can? :update, @media_object %>
<div id="administrative_options">
<%= link_to 'Edit', edit_media_object_path(@media_object), class: 'btn btn-primary' %>
<%= link_to 'Edit', edit_media_object_path(@media_object), class: 'btn btn-primary text-nowrap' %>
<% if @media_object.published? %>
<% if can?(:unpublish, @media_object) %>
Expand All @@ -26,7 +26,7 @@ Unless required by applicable law or agreed to in writing, software distributed
<% end %>
<% if Settings.intercom.present? and can? :intercom_push, @media_object %>
<%= button_tag(Settings.intercom['default']['push_label'], class: 'btn btn-outline', data: {toggle:"modal", target:"#intercom_push"}) %>
<%= button_tag(Settings.intercom['default']['push_label'], class: 'btn btn-outline text-nowrap', data: {toggle:"modal", target:"#intercom_push"}) %>
<%= render "intercom_push_modal" %>
<% end %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/media_objects/_thumbnail.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Unless required by applicable law or agreed to in writing, software distributed
%>

<div id="thumbnail-button" style="display: inline-block;">
<button type="button" class="btn btn-outline" id="create-thumbnail-btn" data-toggle="modal" data-target="#thumbnailModal" disabled>
<button type="button" class="btn btn-outline text-nowrap" id="create-thumbnail-btn" data-toggle="modal" data-target="#thumbnailModal" disabled>
Create Thumbnail
</button>
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/views/media_objects/_timeline.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Unless required by applicable law or agreed to in writing, software distributed
%>

<div id="timeline-button">
<button type="button" class="btn btn-outline" id="timeline-btn" data-toggle="modal" data-target="#timelineModal" disabled >
<button type="button" class="btn btn-outline text-nowrap" id="timeline-btn" data-toggle="modal" data-target="#timelineModal" disabled >
Create Timeline
</button>
</div>
Expand Down Expand Up @@ -74,7 +74,7 @@ $(document).ready(function() {
scopes = timelineScopes.scopes;
streamId = timelineScopes.streamId;
let currentPlayer = document.getElementById('iiif-media-player').player;

for (let index = 0; index < scopes.length; index++) {
scope = scopes[index];
label = scope.label
Expand Down Expand Up @@ -130,7 +130,7 @@ $(document).ready(function() {
$('#new-timeline-source')[0].value = '/master_files/'+ id + '?' + t;
$('#new-timeline-form')[0].submit();
});
}
}
});
</script>

Expand Down

0 comments on commit c6725bd

Please sign in to comment.