mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'game_media' into player

Browse Source 
Conflicts:
	Telegram/Resources/basic.style
	Telegram/SourceFiles/media/player/media_player_list.cpp
	Telegram/SourceFiles/title.cpp
This commit is contained in:
John Preston
2016-09-30 20:07:56 +03:00
parent fee1cec3d9 886327a1d0
commit 1b54ccb59c
110 changed files with 712 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/settings/settings.style
View File

@@ -39,9 +39,7 @@ settingsFixedBarClose: IconButton {
opacity: 0.31;
overOpacity: 0.5;
icon: icon {
{ "settings_close", #000000, point(0px, 0px) },
};
icon: icon {{ "settings_close", #000000, point(0px, 0px) }};
iconPosition: point(20px, 20px);
downIconPosition: point(20px, 20px);