apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Regression: Account pages layout (#12735)

Browse Source 
* Remove duplicated .eslintignore entry

* Add missing i18n string

* Make Account Preferences layout match Administration layout

* Make Account Security layout match Administration layout

* Make Account Integrations layout match Administration layout

* Make Account Personal Access Tokens layout match Administration layout

* Adjust margins for buttons
pull/12741/head
Tasso Evangelista 7 years ago committed by Rodrigo Nascimento
parent d46cb970df
commit 9eabcef7cd
7 changed files with 335 additions and 342 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      .eslintignore
  2. 32
      imports/personal-access-tokens/client/personalAccessTokens.html
  3. 13
      packages/rocketchat-2fa/client/accountSecurity.html
  4. 1
      packages/rocketchat-i18n/i18n/en.i18n.json
  5. 12
      packages/rocketchat-ui-account/client/accountIntegrations.html
  6. 139
      packages/rocketchat-ui-account/client/accountPreferences.html
  7. 11
      packages/rocketchat_theme/client/imports/general/base_old.css

1
.eslintignore
Unescape View File

@ -10,7 +10,6 @@ packages/rocketchat-livechat/.app/.meteor
packages/rocketchat-livechat/assets/rocketchat-livechat.min.js packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
packages/rocketchat-livechat/assets/rocket-livechat.js packages/rocketchat-livechat/assets/rocket-livechat.js
packages/rocketchat_theme/client/minicolors/jquery.minicolors.js packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
packages/rocketchat_theme/client/minicolors/jquery.minicolors.js
packages/rocketchat_theme/client/vendor/ packages/rocketchat_theme/client/vendor/
packages/rocketchat-ui/client/lib/customEventPolyfill.js packages/rocketchat-ui/client/lib/customEventPolyfill.js
packages/rocketchat-ui/client/lib/Modernizr.js packages/rocketchat-ui/client/lib/Modernizr.js

32
imports/personal-access-tokens/client/personalAccessTokens.html
Unescape View File

@ -1,30 +1,22 @@
<template name="accountTokens"> <template name="accountTokens">
<section class="preferences-page preferences-page--new"> <section class="preferences-page preferences-page--new page-container page-home page-static page-settings">
{{> header sectionName="Personal_Access_Tokens" hideHelp=true fullpage=true}} {{> header sectionName="Personal_Access_Tokens" hideHelp=true fullpage=true}}
<div class="preferences-page__content">
{{# if isAllowed}}
<h2>{{_ "API_Personal_Access_Tokens_To_REST_API"}}</h2>
<br>
<form id="form-tokens" class="">
<div class="rc-form-group rc-form-group--inline"> <div class="content">
<!-- <input id="input-token-name" {{# if isAllowed}}
type="text" <form id="form-tokens">
name="tokenName" <div class="section-content border-component-color">
placeholder={{_ "Enter_a_name"}} <div class="input-line double-col">
value="{{tokenName}}"> --> <label for="tokenName" class="setting-label">{{_ "API_Personal_Access_Tokens_To_REST_API"}}</label>
<div class="rc-input rc-input--small rc-directory-search rc-form-item-inline"> <div class="setting-field">
<label class="rc-input__label"> <input type="text" class="rc-input__element js-search" name="tokenName" id="tokenName"
<div class="rc-input__wrapper"> placeholder={{_ "API_Add_Personal_Access_Token"}} autocomplete="off" />
<input type="text" class="rc-input__element rc-input__element--small js-search" name="tokenName" id="tokenName"
placeholder={{_ "API_Add_Personal_Access_Token"}} autocomplete="off">
</div> </div>
</label> <button name="add" class="rc-button rc-button--primary setting-action save-token">{{_ "Add"}}</button>
</div> </div>
<button name="add" class="rc-button rc-button--primary rc-form-item-inline save-token">{{_ "Add"}}</button>
</div> </div>
</form> </form>
<br>
<div class="rc-table-content"> <div class="rc-table-content">
{{#table}} {{#table}}
<thead> <thead>

13
packages/rocketchat-2fa/client/accountSecurity.html
Unescape View File

@ -1,10 +1,9 @@
<template name="accountSecurity"> <template name="accountSecurity">
<section class="preferences-page preferences-page--new"> <section class="preferences-page preferences-page--new page-settings">
{{> header sectionName="Security" fullpage=true}} {{> header sectionName="Security" fullpage=true}}
<div class="preferences-page__content"> <div class="preferences-page__content">
<form id="security" autocomplete="off" class="container"> <form id="security" autocomplete="off" class="container">
{{# if isAllowed}} {{# if isAllowed}}
<fieldset>
<div class="section"> <div class="section">
<h1>{{_ "Two-factor_authentication"}}</h1> <h1>{{_ "Two-factor_authentication"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
@ -21,19 +20,18 @@
<img src="{{imageData}}"> <img src="{{imageData}}">
<form class="inline"> <form>
<div class="input-line double-col">
<input type="text" class="rc-input__element" id="testCode" placeholder="{{_ "Enter_authentication_code"}}"> <input type="text" class="rc-input__element" id="testCode" placeholder="{{_ "Enter_authentication_code"}}">
<button class="rc-button rc-button--primary verify-code">{{_ "Verify"}}</button> <button class="rc-button rc-button--primary setting-action verify-code">{{_ "Verify"}}</button>
</div>
</form> </form>
{{/unless}} {{/unless}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
</fieldset>
{{#if isEnabled}} {{#if isEnabled}}
<fieldset>
<div class="section"> <div class="section">
<h1>{{_ "Backup_codes"}}</h1> <h1>{{_ "Backup_codes"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
@ -41,7 +39,6 @@
<button class="rc-button rc-button--secondary regenerate-codes">{{_ "Regenerate_codes"}}</button> <button class="rc-button rc-button--secondary regenerate-codes">{{_ "Regenerate_codes"}}</button>
</div> </div>
</div> </div>
</fieldset>
{{/if}} {{/if}}
{{/if}} {{/if}}
</form> </form>

1
packages/rocketchat-i18n/i18n/en.i18n.json
Unescape View File

@ -1924,6 +1924,7 @@
"Mute_user": "Mute user", "Mute_user": "Mute user",
"Muted": "Muted", "Muted": "Muted",
"My_Account": "My Account", "My_Account": "My Account",
"My Data": "My Data",
"My_location": "My location", "My_location": "My location",
"n_messages": "%s messages", "n_messages": "%s messages",
"N_new_messages": "%s new messages", "N_new_messages": "%s new messages",

12
packages/rocketchat-ui-account/client/accountIntegrations.html
Unescape View File

@ -1,27 +1,25 @@
<template name="accountIntegrations"> <template name="accountIntegrations">
<section class="page-container page-home page-static"> <section class="preferences-page preferences-page--new page-static page-settings">
{{> header sectionName="Integrations"}} {{> header sectionName="Integrations" fullpage=true}}
<div class="content"> <div class="content">
<form id="integrations" autocomplete="off"> <form id="integrations" autocomplete="off">
<fieldset class="rc-form-legend">
<div class="section"> <div class="section">
<h1>{{_ "WebDAV"}}</h1> <h1>{{_ "WebDAV"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
<div class="input-line double-col"> <div class="input-line double-col">
<label for="webdav-accounts">{{_ "WebDAV_Accounts"}}</label> <label for="webdav-accounts" class="setting-label">{{_ "WebDAV_Accounts"}}</label>
<div class="rc-select"> <div class="rc-select setting-field">
<select id="webdav-accounts" class="rc-select__element" style="text-transform: none" multiple> <select id="webdav-accounts" class="rc-select__element" style="text-transform: none" multiple>
{{#each webdavAccounts}} {{#each webdavAccounts}}
<option value="{{this._id}}">{{getOptionValue this}}</option> <option value="{{this._id}}">{{getOptionValue this}}</option>
{{/each}} {{/each}}
</select> </select>
</div> </div>
<button class="rc-button rc-button--cancel webdav-account-remove"><span>{{_ "Remove"}}</span></button> <button class="rc-button rc-button--cancel setting-action webdav-account-remove"><span>{{_ "Remove"}}</span></button>
</div> </div>
</div> </div>
</div> </div>
</fieldset>
</form> </form>
</div> </div>
</section> </section>

139
packages/rocketchat-ui-account/client/accountPreferences.html
Unescape View File

@ -1,5 +1,5 @@
<template name="accountPreferences"> <template name="accountPreferences">
<section class="preferences-page preferences-page--new page-container page-home page-static"> <section class="preferences-page preferences-page--new page-container page-home page-static page-settings">
{{#header sectionName="Preferences" buttons=true fullpage=true}} {{#header sectionName="Preferences" buttons=true fullpage=true}}
<div class="rc-header__section-button"> <div class="rc-header__section-button">
<button class="rc-button rc-button--primary save"><span>{{_ "Save_changes"}}</span></button> <button class="rc-button rc-button--primary save"><span>{{_ "Save_changes"}}</span></button>
@ -8,13 +8,12 @@
<div class="content"> <div class="content">
<form id="preferences" autocomplete="off"> <form id="preferences" autocomplete="off">
<fieldset class="rc-form-legend">
<div class="section"> <div class="section">
<h1>{{_ "Localization"}}</h1> <h1>{{_ "Localization"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
<div class="input-line double-col"> <div class="input-line double-col">
<label for="language">{{_ "Language"}}</label> <label for="language" class="setting-label">{{_ "Language"}}</label>
<div class="rc-select"> <div class="rc-select setting-field">
<select id="language" class="required rc-select__element"> <select id="language" class="required rc-select__element">
{{#each languages}} {{#each languages}}
<option value="{{key}}" selected="{{isUserLanguage key}}" dir="auto">{{name}}</option> <option value="{{key}}" selected="{{isUserLanguage key}}" dir="auto">{{name}}</option>
@ -29,15 +28,15 @@
<h1>{{_ "Global"}}</h1> <h1>{{_ "Global"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
<div class="input-line double-col"> <div class="input-line double-col">
<label for="language">{{_ "Dont_ask_me_again_list"}}</label> <label for="dont-ask" class="setting-label">{{_ "Dont_ask_me_again_list"}}</label>
<div class="rc-select"> <div class="rc-select setting-field">
<select id="dont-ask" class="rc-select__element" multiple> <select id="dont-ask" class="rc-select__element" multiple>
{{#each dontAskAgainList}} {{#each dontAskAgainList}}
<option value="{{action}}">{{label}}</option> <option value="{{action}}">{{label}}</option>
{{/each}} {{/each}}
</select> </select>
</div> </div>
<button class="rc-button rc-button--cancel js-dont-ask-remove"><span>{{_ "Remove"}}</span></button> <button class="rc-button rc-button--cancel setting-action js-dont-ask-remove">{{_ "Remove"}}</button>
</div> </div>
</div> </div>
</div> </div>
@ -45,22 +44,22 @@
<h1>{{_ "User_Presence"}}</h1> <h1>{{_ "User_Presence"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
<div class="input-line double-col" id="enableAutoAway"> <div class="input-line double-col" id="enableAutoAway">
<label>{{_ "Enable_Auto_Away"}}</label> <label class="setting-label">{{_ "Enable_Auto_Away"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="enableAutoAway" value="true" checked="{{ checked 'enableAutoAway' true }}"/> {{_ "True"}}</label> <label><input type="radio" name="enableAutoAway" value="true" checked="{{ checked 'enableAutoAway' true }}"/> {{_ "True"}}</label>
<label><input type="radio" name="enableAutoAway" value="false" checked="{{ checked 'enableAutoAway' false }}"/> {{_ "False"}}</label> <label><input type="radio" name="enableAutoAway" value="false" checked="{{ checked 'enableAutoAway' false }}"/> {{_ "False"}}</label>
</div> </div>
</div> </div>
<div class="input-line double-col" id="idleTimeLimit"> <div class="input-line double-col" id="idleTimeLimit">
<label>{{_ "Idle_Time_Limit"}}</label> <label class="setting-label">{{_ "Idle_Time_Limit"}}</label>
<div> <div class="setting-field">
{{#if idleTimeLimit}} {{#if idleTimeLimit}}
<input type="number" class="rc-input__element" name="idleTimeLimit" min="0" value="{{idleTimeLimit}}"> <input type="number" class="rc-input__element" name="idleTimeLimit" min="0" value="{{idleTimeLimit}}">
{{else}} {{else}}
<input type="number" class="rc-input__element" name="idleTimeLimit" min="0" value="" placeholder="{{_ "Use_Global_Settings"}} ({{defaultIdleTimeLimit}})"> <input type="number" class="rc-input__element" name="idleTimeLimit" min="0" value="" placeholder="{{_ "Use_Global_Settings"}} ({{defaultIdleTimeLimit}})">
{{/if}} {{/if}}
<div class="info">{{_ "Idle_Time_Limit_Description"}}</div> <div class="settings-description secondary-font-color">{{_ "Idle_Time_Limit_Description"}}</div>
</div> </div>
</div> </div>
</div> </div>
@ -70,23 +69,23 @@
<h1>{{_ "Notifications"}}</h1> <h1>{{_ "Notifications"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
<div class="input-line double-col"> <div class="input-line double-col">
<label>{{_ "Desktop_Notifications"}}</label> <label class="setting-label">{{_ "Desktop_Notifications"}}</label>
<div> <div class="setting-field">
{{#if desktopNotificationEnabled}} {{#if desktopNotificationEnabled}}
<label>{{_ "Desktop_Notifications_Enabled"}}</label> <label>{{_ "Desktop_Notifications_Enabled"}}</label>
<label><button class="button test-notifications"><i class="icon-comment-empty secondary-font-color"></i> <span>{{_ "Test_Desktop_Notifications"}}</span></button></label> <button class="button test-notifications"><i class="icon-comment-empty secondary-font-color"></i> <span>{{_ "Test_Desktop_Notifications"}}</span></button>
{{else}} {{else}}
{{#if desktopNotificationDisabled}} {{#if desktopNotificationDisabled}}
<label>{{_ "Desktop_Notifications_Disabled"}}</label> <label>{{_ "Desktop_Notifications_Disabled"}}</label>
{{else}} {{else}}
<label><button class="button enable-notifications"><i class="icon-comment-empty secondary-font-color"></i> <span>{{_ "Enable_Desktop_Notifications"}}</span></button></label> <button class="button enable-notifications"><i class="icon-comment-empty secondary-font-color"></i> <span>{{_ "Enable_Desktop_Notifications"}}</span></button>
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
<div class="input-line double-col"> <div class="input-line double-col">
<label>{{_ "Notification_Duration"}}</label> <label class="setting-label">{{_ "Notification_Duration"}}</label>
<div> <div class="setting-field">
{{#if desktopNotificationDuration}} {{#if desktopNotificationDuration}}
<input type="number" class="rc-input__element" name="desktopNotificationDuration" min="0" value="{{desktopNotificationDuration}}"> <input type="number" class="rc-input__element" name="desktopNotificationDuration" min="0" value="{{desktopNotificationDuration}}">
{{else}} {{else}}
@ -95,8 +94,8 @@
</div> </div>
</div> </div>
<div class="input-line double-col" id="desktopNotifications"> <div class="input-line double-col" id="desktopNotifications">
<label>{{_ "Notification_Desktop_Default_For"}}</label> <label class="setting-label">{{_ "Notification_Desktop_Default_For"}}</label>
<div class="rc-select"> <div class="rc-select setting-field">
<select class="input-monitor rc-select__element" name="desktopNotifications"> <select class="input-monitor rc-select__element" name="desktopNotifications">
<option value="default" selected="{{selected 'desktopNotifications' 'default' 'default'}}">{{_ "Default"}} ({{_ defaultDesktopNotification}})</option> <option value="default" selected="{{selected 'desktopNotifications' 'default' 'default'}}">{{_ "Default"}} ({{_ defaultDesktopNotification}})</option>
<option value="all" selected="{{selected 'desktopNotifications' 'all' 'default'}}">{{_ "All_messages"}}</option> <option value="all" selected="{{selected 'desktopNotifications' 'all' 'default'}}">{{_ "All_messages"}}</option>
@ -107,8 +106,8 @@
</div> </div>
</div> </div>
<div class="input-line double-col" id="mobileNotifications"> <div class="input-line double-col" id="mobileNotifications">
<label>{{_ "Notification_Mobile_Default_For"}}</label> <label class="setting-label">{{_ "Notification_Mobile_Default_For"}}</label>
<div class="rc-select"> <div class="rc-select setting-field">
<select class="input-monitor rc-select__element" name="mobileNotifications"> <select class="input-monitor rc-select__element" name="mobileNotifications">
<option value="default" selected="{{selected 'mobileNotifications' 'default' 'default'}}">{{_ "Default"}} ({{_ defaultMobileNotification}})</option> <option value="default" selected="{{selected 'mobileNotifications' 'default' 'default'}}">{{_ "Default"}} ({{_ defaultMobileNotification}})</option>
<option value="all" selected="{{selected 'mobileNotifications' 'all' 'default'}}">{{_ "All_messages"}}</option> <option value="all" selected="{{selected 'mobileNotifications' 'all' 'default'}}">{{_ "All_messages"}}</option>
@ -119,8 +118,8 @@
</div> </div>
</div> </div>
<div class="input-line double-col" id="emailNotificationMode"> <div class="input-line double-col" id="emailNotificationMode">
<label>{{_ "Email_Notification_Mode"}}</label> <label class="setting-label">{{_ "Email_Notification_Mode"}}</label>
<div> <div class="setting-field">
<div class="rc-select"> <div class="rc-select">
<select class="input-monitor rc-select__element" name="emailNotificationMode"> <select class="input-monitor rc-select__element" name="emailNotificationMode">
<option value="default" selected="{{selected 'emailNotificationMode' 'default' 'default'}}">{{_ "Default"}} ({{_ defaultEmailNotification}})</option> <option value="default" selected="{{selected 'emailNotificationMode' 'default' 'default'}}">{{_ "Default"}} ({{_ defaultEmailNotification}})</option>
@ -129,7 +128,7 @@
</select> </select>
{{> icon block="rc-select__arrow" icon="arrow-down" }} {{> icon block="rc-select__arrow" icon="arrow-down" }}
</div> </div>
<div class="info">{{_ "You_need_to_verifiy_your_email_address_to_get_notications"}}</div> <div class="settings-description secondary-font-color">{{_ "You_need_to_verifiy_your_email_address_to_get_notications"}}</div>
</div> </div>
</div> </div>
</div> </div>
@ -138,15 +137,15 @@
<h1>{{_ "Messages"}}</h1> <h1>{{_ "Messages"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
<div class="input-line double-col" id="unreadAlert"> <div class="input-line double-col" id="unreadAlert">
<label>{{_ "Unread_Tray_Icon_Alert"}}</label> <label class="setting-label">{{_ "Unread_Tray_Icon_Alert"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="unreadAlert" value="true" checked="{{checked 'unreadAlert' true}}"/> {{_ "On"}}</label> <label><input type="radio" name="unreadAlert" value="true" checked="{{checked 'unreadAlert' true}}"/> {{_ "On"}}</label>
<label><input type="radio" name="unreadAlert" value="false" checked="{{checked 'unreadAlert' false}}"/> {{_ "Off"}}</label> <label><input type="radio" name="unreadAlert" value="false" checked="{{checked 'unreadAlert' false}}"/> {{_ "Off"}}</label>
</div> </div>
</div> </div>
<div class="input-line double-col" id="clockMode"> <div class="input-line double-col" id="clockMode">
<label>{{_ "Message_TimeFormat"}}</label> <label class="setting-label">{{_ "Message_TimeFormat"}}</label>
<div> <div class="setting-field">
<div class="rc-select"> <div class="rc-select">
<select class="input-monitor rc-select__element" name="clockMode"> <select class="input-monitor rc-select__element" name="clockMode">
<option value="0" selected="{{selected 'clockMode' 0}}">{{_ "Default"}}</option> <option value="0" selected="{{selected 'clockMode' 0}}">{{_ "Default"}}</option>
@ -158,73 +157,73 @@
</div> </div>
</div> </div>
<div class="input-line double-col"> <div class="input-line double-col">
<label>{{_ "Use_Emojis"}}</label> <label class="setting-label">{{_ "Use_Emojis"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="useEmojis" value="true" checked="{{checked 'useEmojis' true}}" /> {{_ "True"}}</label> <label><input type="radio" name="useEmojis" value="true" checked="{{checked 'useEmojis' true}}" /> {{_ "True"}}</label>
<label><input type="radio" name="useEmojis" value="false" checked="{{checked 'useEmojis' false}}" /> {{_ "False"}}</label> <label><input type="radio" name="useEmojis" value="false" checked="{{checked 'useEmojis' false}}" /> {{_ "False"}}</label>
</div> </div>
</div> </div>
<div class="input-line double-col" id="convertAsciiEmoji"> <div class="input-line double-col" id="convertAsciiEmoji">
<label>{{_ "Convert_Ascii_Emojis"}}</label> <label class="setting-label">{{_ "Convert_Ascii_Emojis"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="convertAsciiEmoji" value="true" checked="{{checked 'convertAsciiEmoji' true}}" /> {{_ "True"}}</label> <label><input type="radio" name="convertAsciiEmoji" value="true" checked="{{checked 'convertAsciiEmoji' true}}" /> {{_ "True"}}</label>
<label><input type="radio" name="convertAsciiEmoji" value="false" checked="{{checked 'convertAsciiEmoji' false}}" /> {{_ "False"}}</label> <label><input type="radio" name="convertAsciiEmoji" value="false" checked="{{checked 'convertAsciiEmoji' false}}" /> {{_ "False"}}</label>
</div> </div>
</div> </div>
<div class="input-line double-col" id="autoImageLoad"> <div class="input-line double-col" id="autoImageLoad">
<label>{{_ "Auto_Load_Images"}}</label> <label class="setting-label">{{_ "Auto_Load_Images"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="autoImageLoad" value="true" checked="{{checked 'autoImageLoad' true}}" /> {{_ "True"}}</label> <label><input type="radio" name="autoImageLoad" value="true" checked="{{checked 'autoImageLoad' true}}" /> {{_ "True"}}</label>
<label><input type="radio" name="autoImageLoad" value="false" checked="{{checked 'autoImageLoad' false}}" /> {{_ "False"}}</label> <label><input type="radio" name="autoImageLoad" value="false" checked="{{checked 'autoImageLoad' false}}" /> {{_ "False"}}</label>
</div> </div>
</div> </div>
<div class="input-line double-col" id="saveMobileBandwidth"> <div class="input-line double-col" id="saveMobileBandwidth">
<label>{{_ "Save_Mobile_Bandwidth"}}</label> <label class="setting-label">{{_ "Save_Mobile_Bandwidth"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="saveMobileBandwidth" value="true" checked="{{checked 'saveMobileBandwidth' true}}" /> {{_ "True"}}</label> <label><input type="radio" name="saveMobileBandwidth" value="true" checked="{{checked 'saveMobileBandwidth' true}}" /> {{_ "True"}}</label>
<label><input type="radio" name="saveMobileBandwidth" value="false" checked="{{checked 'saveMobileBandwidth' false}}" /> {{_ "False"}}</label> <label><input type="radio" name="saveMobileBandwidth" value="false" checked="{{checked 'saveMobileBandwidth' false}}" /> {{_ "False"}}</label>
</div> </div>
</div> </div>
<div class="input-line double-col" id="collapseMediaByDefault"> <div class="input-line double-col" id="collapseMediaByDefault">
<label>{{_ "Collapse_Embedded_Media_By_Default"}}</label> <label class="setting-label">{{_ "Collapse_Embedded_Media_By_Default"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="collapseMediaByDefault" value="true" checked="{{checked 'collapseMediaByDefault' true}}" /> {{_ "True"}}</label> <label><input type="radio" name="collapseMediaByDefault" value="true" checked="{{checked 'collapseMediaByDefault' true}}" /> {{_ "True"}}</label>
<label><input type="radio" name="collapseMediaByDefault" value="false" checked="{{checked 'collapseMediaByDefault' false}}" /> {{_ "False"}}</label> <label><input type="radio" name="collapseMediaByDefault" value="false" checked="{{checked 'collapseMediaByDefault' false}}" /> {{_ "False"}}</label>
</div> </div>
</div> </div>
<div class="input-line double-col" id="hideUsernames"> <div class="input-line double-col" id="hideUsernames">
<label>{{_ "Hide_usernames"}}</label> <label class="setting-label">{{_ "Hide_usernames"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="hideUsernames" value="true" checked="{{checked 'hideUsernames' true}}" /> {{_ "True"}}</label> <label><input type="radio" name="hideUsernames" value="true" checked="{{checked 'hideUsernames' true}}" /> {{_ "True"}}</label>
<label><input type="radio" name="hideUsernames" value="false" checked="{{checked 'hideUsernames' false}}" /> {{_ "False"}}</label> <label><input type="radio" name="hideUsernames" value="false" checked="{{checked 'hideUsernames' false}}" /> {{_ "False"}}</label>
</div> </div>
</div> </div>
{{#if showRoles}} {{#if showRoles}}
<div class="input-line double-col" id="hideRoles"> <div class="input-line double-col" id="hideRoles">
<label>{{_ "Hide_roles"}}</label> <label class="setting-label">{{_ "Hide_roles"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="hideRoles" value="true" checked="{{checked 'hideRoles' true}}" /> {{_ "True"}}</label> <label><input type="radio" name="hideRoles" value="true" checked="{{checked 'hideRoles' true}}" /> {{_ "True"}}</label>
<label><input type="radio" name="hideRoles" value="false" checked="{{checked 'hideRoles' false}}" /> {{_ "False"}}</label> <label><input type="radio" name="hideRoles" value="false" checked="{{checked 'hideRoles' false}}" /> {{_ "False"}}</label>
</div> </div>
</div> </div>
{{/if}} {{/if}}
<div class="input-line double-col" id="hideFlexTab"> <div class="input-line double-col" id="hideFlexTab">
<label>{{_ "Hide_flextab"}}</label> <label class="setting-label">{{_ "Hide_flextab"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="hideFlexTab" value="true" checked="{{checked 'hideFlexTab' true}}" /> {{_ "True"}}</label> <label><input type="radio" name="hideFlexTab" value="true" checked="{{checked 'hideFlexTab' true}}" /> {{_ "True"}}</label>
<label><input type="radio" name="hideFlexTab" value="false" checked="{{checked 'hideFlexTab' false}}" /> {{_ "False"}}</label> <label><input type="radio" name="hideFlexTab" value="false" checked="{{checked 'hideFlexTab' false}}" /> {{_ "False"}}</label>
</div> </div>
</div> </div>
<div class="input-line double-col" id="hideAvatars"> <div class="input-line double-col" id="hideAvatars">
<label>{{_ "Hide_Avatars"}}</label> <label class="setting-label">{{_ "Hide_Avatars"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="hideAvatars" value="true" checked="{{checked 'hideAvatars' true}}"/> {{_ "True"}}</label> <label><input type="radio" name="hideAvatars" value="true" checked="{{checked 'hideAvatars' true}}"/> {{_ "True"}}</label>
<label><input type="radio" name="hideAvatars" value="false" checked="{{checked 'hideAvatars' false}}"/> {{_ "False"}}</label> <label><input type="radio" name="hideAvatars" value="false" checked="{{checked 'hideAvatars' false}}"/> {{_ "False"}}</label>
</div> </div>
</div> </div>
<div class="input-line double-col" id="messageViewMode"> <div class="input-line double-col" id="messageViewMode">
<label>{{_ "View_mode"}}</label> <label class="setting-label">{{_ "View_mode"}}</label>
<div> <div class="setting-field">
<div class="rc-select"> <div class="rc-select">
<select class="input-monitor rc-select__element" name="messageViewMode"> <select class="input-monitor rc-select__element" name="messageViewMode">
<option value="0" selected="{{selected 'messageViewMode' 0}}">{{_ "Normal"}}</option> <option value="0" selected="{{selected 'messageViewMode' 0}}">{{_ "Normal"}}</option>
@ -233,12 +232,12 @@
</select> </select>
{{> icon block="rc-select__arrow" icon="arrow-down" }} {{> icon block="rc-select__arrow" icon="arrow-down" }}
</div> </div>
<div class="info">{{_ "Message_view_mode_info"}}</div> <div class="settings-description secondary-font-color">{{_ "Message_view_mode_info"}}</div>
</div> </div>
</div> </div>
<div class="input-line double-col" id="sendOnEnter"> <div class="input-line double-col" id="sendOnEnter">
<label>{{_ "Enter_Behaviour"}}</label> <label class="setting-label">{{_ "Enter_Behaviour"}}</label>
<div> <div class="setting-field">
<div class="rc-select"> <div class="rc-select">
<select class="input-monitor rc-select__element" name="sendOnEnter"> <select class="input-monitor rc-select__element" name="sendOnEnter">
<option value="normal" selected="{{selected 'sendOnEnter' 'normal'}}">{{_ "Enter_Normal"}}</option> <option value="normal" selected="{{selected 'sendOnEnter' 'normal'}}">{{_ "Enter_Normal"}}</option>
@ -247,7 +246,7 @@
</select> </select>
{{> icon block="rc-select__arrow" icon="arrow-down" }} {{> icon block="rc-select__arrow" icon="arrow-down" }}
</div> </div>
<div class="info">{{_ "Enter_Behaviour_Description"}}</div> <div class="settings-description secondary-font-color">{{_ "Enter_Behaviour_Description"}}</div>
</div> </div>
</div> </div>
</div> </div>
@ -256,8 +255,8 @@
<h1>{{_ "Sidebar"}}</h1> <h1>{{_ "Sidebar"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
<div class="input-line double-col" id="roomCounterSidebar"> <div class="input-line double-col" id="roomCounterSidebar">
<label>{{_ "Show_room_counter_on_sidebar"}}</label> <label class="setting-label">{{_ "Show_room_counter_on_sidebar"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="roomCounterSidebar" value="true" checked="{{checked 'roomCounterSidebar' true}}"/> {{_ "True"}}</label> <label><input type="radio" name="roomCounterSidebar" value="true" checked="{{checked 'roomCounterSidebar' true}}"/> {{_ "True"}}</label>
<label><input type="radio" name="roomCounterSidebar" value="false" checked="{{checked 'roomCounterSidebar' false}}"/> {{_ "False"}}</label> <label><input type="radio" name="roomCounterSidebar" value="false" checked="{{checked 'roomCounterSidebar' false}}"/> {{_ "False"}}</label>
</div> </div>
@ -268,10 +267,10 @@
<h1>{{_ "Highlights"}}</h1> <h1>{{_ "Highlights"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
<div class="input-line double-col"> <div class="input-line double-col">
<label>{{_ "Highlights_List"}}</label> <label class="setting-label">{{_ "Highlights_List"}}</label>
<div> <div class="setting-field">
<label>{{_ "Highlights_How_To"}}</label>
<textarea class="rc-input__element" name="highlights" id="highlights" cols="30" rows="10">{{highlights}}</textarea> <textarea class="rc-input__element" name="highlights" id="highlights" cols="30" rows="10">{{highlights}}</textarea>
<div class="settings-description secondary-font-color">{{_ "Highlights_How_To"}}</div>
</div> </div>
</div> </div>
</div> </div>
@ -280,8 +279,8 @@
<h1>{{_ "Sound"}}</h1> <h1>{{_ "Sound"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
<div class="input-line double-col"> <div class="input-line double-col">
<label>{{_ "New_Room_Notification"}}</label> <label class="setting-label">{{_ "New_Room_Notification"}}</label>
<div class="rc-select"> <div class="rc-select setting-field">
<select name="newRoomNotification" class="audio rc-select__element"> <select name="newRoomNotification" class="audio rc-select__element">
<option value="none" selected="{{$eq newRoomNotification 'none'}}">{{_ "None"}}</option> <option value="none" selected="{{$eq newRoomNotification 'none'}}">{{_ "None"}}</option>
<option value="door" selected="{{$eq newRoomNotification 'door'}}">Door ({{_ "Default"}})</option> <option value="door" selected="{{$eq newRoomNotification 'door'}}">Door ({{_ "Default"}})</option>
@ -293,8 +292,8 @@
</div> </div>
</div> </div>
<div class="input-line double-col"> <div class="input-line double-col">
<label>{{_ "New_Message_Notification"}}</label> <label class="setting-label">{{_ "New_Message_Notification"}}</label>
<div class="rc-select"> <div class="rc-select setting-field">
<select name="newMessageNotification" class="audio rc-select__element"> <select name="newMessageNotification" class="audio rc-select__element">
<option value="none" selected="{{$eq newMessageNotification 'none'}}">{{_ "None"}}</option> <option value="none" selected="{{$eq newMessageNotification 'none'}}">{{_ "None"}}</option>
<option value="chime" selected="{{$eq newMessageNotification 'chime'}}">Chime ({{_ "Default"}})</option> <option value="chime" selected="{{$eq newMessageNotification 'chime'}}">Chime ({{_ "Default"}})</option>
@ -306,15 +305,15 @@
</div> </div>
</div> </div>
<div class="input-line double-col" id="muteFocusedConversations"> <div class="input-line double-col" id="muteFocusedConversations">
<label>{{_ "Mute_Focused_Conversations"}}</label> <label class="setting-label">{{_ "Mute_Focused_Conversations"}}</label>
<div> <div class="setting-field">
<label><input type="radio" name="muteFocusedConversations" value="true" checked="{{checked 'muteFocusedConversations' true}}"/> {{_ "True"}}</label> <label><input type="radio" name="muteFocusedConversations" value="true" checked="{{checked 'muteFocusedConversations' true}}"/> {{_ "True"}}</label>
<label><input type="radio" name="muteFocusedConversations" value="false" checked="{{checked 'muteFocusedConversations' false}}"/> {{_ "False"}}</label> <label><input type="radio" name="muteFocusedConversations" value="false" checked="{{checked 'muteFocusedConversations' false}}"/> {{_ "False"}}</label>
</div> </div>
</div> </div>
<div class="input-line double-col"> <div class="input-line double-col">
<label>{{_ "Notifications_Sound_Volume"}}</label> <label class="setting-label">{{_ "Notifications_Sound_Volume"}}</label>
<div> <div class="setting-field">
{{> slider id="notificationsSoundVolume" min="0" max="100" value=notificationsSoundVolume}} {{> slider id="notificationsSoundVolume" min="0" max="100" value=notificationsSoundVolume}}
</div> </div>
</div> </div>
@ -325,15 +324,13 @@
<div class="section"> <div class="section">
<h1>{{_ "My Data"}}</h1> <h1>{{_ "My Data"}}</h1>
<div class="section-content border-component-color"> <div class="section-content border-component-color">
<div class="input-line"> <div class="input-line double-col">
<label><button class="button download-my-data"><i class="icon-download secondary-font-color"></i> <span>{{_ "Download_My_Data"}}</span></button></label> <button class="rc-button setting-action download-my-data"><i class="icon-download secondary-font-color"></i> <span>{{_ "Download_My_Data"}}</span></button>
<label><button class="button export-my-data"><i class="icon-download secondary-font-color"></i> <span>{{_ "Export_My_Data"}}</span></button></label> <button class="rc-button setting-action export-my-data"><i class="icon-download secondary-font-color"></i> <span>{{_ "Export_My_Data"}}</span></button>
</div> </div>
</div> </div>
</div> </div>
{{/if}} {{/if}}
</fieldset>
</form> </form>
</div> </div>
</section> </section>

11
packages/rocketchat_theme/client/imports/general/base_old.css
Unescape View File

@ -375,8 +375,9 @@
display: inline-block; display: inline-block;
margin-right: 4px; margin-right: 4px;
padding: 10px 20px 10px 0;
line-height: 2.5rem; line-height: 15px;
&:nth-last-child(1) { &:nth-last-child(1) {
margin-right: 0; margin-right: 0;
@ -1817,6 +1818,10 @@ rc-old select,
border: none !important; border: none !important;
border-radius: 0 !important; border-radius: 0 !important;
p {
margin-bottom: 0.75rem;
}
& .input-line { & .input-line {
display: flex; display: flex;
@ -1856,6 +1861,10 @@ rc-old select,
line-height: 16px; line-height: 16px;
} }
.setting-action {
margin: 0 4px;
}
& .settings-description { & .settings-description {
padding-top: 2px; padding-top: 2px;

Write Preview
Loading…
Cancel
Save