diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index e9a6cded9..9fcac5428 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -252,7 +252,7 @@ peerListBox: PeerList(defaultPeerList) { } localStorageRowHeight: 50px; -localStorageRowPadding: margins(23px, 5px, 20px, 5px); +localStorageRowPadding: margins(22px, 5px, 20px, 5px); localStorageRowTitle: FlatLabel(defaultFlatLabel) { textFg: windowBoldFg; maxHeight: 20px; @@ -275,11 +275,11 @@ localStorageClear: defaultBoxButton; localStorageLimitLabel: LabelSimple(defaultLabelSimple) { font: boxTextFont; } -localStorageLimitLabelMargin: margins(23px, 10px, 20px, 5px); +localStorageLimitLabelMargin: margins(22px, 10px, 20px, 5px); localStorageLimitSlider: MediaSlider(defaultContinuousSlider) { seekSize: size(15px, 15px); } -localStorageLimitMargin: margins(23px, 5px, 20px, 10px); +localStorageLimitMargin: margins(22px, 5px, 20px, 10px); shareRowsTop: 12px; shareRowHeight: 108px; @@ -340,7 +340,7 @@ sessionsHeight: 350px; sessionHeight: 70px; sessionCurrentPadding: margins(0px, 7px, 0px, 4px); sessionCurrentHeight: 118px; -sessionPadding: margins(23px, 10px, 23px, 0px); +sessionPadding: margins(22px, 10px, 22px, 0px); sessionNameFont: msgNameFont; sessionNameFg: boxTextFg; sessionWhenFont: msgDateFont; @@ -428,7 +428,7 @@ aboutLabel: FlatLabel(defaultFlatLabel) { } autoDownloadTopDelta: 10px; -autoDownloadTitlePosition: point(23px, 18px); +autoDownloadTitlePosition: point(22px, 18px); autoDownloadTitleFont: font(15px semibold); autoDownloadLimitSlider: MediaSlider(defaultContinuousSlider) { seekSize: size(15px, 15px); @@ -562,7 +562,7 @@ passcodeTextStyle: TextStyle(defaultTextStyle) { lineHeight: 20px; } -usernamePadding: margins(23px, 6px, 21px, 12px); +usernamePadding: margins(22px, 6px, 21px, 12px); usernameSkip: 49px; usernameTextStyle: TextStyle(boxTextStyle, passcodeTextStyle) { } @@ -642,9 +642,9 @@ rightsToggle: Toggle(defaultToggle) { } rightsDividerHeight: boxDividerHeight; rightsDividerMargin: margins(0px, 0px, 0px, 20px); -rightsHeaderMargin: margins(23px, 0px, 23px, 8px); -rightsToggleMargin: margins(23px, 8px, 23px, 8px); -rightsAboutMargin: margins(23px, 8px, 23px, 8px); +rightsHeaderMargin: margins(22px, 0px, 22px, 8px); +rightsToggleMargin: margins(22px, 8px, 22px, 8px); +rightsAboutMargin: margins(22px, 8px, 22px, 8px); rightsPhotoButton: UserpicButton(defaultUserpicButton) { size: size(60px, 60px); photoSize: 60px; @@ -773,8 +773,8 @@ markdownLinkFieldPadding: margins(22px, 0px, 22px, 10px); termsContent: FlatLabel(defaultFlatLabel) { minWidth: 285px; } -termsPadding: margins(23px, 4px, 16px, 16px); -termsAgePadding: margins(23px, 16px, 16px, 0px); +termsPadding: margins(22px, 4px, 16px, 16px); +termsAgePadding: margins(22px, 16px, 16px, 0px); themesSmallSkip: 10px; themesBackgroundSize: 120px; @@ -860,7 +860,7 @@ createPollWarning: FlatLabel(defaultFlatLabel) { } } createPollWarningPosition: point(16px, 6px); -createPollCheckboxMargin: margins(23px, 10px, 23px, 10px); +createPollCheckboxMargin: margins(22px, 10px, 22px, 10px); createPollFieldTitlePadding: margins(22px, 7px, 10px, 6px); callSettingsButton: IconButton { diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index dd99400d2..4eb75eded 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -271,7 +271,7 @@ autocompleteRowAnswer: defaultTextStyle; manageEmojiPreview: 22px; manageEmojiPreviewWidth: 48px; manageEmojiPreviewHeight: 48px; -manageEmojiPreviewPadding: margins(23px, 9px, 19px, 9px); +manageEmojiPreviewPadding: margins(22px, 9px, 19px, 9px); manageEmojiMarginRight: 21px; manageEmojiNameTop: 3px; manageEmojiStatusTop: 25px; diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index 2d0b70a92..cfaa8bbe7 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -180,7 +180,7 @@ infoTopBar: InfoTopBar { height: infoTopBarHeight; back: infoTopBarBack; title: infoTopBarTitle; - titlePosition: point(23px, 18px); + titlePosition: point(22px, 18px); bg: windowBg; mediaCancel: infoTopBarMediaCancel; mediaActionsSkip: 4px; @@ -415,7 +415,7 @@ infoProfileButton: SettingsButton { toggle: infoProfileToggle; toggleOver: infoProfileToggleOver; - toggleSkip: 23px; + toggleSkip: 22px; ripple: defaultRippleAnimation; } @@ -635,7 +635,7 @@ editPeerSkip: 7px; editPeerHistoryVisibilityMargins: margins(15px, 0px, 20px, 16px); terminateSessionsButton: SettingsButton(infoBlockButton) { - padding: margins(23px, 12px, 23px, 10px); + padding: margins(22px, 12px, 22px, 10px); } infoEmptyFg: windowSubTextFg; @@ -664,14 +664,14 @@ editPeerTopButtonsLayoutSkipCustomBottom: 11px; editPeerHistoryVisibilityTopSkip: 8px; -editPeerDeleteButtonMargins: margins(25px, 11px, 23px, 16px); +editPeerDeleteButtonMargins: margins(25px, 11px, 22px, 16px); editPeerDeleteButton: sessionTerminateAllButton; -editPeerPhotoMargins: margins(23px, 16px, 23px, 8px); +editPeerPhotoMargins: margins(22px, 16px, 22px, 8px); editPeerTitle: defaultInputField; -editPeerTitleMargins: margins(27px, 21px, 23px, 8px); +editPeerTitleMargins: margins(27px, 21px, 22px, 8px); editPeerDescription: newGroupDescription; -editPeerDescriptionMargins: margins(23px, 5px, 23px, 16px); -editPeerPrivaciesMargins: margins(15px, 7px, 23px, 0px); +editPeerDescriptionMargins: margins(22px, 5px, 22px, 16px); +editPeerPrivaciesMargins: margins(15px, 7px, 22px, 0px); editPeerPrivacyTopSkip: 10px; editPeerPrivacyBottomSkip: 16px; editPeerPrivacyLabel: FlatLabel(defaultFlatLabel) { @@ -701,7 +701,7 @@ editPeerInviteLink: FlatLabel(defaultFlatLabel) { style: boxTextStyle; } editPeerInviteLinkButton: boxLinkButton; -editPeerUsernameMargins: margins(23px, 17px, 23px, 2px); +editPeerUsernameMargins: margins(22px, 17px, 22px, 2px); editPeerUsernameGood: FlatLabel(defaultFlatLabel) { textFg: boxTextFgGood; style: boxTextStyle; @@ -709,9 +709,9 @@ editPeerUsernameGood: FlatLabel(defaultFlatLabel) { editPeerUsernameError: FlatLabel(editPeerUsernameGood) { textFg: boxTextFgError; } -editPeerUsernamePosition: point(23px, 18px); +editPeerUsernamePosition: point(22px, 18px); editPeerInviteLinkSkip: 10px; -editPeerInvitesMargins: margins(23px, 17px, 23px, 16px); +editPeerInvitesMargins: margins(22px, 17px, 22px, 16px); editPeerInvitesTopSkip: 10px; editPeerInvitesSkip: 10px; editPeerInviteLinkBoxBottomSkip: 15px; diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index 99b55bc5b..509e1e706 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -200,13 +200,13 @@ autoDownloadLimitButton: SettingsButton(settingsButton) { settingsAudioVolumeSlider: MediaSlider(defaultContinuousSlider) { seekSize: size(15px, 15px); } -settingsAudioVolumeSliderPadding: margins(23px, 5px, 20px, 10px); +settingsAudioVolumeSliderPadding: margins(22px, 5px, 20px, 10px); settingsAudioVolumeLabel: LabelSimple(defaultLabelSimple) { font: boxTextFont; textFg: windowBoldFg; } settingsAudioVolumeLabelPadding: margins(22px, 11px, 22px, 11px); -settingsLevelMeterPadding: margins(23px, 10px, 20px, 10px); +settingsLevelMeterPadding: margins(22px, 10px, 20px, 10px); settingsForwardPrivacyPadding: 8px; settingsForwardPrivacyArrowSkip: 32px; diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index c2980f904..1699c2c0a 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -225,7 +225,7 @@ createThemeImportButton: SettingsButton { font: semiboldFont; height: 20px; - padding: margins(23px, 10px, 23px, 8px); + padding: margins(22px, 10px, 22px, 8px); ripple: defaultRippleAnimation; } diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 725d768f0..1647b0b76 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 725d768f0ff1c22f6b477c28c324c20cbf2419da +Subproject commit 1647b0b76a3352f5d9b2892441eeaf002256a481