Skip to content

Commit

Permalink
Merge pull request #7927 from aditya19496/sidepane-scrollbar-fix
Browse files Browse the repository at this point in the history
[FIX] Double scroll on 'keyboard shortcuts' menu in sidepanel
  • Loading branch information
rodrigok committed Aug 30, 2017
1 parent 6dbfad7 commit c49d86a
Showing 1 changed file with 44 additions and 47 deletions.
91 changes: 44 additions & 47 deletions packages/rocketchat-ui-flextab/client/tabs/keyboardShortcuts.html
Original file line number Diff line number Diff line change
@@ -1,48 +1,45 @@
<template name="keyboardShortcuts">
<div class="content">
<div class="title"><h2>{{_ "Keyboard_Shortcuts_Title"}}</h2></div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Open_Channel_Slash_User_Search"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_1"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Edit_Previous_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_2"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Move_To_Beginning_Of_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_3"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Move_To_Beginning_Of_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_4"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Move_To_End_Of_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_5"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Move_To_End_Of_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_6"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_New_Line_In_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_7"}}}</div>
</div>

</div> <!-- content -->
</template>
<div class="title"><h2>{{_ "Keyboard_Shortcuts_Title"}}</h2></div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Open_Channel_Slash_User_Search"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_1"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Edit_Previous_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_2"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Move_To_Beginning_Of_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_3"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Move_To_Beginning_Of_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_4"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Move_To_End_Of_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_5"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_Move_To_End_Of_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_6"}}}</div>
</div>

<div class="section">
<h2>{{_ "Keyboard_Shortcuts_New_Line_In_Message"}}</h2>
<hr />
<div>{{{_ "Keyboard_Shortcuts_Keys_7"}}}</div>
</div>
</template>

0 comments on commit c49d86a

Please sign in to comment.