From 35c82f9c17cc84730c4e128f4e740f9317ee4347 Mon Sep 17 00:00:00 2001 From: MrKeksi Date: Tue, 4 Aug 2020 16:26:41 +0200 Subject: [PATCH] small cosmetic changes (#1872) * removed remains * comment adapted * removes blinking background from icons on buttons like copy (from room links) Co-authored-by: Ahmad Farhat --- app/assets/stylesheets/application.scss | 4 ++++ app/helpers/theming_helper.rb | 2 +- config/locales/en.yml | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 32f192a3..13b0c128 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -183,3 +183,7 @@ table { #delete-confirm:disabled { cursor: not-allowed; } + +.btn i { + transition: all .15s; +} diff --git a/app/helpers/theming_helper.rb b/app/helpers/theming_helper.rb index b1a28205..f6754f31 100644 --- a/app/helpers/theming_helper.rb +++ b/app/helpers/theming_helper.rb @@ -27,7 +27,7 @@ module ThemingHelper @settings.get_value("Legal URL") || "" end - # Returns the logo based on user's provider + # Returns the privacy policy URL based on user's provider def privpolicy_url @settings.get_value("Privacy Policy URL") || "" end diff --git a/config/locales/en.yml b/config/locales/en.yml index 5c42bbfc..36443b4e 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -370,8 +370,6 @@ en: verify_text: 'To verify your account, just follow this link: %{url}' verify_link: Verify Account thanks: Thanks for joining and have a great day! - maintenance: - window_alert: Maintenance window scheduled for %{date} max_concurrent: The maximum number of concurrent sessions allowed has been reached! merged: Merged modal: