diff options
| -rw-r--r-- | css/style.scss | 14 | ||||
| -rw-r--r-- | js/views/templates.js | 2 | ||||
| -rw-r--r-- | js/views/templates/callinfoview.handlebars | 4 |
3 files changed, 6 insertions, 14 deletions
diff --git a/css/style.scss b/css/style.scss index 054db3a18..d747b5537 100644 --- a/css/style.scss +++ b/css/style.scss @@ -939,10 +939,6 @@ body:not(#body-public) .participantWithList > li > span:not(.currentUser):not(.g display: flex; align-items: center; - .share-link-options { - flex-grow: 1; - } - .call-button { flex-grow: 0; flex-basis: 50%; @@ -975,9 +971,12 @@ body:not(#body-public) .participantWithList > li > span:not(.currentUser):not(.g .room-moderation-button { /* Needed for proper positioning of the menu. */ position: relative; + + /* Position the button to the right end of its flex parent. */ + margin-left: auto; } - .share-link-options .button, + .clipboard-button .button, .room-moderation-button .button { cursor: pointer; width: 44px; @@ -995,11 +994,6 @@ body:not(#body-public) .participantWithList > li > span:not(.currentUser):not(.g } } - .share-link-options { - display: flex; - align-items: center; - } - .room-moderation-button .menu { /* Values copied from apps.scss in server. */ $popoveritem-height: 44px; diff --git a/js/views/templates.js b/js/views/templates.js index 407139030..1e0817c1d 100644 --- a/js/views/templates.js +++ b/js/views/templates.js @@ -48,7 +48,7 @@ templates['callinfoview'] = template({"1":function(container,depth0,helpers,part + alias4(((helper = (helper = helpers.fileLinkTitle || (depth0 != null ? depth0.fileLinkTitle : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"fileLinkTitle","hash":{},"data":data}) : helper))) + "\">\n <span class=\"icon icon-file\"></span>\n </a>\n"; },"3":function(container,depth0,helpers,partials,data) { - return " <div class=\"share-link-options\">\n <div class=\"clipboard-button\"><button class=\"button icon-clippy\"></button></div>\n </div>\n"; + return " <div class=\"clipboard-button\"><button class=\"button icon-clippy\"></button></div>\n"; },"5":function(container,depth0,helpers,partials,data) { var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {}); diff --git a/js/views/templates/callinfoview.handlebars b/js/views/templates/callinfoview.handlebars index a2a5e5e4e..807ac107b 100644 --- a/js/views/templates/callinfoview.handlebars +++ b/js/views/templates/callinfoview.handlebars @@ -9,9 +9,7 @@ <div class="call-controls-container"> <div class="call-button"></div> {{#if isPublic}} - <div class="share-link-options"> - <div class="clipboard-button"><button class="button icon-clippy"></button></div> - </div> + <div class="clipboard-button"><button class="button icon-clippy"></button></div> {{/if}} {{#if showRoomModerationMenu}} <div class="room-moderation-button"> |