diff --git a/app/badbrowser.html b/app/badbrowser.html index 235230c2..f5e0acfc 100644 --- a/app/badbrowser.html +++ b/app/badbrowser.html @@ -16,35 +16,10 @@ - -
- -
- -
- - -

Telegram Web

- +

Your browser is outdated!

@@ -66,42 +41,5 @@
-
-
- -
-
-
-
-
-

Fast messaging

-
Send messages with rich emoji support right from your desktop or laptop computer
-
-
- -
-
-
-

Easy file sharing

-
Share files of any type using drag-and-drop or the attachment icon
-
-
- -
-
-
-

Powerful tools

-
Browse shared media and files by type \n and set custom notifications
-
-
- -
-
-
-
- -
- - \ No newline at end of file diff --git a/app/css/app.css b/app/css/app.css index 757ce4ea..51dbec82 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -192,6 +192,108 @@ input[type="number"] { background: #fbe7e6; } +.md-input-group { + height: 50px; + border-bottom: 1px solid #e6e6e6; + /*padding: 0 0 10px;*/ + padding: 0; + margin: 0 0 22px; +} +.md-input-label { + font-weight: normal; + color: #999; + cursor: pointer; + display: block; + font-size: 13px; + margin: 0; + padding: 0; + z-index: 1; + pointer-events: none; + -webkit-font-smoothing: antialiased; + + transform-origin: left center; + -webkit-transform-origin: left center; + + -webkit-transform: translate3d(0, 22px, 0); + transform: translate3d(0, 22px, 0); +} +.md-input-animated .md-input-group, +.md-input-animated .md-input-label { + -webkit-transition: all 0.15s cubic-bezier(0.35, 0, 0.25, 1); + transition: all 0.15s cubic-bezier(0.35, 0, 0.25, 1); +} + +.md-input { + color: #000; + display: inline-block; + border: 0; + outline: 0; + font-size: 13px; + padding: 3px 0; + margin: 3px 0 0; + width: 100%; +} +.md-input-disabled .md-input { + color: #999; +} +.md-input-focused { + border-bottom: 2px solid #6bace1; +} +.md-input-error { + border-bottom: 2px solid #e2726f; +} +.md-input-error .md-input-label { + color: #d45a58; +} +.md-input-has-value .md-input-label { + -webkit-transform: scale(0.9); + transform: scale(0.9); +} +.md-input-group-centered, +.md-input-group-centered .md-input { + text-align: center; +} +.md-input-group-centered .md-input-label { + transform-origin: center center; + -webkit-transform-origin: center center; +} + + +.md_modal_head { + color: #FFF; + background: #5580a3; + padding: 0 0 28px 26px; +} +.md_modal_head_simple { + padding-bottom: 13px; +} + +.md_modal_actions_wrap { + float: right; +} +a.md_modal_action { + display: block; + float: right; + color: #dde8f1; + padding: 19px 15px 5px; +} +a.md_modal_action:hover { + color: #FFF; +} +a.md_modal_action_close { + padding-right: 22px; +} +a.md_modal_action:hover, +a.md_modal_action:focus, +a.md_modal_action:active { + text-decoration: none; +} +.md_modal_title { + font-weight: bold; + padding: 18px 0 5px; + font-size: 13px; +} + .navbar_offline .navbar-header, @@ -621,168 +723,181 @@ a.tg_radio_on:hover i.icon-radio { } -/* Welcome */ -.welcome_form { - background: #FFF; - padding: 45px 0 63px; - border-bottom: 1px solid #e9e9e9; -} -.welcome_logo { - background: url(../img/decentralization.png) 0 0 no-repeat; - background-size: 160px 160px; - display: block; - width: 160px; - height: 160px; - margin: 0 auto; +/* Login page */ +.login_head_bg { + background: #537c9a; + height: 226px; } -img.welcome_logo { - background: none; +.login_page { + margin: -131px auto 90px; + max-width: 404px; } -.welcome_header { - text-align: center; - font-size: 24px; - font-weight: normal; - margin: 15px 0 20px; +.login_head_wrap { + height: 75px; } -.welcome_text { - text-align: center; - margin-bottom: 26px; - font-size: 14px; - line-height: 14px; - padding: 0 15px; + +.login_head_logo_link { + display: inline-block; + line-height: 30px; + padding: 23px 15px 22px; } -.welcome_btn_wrap { - max-width: 219px; - margin: 0 auto; +.tg_logo_wrap { + line-height: 30px !important; } - -.welcome_footer { - background: #f8f8f8; - padding: 20px 0 65px; +.icon-tg-logo { + width: 30px; + height: 30px; + display: inline-block; + vertical-align: top; + background: url(../img/icons/General.png) no-repeat -5px -10px; + background-size: 40px 678px; + margin-right: 18px; } -.welcome_cards_wrap { - max-width: 870px; - margin: 0 auto; +.icon-tg-title { + width: 63px; + height: 16px; + display: inline-block; + vertical-align: middle; + background: url(../img/Telegram_2x.png) no-repeat 0 0; + background-size: 63px 16px; } - -.welcome_footer_card_wrap { - width: 260px; - margin: 41px auto 0; - text-align: center; +.login_head_submit_wrap, +.login_head_submit_progress { + float: right; } -.welcome_footer_card { - background: url(../img/WebIntro2_1x.png) 0 0 no-repeat; - background-size: 217px 178px; - width: 219px; - height: 180px; - border: 1px solid #e0e4e9; - margin: 0 auto 24px; +.login_head_submit_btn, +.login_head_submit_progress { + font-size: 13px; + line-height: 20px; + padding: 26px 15px 29px; + display: inline-block; + color: #FFF; } - -.welcome_footer_card_messaging { - background-image: url(../img/WebIntro1.png); +.login_head_submit_btn:hover, +.login_head_submit_btn:focus, +.login_head_submit_btn:active { + color: #FFF; + text-decoration: none; } -.is_1x .welcome_footer_card_messaging { - background-image: url(../img/WebIntro1_1x.png); +.icon-next-submit { + width: 7px; + height: 12px; + display: inline-block; + vertical-align: middle; + background: url(../img/icons/General.png) no-repeat -18px -50px; + background-size: 40px 678px; + margin-left: 12px; + margin-top: -1px; } -.welcome_footer_card_filesharing { - background-image: url(../img/WebIntro2.png); +.login_footer_wrap { + color: #84a2bc; + font-size: 13px; + line-height: 16px; + margin-top: 25px; + text-align: center; } -.is_1x .welcome_footer_card_filesharing { - background-image: url(../img/WebIntro2_1x.png); +.logo_footer_learn_more_link, +.logo_footer_learn_more_link:hover, +.logo_footer_learn_more_link:focus, +.logo_footer_learn_more_link:active { + color: #84a2bc; + font-weight: bold; } -.welcome_footer_card_powerful { - background-image: url(../img/WebIntro3.png); +.login_form_wrap { + background: #FFF; + padding: 44px 65px 44px; + + -webkit-box-shadow: 0px 1px 1px rgba(97, 127, 152, 0.2), + 1px 0px 0 rgba(97, 127, 152, 0.1), + -1px 0px 0 rgba(97, 127, 152, 0.1); + -moz-box-shadow: 0px 1px 1px rgba(97, 127, 152, 0.2), + 1px 0px 0 rgba(97, 127, 152, 0.1), + -1px 0px 0 rgba(97, 127, 152, 0.1); + box-shadow: 0px 1px 1px rgba(97, 127, 152, 0.2), + 1px 0px 0 rgba(97, 127, 152, 0.1), + -1px 0px 0 rgba(97, 127, 152, 0.1); + border-radius: 2px; + border: 0; + margin: 0; + max-width: none; } -.is_1x .welcome_footer_card_powerful { - background-image: url(../img/WebIntro3_1x.png); +.login_phone_country_input_group { + cursor: pointer; } - -.welcome_footer_card_wrap h4 { - font-size: 18px; +.login_phone_num_input_group { + overflow: hidden; } -.welcome_footer_card_wrap .welcome_footer_card_lead { - +.login_phone_code_input_group { + float: left; + width: 50px; + margin-right: 25px; } -/* Login page */ -.login_form_wrap { - max-width: 310px; - padding: 25px; +.login_footer_about_wrap { background: #FFF; - margin: 200px auto 0; - border-radius: 1px; - overflow: hidden; + margin-top: 12px; + padding: 44px 65px 44px; - -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0px 1px 0 #dfe5ec; + -moz-box-shadow: 0px 1px 0 #dfe5ec; + box-shadow: 0px 1px 0 #dfe5ec; + border-radius: 3px; + border: 1px solid #dfe5ec; +} +.login_footer_about_wrap h3 { + margin: 0 0 20px; + font-size: 15px; + font-weight: bold; + text-align: left; +} +.login_footer_about_wrap p { + margin: 0 0 20px; + font-size: 13px; + line-height: 160%; +} +.login_footer_about_wrap p:last-child { + margin: 0; } .login_form_head { color: #222222; - margin-top: 0; - margin-bottom: 7px; - text-align: center; -} -.login_edit_phone { - text-align: center; - margin-bottom: 3px; + margin: 0 0 20px; + font-size: 15px; + font-weight: bold; } .login_form_lead { - color: #959595; - text-align: center; + color: #999; margin: 15px 0 30px; font-size: 13px; + line-height: 160%; } .login_form_messaging { - text-align: center; - color: #959595; + color: #999; font-size: 13px; margin-top: 20px; + line-height: 160%; } - -.login_country_selector { - cursor: pointer; - background: #f7f7f7; - height: 34px; - padding: 10px 12px 10px 13px; - line-height: 14px; - margin-bottom: 12px; -} -.login_country_selector:hover { - background: #ededed; -} -.login_country_selector .icon-caret { - margin-top: 4px; - height: 5px; - width: 10px; - background-position: -16px -653px; -} - -.login_phone_country, -.login_phone_number { - float: left; - display: inline-block; - width: auto; - font-size: 12px; -} -.login_phone_country { - width: 53px; - margin-right: 9px; - padding: 6px 3px; +.login_phone_head { + color: #222222; + font-size: 15px; + font-weight: bold; text-align: center; + margin: 0; } -.login_phone_number { - width: 198px; +.login_edit_phone { + margin: 5px 0 15px; + text-align: center; } -.login_phone_code { +.login_smscode_lead { + color: #999; + margin: 15px 0 15px; + line-height: 160%; text-align: center; } -.login_first_name_wrap { - margin-bottom: 11px; +.login_smscode_lead:last-child { + margin-bottom: 30px; } @@ -844,7 +959,7 @@ img.welcome_logo { } -a.im_dialogs_search_clear { +a.tg_search_clear { position: absolute; right: 0; margin-top: -40px; @@ -852,14 +967,14 @@ a.im_dialogs_search_clear { height: 34px; opacity: 0.6; } -.contacts_modal_search a.im_dialogs_search_clear { +.contacts_modal_search a.tg_search_clear { right: 12px; margin-top: -34px; } -a.im_dialogs_search_clear:hover { +a.tg_search_clear:hover { opacity: 1; } -i.im_dialogs_search_clear { +i.icon-search-clear { display: inline-block; color: #999; width: 13px; @@ -869,7 +984,7 @@ i.im_dialogs_search_clear { background: url(../img/icons/IconsetW.png) -15px -192px no-repeat; background-size: 42px 1171px; } -.is_1x i.im_dialogs_search_clear { +.is_1x i.icon-search-clear { background-image: url(../img/icons/IconsetW_1x.png); } @@ -2100,23 +2215,9 @@ a:hover .icon-twitter { background-image: url(../img/icons/IconsetW_1x.png); } -.contacts_modal_search_clear { - position: absolute; +a.contacts_modal_search_clear { right: 9px; margin-top: -24px; - color: #999; - width: 13px; - height: 13px; - vertical-align: text-top; - background: url(../img/icons/IconsetW.png) -15px -192px no-repeat; - background-size: 42px 1171px; - opacity: 0.6; -} -.is_1x .contacts_modal_search_clear { - background-image: url(../img/icons/IconsetW_1x.png); -} -.contacts_modal_search_clear:hover { - opacity: 1; } .contacts_scrollable_wrap { @@ -2127,7 +2228,7 @@ a:hover .icon-twitter { text-align: center; color: #999; font-size: 16px; - line-height: 18px; + line-height: 160%; padding: 1px 50px; margin: 0; } @@ -2443,23 +2544,9 @@ a.peer_photo_init:focus { .countries_modal_search_field:active { background-color: #FFF; } -.countries_modal_search_clear { - position: absolute; - right: 9px; - margin-top: -23px; - color: #999; - width: 13px; - height: 13px; - vertical-align: text-top; - background: url(../img/icons/IconsetW.png) -15px -192px no-repeat; - background-size: 42px 1171px; - opacity: 0.6; -} -.is_1x .countries_modal_search_clear { - background-image: url(../img/icons/IconsetW_1x.png); -} -.countries_modal_search_clear:hover { - opacity: 1; +a.countries_modal_search_clear { + right: 12px; + margin-top: -34px; } .countries_modal_wrap .modal-body { padding: 14px 0; @@ -2644,98 +2731,6 @@ a.peer_photo_init:focus { } -.md-input-group { - height: 50px; - border-bottom: 1px solid #e6e6e6; - /*padding: 0 0 10px;*/ - padding: 0; - margin: 0 0 22px; -} -.md-input-label { - font-weight: normal; - color: #999; - cursor: pointer; - display: block; - font-size: 13px; - margin: 0; - padding: 0; - z-index: 1; - pointer-events: none; - -webkit-font-smoothing: antialiased; - - transform-origin: left center; - -webkit-transform-origin: left center; - - -webkit-transform: translate3d(0, 22px, 0); - transform: translate3d(0, 22px, 0); -} -.md-input-animated .md-input-group, -.md-input-animated .md-input-label { - -webkit-transition: all 0.15s cubic-bezier(0.35, 0, 0.25, 1); - transition: all 0.15s cubic-bezier(0.35, 0, 0.25, 1); -} - -.md-input { - color: #000; - display: inline-block; - border: 0; - outline: 0; - font-size: 13px; - padding: 3px 0; - margin: 3px 0 0; - width: 100%; -} -.md-input-disabled .md-input { - color: #999; -} -.md-input-focused { - border-bottom: 2px solid #6bace1; -} -.md-input-error { - border-bottom: 2px solid #a94442; -} -.md-input-has-value .md-input-label { - -webkit-transform: scale(0.9); - transform: scale(0.9); -} - - -.md_modal_head { - color: #FFF; - background: #5580a3; - padding: 0 0 28px 26px; -} -.md_modal_head_simple { - padding-bottom: 13px; -} - -.md_modal_actions_wrap { - float: right; -} -a.md_modal_action { - display: block; - float: right; - color: #dde8f1; - padding: 19px 15px 5px; -} -a.md_modal_action:hover { - color: #FFF; -} -a.md_modal_action_close { - padding-right: 22px; -} -a.md_modal_action:hover, -a.md_modal_action:focus, -a.md_modal_action:active { - text-decoration: none; -} -.md_modal_title { - font-weight: bold; - padding: 18px 0 5px; - font-size: 13px; -} - - .peer_modal_profile_wrap { padding: 35px 2px 0px; } diff --git a/app/css/desktop.css b/app/css/desktop.css index a8cfd15e..a6a2e5da 100644 --- a/app/css/desktop.css +++ b/app/css/desktop.css @@ -1411,9 +1411,17 @@ div.im_dialog_photo .peer_initials { transition: margin-top linear 0.2s; } +.countries_modal_search { + padding: 12px 12px 12px; + margin: 0; + position: relative; +} .countries_modal_col { max-height: 350px; } +.countries_modal_wrap .md_modal_body { + padding-bottom: 15px; +} .modal_close_wrap { diff --git a/app/css/mobile.css b/app/css/mobile.css index 71d428fe..a5296ef0 100644 --- a/app/css/mobile.css +++ b/app/css/mobile.css @@ -45,29 +45,12 @@ html { } .tg_page_head .navbar > .container .navbar-brand { padding: 8px 15px; - opacity: 0.9; margin-left: 0; margin-right: 20px; - -webkit-transition: opacity swing .9s; display: block; line-height: 0; height: auto; } -.tg_page_head .navbar > .container .navbar-brand:hover { - opacity: 1; -} -.tg_head_logo { - background: url(../img/T_LogoM.png) 0 0 no-repeat; - background-size: 143px 30px; - display: inline-block; - width: 143px; - height: 30px; - vertical-align: text-top; -} -.is_1x .tg_head_logo { - background-image: url(../img/T_LogoM_1x.png); -} - .tg_page_head .navbar-menu .navbar-nav.navbar-right { margin-right: 0; } @@ -294,7 +277,7 @@ html { float: left; margin: 0; } -.navbar_offline .tg_head_logo { +.navbar_offline .tg_logo_wrap { display: none; } .navbar-offline > li > a { @@ -371,22 +354,36 @@ html { -webkit-overflow-scrolling: touch; } -.welcome_text { - line-height: 150%; +.login_head_bg { + display: none; +} +.login_page { + margin-top: 0; + margin-bottom: 30px; +} +.login_head_wrap { + height: 75px; + background: #537c9a; } .login_form_wrap { border-radius: 0; - max-width: auto; + border-top: 0; + border-left: 0; + border-right: 0; box-shadow: none; - -webkit-box-shadow: none; - margin: 30px auto 20px; + padding: 44px 40px 44px; } -.login_form_wrap .btn-primary { - padding: 12px 13px; +.login_footer_about_wrap { + border-radius: 0; + border-top: 0; + border-left: 0; + border-right: 0; + box-shadow: none; + padding: 44px 40px 44px; } -.login_phone_country, -.login_phone_number { - height: 42px; + +.icon-next-submit { + margin-top: -3px; } .im_dialogs_empty_header { diff --git a/app/img/T_LogoM.png b/app/img/T_LogoM.png deleted file mode 100644 index 382cc029..00000000 Binary files a/app/img/T_LogoM.png and /dev/null differ diff --git a/app/img/T_LogoM_1x.png b/app/img/T_LogoM_1x.png deleted file mode 100644 index 3b46902b..00000000 Binary files a/app/img/T_LogoM_1x.png and /dev/null differ diff --git a/app/img/Telegram.png b/app/img/Telegram.png new file mode 100644 index 00000000..7348fea4 Binary files /dev/null and b/app/img/Telegram.png differ diff --git a/app/img/Telegram_2x.png b/app/img/Telegram_2x.png new file mode 100644 index 00000000..8c6da95e Binary files /dev/null and b/app/img/Telegram_2x.png differ diff --git a/app/img/WebIntro1.png b/app/img/WebIntro1.png deleted file mode 100644 index e6e1ef3c..00000000 Binary files a/app/img/WebIntro1.png and /dev/null differ diff --git a/app/img/WebIntro1_1x.png b/app/img/WebIntro1_1x.png deleted file mode 100644 index 683a5872..00000000 Binary files a/app/img/WebIntro1_1x.png and /dev/null differ diff --git a/app/img/WebIntro2.png b/app/img/WebIntro2.png deleted file mode 100644 index 1a5019ec..00000000 Binary files a/app/img/WebIntro2.png and /dev/null differ diff --git a/app/img/WebIntro2_1x.png b/app/img/WebIntro2_1x.png deleted file mode 100644 index 0d4cb190..00000000 Binary files a/app/img/WebIntro2_1x.png and /dev/null differ diff --git a/app/img/WebIntro3.png b/app/img/WebIntro3.png deleted file mode 100644 index 3e3f5991..00000000 Binary files a/app/img/WebIntro3.png and /dev/null differ diff --git a/app/img/WebIntro3_1x.png b/app/img/WebIntro3_1x.png deleted file mode 100644 index ed904875..00000000 Binary files a/app/img/WebIntro3_1x.png and /dev/null differ diff --git a/app/img/bg_tile.png b/app/img/bg_tile.png deleted file mode 100644 index bbd0b408..00000000 Binary files a/app/img/bg_tile.png and /dev/null differ diff --git a/app/img/changelog/search.png b/app/img/changelog/search.png deleted file mode 100644 index e79c00b1..00000000 Binary files a/app/img/changelog/search.png and /dev/null differ diff --git a/app/img/decentralization.png b/app/img/decentralization.png deleted file mode 100644 index 32ba9b41..00000000 Binary files a/app/img/decentralization.png and /dev/null differ diff --git a/app/img/logo_dogogram.png b/app/img/logo_dogogram.png deleted file mode 100644 index 694c7174..00000000 Binary files a/app/img/logo_dogogram.png and /dev/null differ diff --git a/app/js/controllers.js b/app/js/controllers.js index b4a63eff..fbe069ff 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -23,14 +23,14 @@ angular.module('myApp.controllers', ['myApp.i18n']) location.href = location.href.replace(/^http:/, 'https:'); return; } - $scope.showWelcome = true; + $location.url('/login'); }); ChangelogNotifyService.checkUpdate(); LayoutSwitchService.start(); }) - .controller('AppLoginController', function ($scope, $rootScope, $location, $timeout, $modal, $modalStack, MtpApiManager, ErrorService, NotificationsManager, ChangelogNotifyService, IdleManager, LayoutSwitchService, _) { + .controller('AppLoginController', function ($scope, $rootScope, $location, $timeout, $modal, $modalStack, MtpApiManager, ErrorService, NotificationsManager, ChangelogNotifyService, IdleManager, LayoutSwitchService, TelegramMeWebService, _) { $modalStack.dismissAll(); IdleManager.start(); @@ -44,8 +44,11 @@ angular.module('myApp.controllers', ['myApp.i18n']) !Config.Modes.http && Config.App.domains.indexOf(location.hostname) != -1) { location.href = location.href.replace(/^http:/, 'https:'); + return; } + TelegramMeWebService.setAuthorized(true); }); + var options = {dcID: 2, createNetworker: true}, countryChanged = false, selectedCountry = false; @@ -53,6 +56,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) $scope.credentials = {phone_country: '', phone_country_name: '', phone_number: '', phone_full: ''}; $scope.progress = {}; $scope.callPending = {}; + $scope.about = {}; $scope.chooseCountry = function () { var modal = $modal.open({ @@ -208,6 +212,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) $scope.credentials.viaApp = sentCode._ == 'auth.sentAppCode'; $scope.callPending.remaining = sentCode.send_call_timeout || 60; $scope.error = {}; + $scope.about = {}; callCheck(); @@ -279,6 +284,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) error.handled = true; $scope.credentials.phone_code_valid = true; $scope.credentials.phone_unoccupied = true; + $scope.about = {}; return; } else if (error.code == 400 && error.type == 'PHONE_NUMBER_OCCUPIED') { error.handled = true; diff --git a/app/js/directives.js b/app/js/directives.js index 133c6da0..212874ce 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -2531,3 +2531,41 @@ angular.module('myApp.directives', ['myApp.filters']) }; }) + + .directive('mySubmitOnEnter', function () { + + return { + link: link + }; + + function link($scope, element, attrs) { + element.on('keydown', function (event) { + if (event.keyCode == 13) { + element.trigger('submit'); + } + }); + }; + }) + + .directive('myScrollToOn', function () { + + return { + link: function($scope, element, attrs) { + var ev = attrs.myScrollToOn; + var doScroll = function () { + onContentLoaded(function () { + console.log(111,element, element.offset().top); + $('html, body').animate({ + scrollTop: element.offset().top + }, 200); + }); + }; + if (ev == '$init') { + doScroll(); + } else { + $scope.$on(ev, doScroll); + } + } + }; + + }) diff --git a/app/js/locales/en-us.json b/app/js/locales/en-us.json index 6470180b..4a95f82a 100644 --- a/app/js/locales/en-us.json +++ b/app/js/locales/en-us.json @@ -326,7 +326,9 @@ "login_sign_in": "Sign in", "login_enter_number_description": "Please choose your country and enter your full phone number.", "login_incorrect_number": "Incorrect phone number", - "login_tel_input_placeholder": "Enter your phone", + "login_code_input_placeholder": "Code", + "login_tel_input_placeholder": "Phone number", + "login_country_select_placeholder": "Country", "login_generating_key": "Generating keys", "login_generating_keys_info": "Keys are only generated once. This can take a few minutes on slower devices, please be patient.", "login_edit_number": "Edit phone number", @@ -347,6 +349,12 @@ "login_last_name": "Last name", "login_signing_up": "Signing up", "login_sign_up": "Sign up", + "login_about_title": "About", + "login_about_desc1_md": "Telegram web-client is free, fast and secure way to enjoy most of the **Telegram** features right from your **web-browser**.", + "login_about_desc2_md": "It is always synced to to the **Telegram app** on your mobile device, which makes it a pretty useful tool for messaging and sharing files.", + "login_about_desc3_md": "We designed this product not because we were told to, but because we wanted it for ourselves. Our {source-link: source code} is open, so everyone can make a contribution.", + "login_about_intro": "Welcome to the official Telegram web-client.", + "login_about_learn": "Learn more", "login_controller_unknown_country": "Unknown", @@ -378,16 +386,6 @@ "phonebook_modal_submit_active": "Importing", "phonebook_modal_submit": "Import contacts", - "welcome_header_md": "**Telegram** Web", - "welcome_text_1_md": "The official **web client** for Telegram.", - "welcome_start_messaging": "Start Messaging", - "welcome_fast_messaging_header": "Fast messaging", - "welcome_fast_messaging_text": "Send messages with rich emoji support right from your desktop or laptop computer", - "welcome_easy_sharing_header": "Easy file sharing", - "welcome_easy_sharing_text": "Share files of any type using drag-and-drop or the attachment icon", - "welcome_powerful_tools_header": "Powerful tools", - "welcome_powerful_tools_text_md": "Browse shared media and files by type \n and set custom notifications", - "country_select_modal_country_ab": "Abkhazia", "country_select_modal_country_af": "Afghanistan", "country_select_modal_country_ax": "Åland Islands", diff --git a/app/partials/desktop/contacts_modal.html b/app/partials/desktop/contacts_modal.html index 8d30d95e..38bb4dd6 100644 --- a/app/partials/desktop/contacts_modal.html +++ b/app/partials/desktop/contacts_modal.html @@ -24,8 +24,8 @@
- - + +
diff --git a/app/partials/desktop/country_select_modal.html b/app/partials/desktop/country_select_modal.html index 84861e1b..c087b858 100644 --- a/app/partials/desktop/country_select_modal.html +++ b/app/partials/desktop/country_select_modal.html @@ -1,12 +1,22 @@ -
+
-
+
+
+
+ +
+
+
+
-

+
- + + + +
@@ -32,8 +42,4 @@
-
- -
-
diff --git a/app/partials/desktop/edit_contact_modal.html b/app/partials/desktop/edit_contact_modal.html index ad410130..f866b678 100644 --- a/app/partials/desktop/edit_contact_modal.html +++ b/app/partials/desktop/edit_contact_modal.html @@ -13,12 +13,12 @@
- +
- +
diff --git a/app/partials/desktop/head.html b/app/partials/desktop/head.html index 2b597cea..8f68b89d 100644 --- a/app/partials/desktop/head.html +++ b/app/partials/desktop/head.html @@ -11,14 +11,14 @@
-
-
+
diff --git a/app/partials/desktop/im.html b/app/partials/desktop/im.html index 12b5d230..6f5a38bf 100644 --- a/app/partials/desktop/im.html +++ b/app/partials/desktop/im.html @@ -8,8 +8,8 @@
- - + +
diff --git a/app/partials/desktop/import_contact_modal.html b/app/partials/desktop/import_contact_modal.html index cf7ac891..bfaa06f1 100644 --- a/app/partials/desktop/import_contact_modal.html +++ b/app/partials/desktop/import_contact_modal.html @@ -8,17 +8,17 @@
- +
- +
- +
diff --git a/app/partials/desktop/login.html b/app/partials/desktop/login.html index c5aacbb8..47101036 100644 --- a/app/partials/desktop/login.html +++ b/app/partials/desktop/login.html @@ -1,86 +1,123 @@ -
+