Use similar margins in all controls.

This commit is contained in:
John Preston 2020-04-29 12:08:34 +04:00
parent c14e20b33f
commit aabc8173c3
6 changed files with 28 additions and 28 deletions

View File

@ -252,7 +252,7 @@ peerListBox: PeerList(defaultPeerList) {
} }
localStorageRowHeight: 50px; localStorageRowHeight: 50px;
localStorageRowPadding: margins(23px, 5px, 20px, 5px); localStorageRowPadding: margins(22px, 5px, 20px, 5px);
localStorageRowTitle: FlatLabel(defaultFlatLabel) { localStorageRowTitle: FlatLabel(defaultFlatLabel) {
textFg: windowBoldFg; textFg: windowBoldFg;
maxHeight: 20px; maxHeight: 20px;
@ -275,11 +275,11 @@ localStorageClear: defaultBoxButton;
localStorageLimitLabel: LabelSimple(defaultLabelSimple) { localStorageLimitLabel: LabelSimple(defaultLabelSimple) {
font: boxTextFont; font: boxTextFont;
} }
localStorageLimitLabelMargin: margins(23px, 10px, 20px, 5px); localStorageLimitLabelMargin: margins(22px, 10px, 20px, 5px);
localStorageLimitSlider: MediaSlider(defaultContinuousSlider) { localStorageLimitSlider: MediaSlider(defaultContinuousSlider) {
seekSize: size(15px, 15px); seekSize: size(15px, 15px);
} }
localStorageLimitMargin: margins(23px, 5px, 20px, 10px); localStorageLimitMargin: margins(22px, 5px, 20px, 10px);
shareRowsTop: 12px; shareRowsTop: 12px;
shareRowHeight: 108px; shareRowHeight: 108px;
@ -340,7 +340,7 @@ sessionsHeight: 350px;
sessionHeight: 70px; sessionHeight: 70px;
sessionCurrentPadding: margins(0px, 7px, 0px, 4px); sessionCurrentPadding: margins(0px, 7px, 0px, 4px);
sessionCurrentHeight: 118px; sessionCurrentHeight: 118px;
sessionPadding: margins(23px, 10px, 23px, 0px); sessionPadding: margins(22px, 10px, 22px, 0px);
sessionNameFont: msgNameFont; sessionNameFont: msgNameFont;
sessionNameFg: boxTextFg; sessionNameFg: boxTextFg;
sessionWhenFont: msgDateFont; sessionWhenFont: msgDateFont;
@ -428,7 +428,7 @@ aboutLabel: FlatLabel(defaultFlatLabel) {
} }
autoDownloadTopDelta: 10px; autoDownloadTopDelta: 10px;
autoDownloadTitlePosition: point(23px, 18px); autoDownloadTitlePosition: point(22px, 18px);
autoDownloadTitleFont: font(15px semibold); autoDownloadTitleFont: font(15px semibold);
autoDownloadLimitSlider: MediaSlider(defaultContinuousSlider) { autoDownloadLimitSlider: MediaSlider(defaultContinuousSlider) {
seekSize: size(15px, 15px); seekSize: size(15px, 15px);
@ -562,7 +562,7 @@ passcodeTextStyle: TextStyle(defaultTextStyle) {
lineHeight: 20px; lineHeight: 20px;
} }
usernamePadding: margins(23px, 6px, 21px, 12px); usernamePadding: margins(22px, 6px, 21px, 12px);
usernameSkip: 49px; usernameSkip: 49px;
usernameTextStyle: TextStyle(boxTextStyle, passcodeTextStyle) { usernameTextStyle: TextStyle(boxTextStyle, passcodeTextStyle) {
} }
@ -642,9 +642,9 @@ rightsToggle: Toggle(defaultToggle) {
} }
rightsDividerHeight: boxDividerHeight; rightsDividerHeight: boxDividerHeight;
rightsDividerMargin: margins(0px, 0px, 0px, 20px); rightsDividerMargin: margins(0px, 0px, 0px, 20px);
rightsHeaderMargin: margins(23px, 0px, 23px, 8px); rightsHeaderMargin: margins(22px, 0px, 22px, 8px);
rightsToggleMargin: margins(23px, 8px, 23px, 8px); rightsToggleMargin: margins(22px, 8px, 22px, 8px);
rightsAboutMargin: margins(23px, 8px, 23px, 8px); rightsAboutMargin: margins(22px, 8px, 22px, 8px);
rightsPhotoButton: UserpicButton(defaultUserpicButton) { rightsPhotoButton: UserpicButton(defaultUserpicButton) {
size: size(60px, 60px); size: size(60px, 60px);
photoSize: 60px; photoSize: 60px;
@ -773,8 +773,8 @@ markdownLinkFieldPadding: margins(22px, 0px, 22px, 10px);
termsContent: FlatLabel(defaultFlatLabel) { termsContent: FlatLabel(defaultFlatLabel) {
minWidth: 285px; minWidth: 285px;
} }
termsPadding: margins(23px, 4px, 16px, 16px); termsPadding: margins(22px, 4px, 16px, 16px);
termsAgePadding: margins(23px, 16px, 16px, 0px); termsAgePadding: margins(22px, 16px, 16px, 0px);
themesSmallSkip: 10px; themesSmallSkip: 10px;
themesBackgroundSize: 120px; themesBackgroundSize: 120px;
@ -860,7 +860,7 @@ createPollWarning: FlatLabel(defaultFlatLabel) {
} }
} }
createPollWarningPosition: point(16px, 6px); createPollWarningPosition: point(16px, 6px);
createPollCheckboxMargin: margins(23px, 10px, 23px, 10px); createPollCheckboxMargin: margins(22px, 10px, 22px, 10px);
createPollFieldTitlePadding: margins(22px, 7px, 10px, 6px); createPollFieldTitlePadding: margins(22px, 7px, 10px, 6px);
callSettingsButton: IconButton { callSettingsButton: IconButton {

View File

@ -271,7 +271,7 @@ autocompleteRowAnswer: defaultTextStyle;
manageEmojiPreview: 22px; manageEmojiPreview: 22px;
manageEmojiPreviewWidth: 48px; manageEmojiPreviewWidth: 48px;
manageEmojiPreviewHeight: 48px; manageEmojiPreviewHeight: 48px;
manageEmojiPreviewPadding: margins(23px, 9px, 19px, 9px); manageEmojiPreviewPadding: margins(22px, 9px, 19px, 9px);
manageEmojiMarginRight: 21px; manageEmojiMarginRight: 21px;
manageEmojiNameTop: 3px; manageEmojiNameTop: 3px;
manageEmojiStatusTop: 25px; manageEmojiStatusTop: 25px;

View File

@ -180,7 +180,7 @@ infoTopBar: InfoTopBar {
height: infoTopBarHeight; height: infoTopBarHeight;
back: infoTopBarBack; back: infoTopBarBack;
title: infoTopBarTitle; title: infoTopBarTitle;
titlePosition: point(23px, 18px); titlePosition: point(22px, 18px);
bg: windowBg; bg: windowBg;
mediaCancel: infoTopBarMediaCancel; mediaCancel: infoTopBarMediaCancel;
mediaActionsSkip: 4px; mediaActionsSkip: 4px;
@ -415,7 +415,7 @@ infoProfileButton: SettingsButton {
toggle: infoProfileToggle; toggle: infoProfileToggle;
toggleOver: infoProfileToggleOver; toggleOver: infoProfileToggleOver;
toggleSkip: 23px; toggleSkip: 22px;
ripple: defaultRippleAnimation; ripple: defaultRippleAnimation;
} }
@ -635,7 +635,7 @@ editPeerSkip: 7px;
editPeerHistoryVisibilityMargins: margins(15px, 0px, 20px, 16px); editPeerHistoryVisibilityMargins: margins(15px, 0px, 20px, 16px);
terminateSessionsButton: SettingsButton(infoBlockButton) { terminateSessionsButton: SettingsButton(infoBlockButton) {
padding: margins(23px, 12px, 23px, 10px); padding: margins(22px, 12px, 22px, 10px);
} }
infoEmptyFg: windowSubTextFg; infoEmptyFg: windowSubTextFg;
@ -664,14 +664,14 @@ editPeerTopButtonsLayoutSkipCustomBottom: 11px;
editPeerHistoryVisibilityTopSkip: 8px; editPeerHistoryVisibilityTopSkip: 8px;
editPeerDeleteButtonMargins: margins(25px, 11px, 23px, 16px); editPeerDeleteButtonMargins: margins(25px, 11px, 22px, 16px);
editPeerDeleteButton: sessionTerminateAllButton; editPeerDeleteButton: sessionTerminateAllButton;
editPeerPhotoMargins: margins(23px, 16px, 23px, 8px); editPeerPhotoMargins: margins(22px, 16px, 22px, 8px);
editPeerTitle: defaultInputField; editPeerTitle: defaultInputField;
editPeerTitleMargins: margins(27px, 21px, 23px, 8px); editPeerTitleMargins: margins(27px, 21px, 22px, 8px);
editPeerDescription: newGroupDescription; editPeerDescription: newGroupDescription;
editPeerDescriptionMargins: margins(23px, 5px, 23px, 16px); editPeerDescriptionMargins: margins(22px, 5px, 22px, 16px);
editPeerPrivaciesMargins: margins(15px, 7px, 23px, 0px); editPeerPrivaciesMargins: margins(15px, 7px, 22px, 0px);
editPeerPrivacyTopSkip: 10px; editPeerPrivacyTopSkip: 10px;
editPeerPrivacyBottomSkip: 16px; editPeerPrivacyBottomSkip: 16px;
editPeerPrivacyLabel: FlatLabel(defaultFlatLabel) { editPeerPrivacyLabel: FlatLabel(defaultFlatLabel) {
@ -701,7 +701,7 @@ editPeerInviteLink: FlatLabel(defaultFlatLabel) {
style: boxTextStyle; style: boxTextStyle;
} }
editPeerInviteLinkButton: boxLinkButton; editPeerInviteLinkButton: boxLinkButton;
editPeerUsernameMargins: margins(23px, 17px, 23px, 2px); editPeerUsernameMargins: margins(22px, 17px, 22px, 2px);
editPeerUsernameGood: FlatLabel(defaultFlatLabel) { editPeerUsernameGood: FlatLabel(defaultFlatLabel) {
textFg: boxTextFgGood; textFg: boxTextFgGood;
style: boxTextStyle; style: boxTextStyle;
@ -709,9 +709,9 @@ editPeerUsernameGood: FlatLabel(defaultFlatLabel) {
editPeerUsernameError: FlatLabel(editPeerUsernameGood) { editPeerUsernameError: FlatLabel(editPeerUsernameGood) {
textFg: boxTextFgError; textFg: boxTextFgError;
} }
editPeerUsernamePosition: point(23px, 18px); editPeerUsernamePosition: point(22px, 18px);
editPeerInviteLinkSkip: 10px; editPeerInviteLinkSkip: 10px;
editPeerInvitesMargins: margins(23px, 17px, 23px, 16px); editPeerInvitesMargins: margins(22px, 17px, 22px, 16px);
editPeerInvitesTopSkip: 10px; editPeerInvitesTopSkip: 10px;
editPeerInvitesSkip: 10px; editPeerInvitesSkip: 10px;
editPeerInviteLinkBoxBottomSkip: 15px; editPeerInviteLinkBoxBottomSkip: 15px;

View File

@ -200,13 +200,13 @@ autoDownloadLimitButton: SettingsButton(settingsButton) {
settingsAudioVolumeSlider: MediaSlider(defaultContinuousSlider) { settingsAudioVolumeSlider: MediaSlider(defaultContinuousSlider) {
seekSize: size(15px, 15px); seekSize: size(15px, 15px);
} }
settingsAudioVolumeSliderPadding: margins(23px, 5px, 20px, 10px); settingsAudioVolumeSliderPadding: margins(22px, 5px, 20px, 10px);
settingsAudioVolumeLabel: LabelSimple(defaultLabelSimple) { settingsAudioVolumeLabel: LabelSimple(defaultLabelSimple) {
font: boxTextFont; font: boxTextFont;
textFg: windowBoldFg; textFg: windowBoldFg;
} }
settingsAudioVolumeLabelPadding: margins(22px, 11px, 22px, 11px); settingsAudioVolumeLabelPadding: margins(22px, 11px, 22px, 11px);
settingsLevelMeterPadding: margins(23px, 10px, 20px, 10px); settingsLevelMeterPadding: margins(22px, 10px, 20px, 10px);
settingsForwardPrivacyPadding: 8px; settingsForwardPrivacyPadding: 8px;
settingsForwardPrivacyArrowSkip: 32px; settingsForwardPrivacyArrowSkip: 32px;

View File

@ -225,7 +225,7 @@ createThemeImportButton: SettingsButton {
font: semiboldFont; font: semiboldFont;
height: 20px; height: 20px;
padding: margins(23px, 10px, 23px, 8px); padding: margins(22px, 10px, 22px, 8px);
ripple: defaultRippleAnimation; ripple: defaultRippleAnimation;
} }

@ -1 +1 @@
Subproject commit 725d768f0ff1c22f6b477c28c324c20cbf2419da Subproject commit 1647b0b76a3352f5d9b2892441eeaf002256a481