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

[IMPROVE] Replaces color #13679A to #1d74f5 (#13796)

Browse Source 
* Changes Channel description to textarea

* Solves linting issue

* Updates color #13679A to $1d74f5

Revert "Solves linting issue"

This reverts commit 6c8cc95803.

Revert "Changes Channel description to textarea"

This reverts commit df20b14f1c.

Updates color #13679A to #1d74f5
pull/13803/head
Amish Mittal 6 years ago committed by Gabriel Engel
parent c143bd4320
commit e4e0d7ef20
8 changed files with 8 additions and 8 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. 2
      app/cas/server/cas_rocketchat.js
  2. 2
      app/dolphin/server/startup.js
  3. 2
      app/lib/server/methods/addOAuthService.js
  4. 2
      app/message-attachments/client/stylesheets/messageAttachments.css
  5. 2
      app/meteor-accounts-saml/server/saml_rocketchat.js
  6. 2
      app/theme/client/imports/general/base_old.css
  7. 2
      app/theme/server/variables.js
  8. 2
      server/startup/migrations/v103.js

2
app/cas/server/cas_rocketchat.js
Unescape View File

@ -23,7 +23,7 @@ Meteor.startup(function() {
this.add('CAS_popup_height', '610', { type: 'string', group: 'CAS', public: true });
this.add('CAS_button_label_text', 'CAS', { type: 'string', group: 'CAS' });
this.add('CAS_button_label_color', '#FFFFFF', { type: 'color', group: 'CAS' });
this.add('CAS_button_color', '#13679A', { type: 'color', group: 'CAS' });
this.add('CAS_button_color', '#1d74f5', { type: 'color', group: 'CAS' });
this.add('CAS_autoclose', true, { type: 'boolean', group: 'CAS' });
});
});

2
app/dolphin/server/startup.js
Unescape View File

@ -7,4 +7,4 @@ settings.add('Accounts_OAuth_Dolphin_secret', '', { type: 'string', group: 'OAut
settings.add('Accounts_OAuth_Dolphin_login_style', 'redirect', { type: 'select', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Login_Style', persistent: true, values: [{ key: 'redirect', i18nLabel: 'Redirect' }, { key: 'popup', i18nLabel: 'Popup' }, { key: '', i18nLabel: 'Default' }] });
settings.add('Accounts_OAuth_Dolphin_button_label_text', '', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Text', persistent: true });
settings.add('Accounts_OAuth_Dolphin_button_label_color', '#FFFFFF', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color', persistent: true });
settings.add('Accounts_OAuth_Dolphin_button_color', '#13679A', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Button_Color', persistent: true });
settings.add('Accounts_OAuth_Dolphin_button_color', '#1d74f5', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Button_Color', persistent: true });

2
app/lib/server/methods/addOAuthService.js
Unescape View File

@ -34,7 +34,7 @@ Meteor.methods({
settings.add(`Accounts_OAuth_Custom-${ name }-login_style` , 'popup' , { type: 'select' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Login_Style', persistent: true, values: [{ key: 'redirect', i18nLabel: 'Redirect' }, { key: 'popup', i18nLabel: 'Popup' }, { key: '', i18nLabel: 'Default' }] });
settings.add(`Accounts_OAuth_Custom-${ name }-button_label_text` , '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Text', persistent: true });
settings.add(`Accounts_OAuth_Custom-${ name }-button_label_color` , '#FFFFFF' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color', persistent: true });
settings.add(`Accounts_OAuth_Custom-${ name }-button_color` , '#13679A' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Button_Color', persistent: true });
settings.add(`Accounts_OAuth_Custom-${ name }-button_color` , '#1d74f5' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Button_Color', persistent: true });
settings.add(`Accounts_OAuth_Custom-${ name }-username_field` , '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Username_Field', persistent: true });
settings.add(`Accounts_OAuth_Custom-${ name }-merge_users` , false , { type: 'boolean', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Merge_Users', persistent: true });
} });

2
app/message-attachments/client/stylesheets/messageAttachments.css
Unescape View File

@ -66,7 +66,7 @@ html.rtl .attachment {
& .attachment-title {
color: #13679a;
color: #1d74f5;
font-size: 1.02rem;
font-weight: 500;

2
app/meteor-accounts-saml/server/saml_rocketchat.js
Unescape View File

@ -79,7 +79,7 @@ Meteor.methods({
section: name,
i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color',
});
settings.add(`SAML_Custom_${ name }_button_color`, '#13679A', {
settings.add(`SAML_Custom_${ name }_button_color`, '#1d74f5', {
type: 'string',
group: 'SAML',
section: name,

2
app/theme/client/imports/general/base_old.css
Unescape View File

@ -4237,7 +4237,7 @@ body:not(.is-cordova) {
font-weight: 400;
&:focus {
border-color: #13679a !important;
border-color: #1d74f5 !important;
}
}

2
app/theme/server/variables.js
Unescape View File

@ -31,7 +31,7 @@ const majorColors = {
'content-background-color': '#FFFFFF',
'primary-background-color': '#04436A',
'primary-font-color': '#444444',
'primary-action-color': '#13679A', // was action-buttons-color
'primary-action-color': '#1d74f5', // was action-buttons-color
'secondary-background-color': '#F4F4F4',
'secondary-font-color': '#A0A0A0',
'secondary-action-color': '#DDDDDD',

2
server/startup/migrations/v103.js
Unescape View File

@ -5,7 +5,7 @@ const majorColors = {
'content-background-color': '#FFFFFF',
'primary-background-color': '#04436A',
'primary-font-color': '#444444',
'primary-action-color': '#13679A', // was action-buttons-color
'primary-action-color': '#1d74f5', // was action-buttons-color
'secondary-background-color': '#F4F4F4',
'secondary-font-color': '#A0A0A0',
'secondary-action-color': '#DDDDDD',

Write Preview
Loading…
Cancel
Save