Fix embedded view

pull/7944/head
Karl Prieb 8 years ago
parent 66125de0df
commit 92754c1bc6
  1. 4
      packages/rocketchat-theme/client/imports/components/message-box.css
  2. 34
      packages/rocketchat-ui-flextab/client/flexTabBar.html
  3. 4
      packages/rocketchat-ui-flextab/client/flexTabBar.js
  4. 32
      packages/rocketchat-ui-message/client/messageBox.html
  5. 3
      packages/rocketchat-ui-message/client/messageBox.js

@ -6,6 +6,10 @@
font-size: var(--message-box-text-size);
&--embedded {
padding: 12px;
}
&__toolbar-markdown {
position: absolute;
left: 0;

@ -1,21 +1,23 @@
<template name="flexTabBar">
<div class="flex-tab-container border-component-color {{opened}}">
<section class="flex-tab border-component-color">
<div class="content flex-tab__content">
<button class="close-flex-tab secondary-font-color">
<span class="secondary-background-color"><i class="icon-cancel"></i></span>
</button>
{{> Template.dynamic template=template data=flexData}}
</div>
</section>
<div class="flex-tab-bar content-background-color" role="toolbar">
{{#each buttons}}
<div class="tab-button {{active}} {{visible}} {{class}}" title="{{title}}">
<button aria-label="{{title}}">
{{> icon block="tab-button-icon" icon=icon }}
{{#unless embeddedVersion}}
<div class="flex-tab-container border-component-color {{opened}}">
<section class="flex-tab border-component-color">
<div class="content flex-tab__content">
<button class="close-flex-tab secondary-font-color">
<span class="secondary-background-color"><i class="icon-cancel"></i></span>
</button>
{{> Template.dynamic template=template data=flexData}}
</div>
{{/each}}
</section>
<div class="flex-tab-bar content-background-color" role="toolbar">
{{#each buttons}}
<div class="tab-button {{active}} {{visible}} {{class}}" title="{{title}}">
<button aria-label="{{title}}">
{{> icon block="tab-button-icon" icon=icon }}
</button>
</div>
{{/each}}
</div>
</div>
</div>
{{/unless}}
</template>

@ -35,6 +35,10 @@ Template.flexTabBar.helpers({
return Object.assign(Template.currentData().data || {}, {
tabBar: Template.instance().tabBar
});
},
embeddedVersion() {
return RocketChat.Layout.isEmbedded();
}
});

@ -1,5 +1,5 @@
<template name="messageBox">
<div class="rc-message-box rc-new">
<div class="rc-message-box rc-new {{#if embeddedVersion}}rc-message-box--embedded{{/if}}">
{{#if subscribed}}
{{#with usersTyping}}
<div class="rc-message-box__typing">
@ -67,21 +67,23 @@
{{/if}}
</label>
{{#if showFormattingTips}}
<div class="rc-message-box__toolbar-markdown">
{{#each mdButtons}}
<button class="rc-message-box__toolbar-markdown-item rc-tooltip js-md" aria-label={{_ label}} data-link="{{link}}">
{{#if icon}}
{{> icon block="rc-message-box__toolbar-markdown-icon" icon=icon }}
{{else}}
{{#if link}}
<a href="{{link}}" target="_blank" class="rc-message-box__toolbar-markdown-link">{{label}}</a>
{{#unless embeddedVersion}}
{{#if showFormattingTips}}
<div class="rc-message-box__toolbar-markdown">
{{#each mdButtons}}
<button class="rc-message-box__toolbar-markdown-item rc-tooltip js-md" aria-label={{_ label}} data-link="{{link}}">
{{#if icon}}
{{> icon block="rc-message-box__toolbar-markdown-icon" icon=icon }}
{{else}}
{{#if link}}
<a href="{{link}}" target="_blank" class="rc-message-box__toolbar-markdown-link">{{label}}</a>
{{/if}}
{{/if}}
{{/if}}
</button>
{{/each}}
</div>
{{/if}}
</button>
{{/each}}
</div>
{{/if}}
{{/unless}}
{{else}}
<div class="stream-info">
{{#if isBlockedOrBlocker}}

@ -279,6 +279,9 @@ Template.messageBox.helpers({
},
sendIcon() {
return Template.instance().sendIcon.get();
},
embeddedVersion() {
return RocketChat.Layout.isEmbedded();
}
});

Loading…
Cancel
Save