Upstream sync 0.24 (#5)

* Move Login Win Controls to VGUI * Web full: cloud conflict dialog, move dialog * Web Full: Chat Avatar Frame (tkashkin#90, Fixes tkashkin#53) * Web Base: Library Dragging Categories Fix (tkashkin#89, Fixes tkashkin#71) * Web Full: Game Details Partner Event Shadow Fix (tkashkin#88) * Login dialog fixes Hardware survey dialog * Hardware survey dialog: Steam Controller fixes Co-authored-by: Foldex <foldex@pm.me> Co-authored-by: tkashkin <tkashkin@gmail.com> Co-authored-by: Foldex <47908676+Foldex@users.noreply.github.com>
ubuntu · Jan 3, 2023 · 5158662 · 5158662
1 parent 0c21e94
commit 5158662
Show file tree

Hide file tree

Showing 10 changed files with 150 additions and 39 deletions.
diff --git a/Adwaita/resource/layout/login_dialog.layout b/Adwaita/resource/layout/login_dialog.layout
@@ -0,0 +1,22 @@
+login_dialog.layout
+{
+	styles
+	{
+		LoginDialog
+		{
+			bgcolor="window_bg"
+		}
+
+		HTML
+		{
+			inset="1 1 1 1"
+			bgcolor="window_bg"
+			render_bg {}
+		}
+	}
+
+	layout
+	{
+		place { control="HTMLRoot" x=0 y=0 width=max height=max }
+	}
+}
diff --git a/Adwaita/resource/layout/valvesurveywizard.layout b/Adwaita/resource/layout/valvesurveywizard.layout
@@ -0,0 +1,17 @@
+valvesurveywizard.layout
+{
+	styles
+	{
+
+	}
+
+	layout
+	{
+		place { control="frame_title" x=0 y=0 width=max height=48 }
+
+		place { control="PrevButton,NextButton,FinishButton" align=right width=80 height=34 margin-right=7 margin-top=7 spacing=6 }
+
+		region { name="hidden" width=0 height=0 margin-left=-999 }
+		place { control="frame_minimize,frame_maximize,frame_close,CancelButton" region="hidden" width=0 height=0 }
+	}
+}
diff --git a/Adwaita/resource/menus/steam.menu b/Adwaita/resource/menus/steam.menu
@@ -1,4 +1,6 @@
-menubar { Steam { text=""
+menubar {
+	Steam {
+		text=""
 
 		ViewFriends			{ text="#steam_menu_view_friends" shellcmd="steam://open/friends" }
 		ViewPlayerList		{ text="#steam_menu_view_players" shellcmd="steam://friends/players" }

diff --git a/Adwaita/steam/cached/ValveSurveyControllerCradle.res b/Adwaita/steam/cached/ValveSurveyControllerCradle.res
@@ -0,0 +1,23 @@
+ValveSurveyControllerCradle.res
+{
+	styles
+	{
+		CSurveyControllerCradle
+		{
+			render
+			{
+				0="image(x0+16, y1-166, x0+28, y1-154, assets/corners/12_mask_window_bg/tl)"
+				1="image(x1-28, y1-166, x1-16, y1-154, assets/corners/12_mask_window_bg/tr)"
+				2="image(x0+16, y1-28, x0+28, y1-16, assets/corners/12_mask_window_bg/bl)"
+				3="image(x1-28, y1-28, x1-16, y1-16, assets/corners/12_mask_window_bg/br)"
+			}
+		}
+	}
+
+	layout
+	{
+		place { control="Label1" x=16 y=16 width=max margin-right=16 }
+		place { control="CradleImage" start="Label1" dir=down align=top-center width=200 height=127 margin-top=16 margin-right=16 }
+		place { control="SurveyControllerCradleNo,SurveyControllerCradleYes,SurveyControllerCradleDontHave" dir=down align=bottom width=max height=50 margin-left=16 margin-right=16 margin-bottom=16 }
+	}
+}
diff --git a/Adwaita/steam/cached/ValveSurveyOverview.res b/Adwaita/steam/cached/ValveSurveyOverview.res
@@ -0,0 +1,31 @@
+ValveSurveyOverview.res
+{
+	styles
+	{
+		Label
+		{
+			render
+			{
+				0="image(x0, y1+16, x0+12, y1+28, assets/corners/12_mask_window_bg/tl)"
+				1="image(x1-12, y1+16, x1, y1+28, assets/corners/12_mask_window_bg/tr)"
+			}
+		}
+
+		URLLabel
+		{
+			render
+			{
+				0="fill(x0, y0-17, x1, y0-16, window_bg)"
+				1="image(x0, y0-28, x0+12, y0-16, assets/corners/12_mask_window_bg/bl)"
+				2="image(x1-12, y0-28, x1, y0-16, assets/corners/12_mask_window_bg/br)"
+			}
+		}
+	}
+
+	layout
+	{
+		place { control="InfoLabel" x=16 y=16 width=max margin-right=16 }
+		place { control="SurveyYesRadio,SurveyNoRadio" start="InfoLabel" dir=down width=max height=50 margin-top=16 margin-right=16 }
+		place { control="PrivacyLink" start="SurveyNoRadio" dir=down width=max height=34 margin-top=16 margin-right=16 }
+	}
+}
diff --git a/Adwaita/steam/cached/ValveSurveySummarizeData.res b/Adwaita/steam/cached/ValveSurveySummarizeData.res
@@ -0,0 +1,8 @@
+ValveSurveySummarizeData.res
+{
+	layout
+	{
+		place { control="Label1" x=16 y=16 width=max margin-right=16 }
+		place { control="ValveSurveySummaryText" start="Label1" dir=down width=max height=max margin-top=16 margin-right=16 margin-bottom=16 }
+	}
+}
diff --git a/web_themes/base/10_login.css b/web_themes/base/10_login.css
@@ -160,40 +160,6 @@
 	outline: none !important;
 }
 
-/* Window Controls */
-#root [class*="login_CloseButton_"]
-{
-	background-color: var(--button_bg) !important;
-	border-radius: 50% !important;
-	height: 24px !important;
-	margin-left: 14px !important;
-	transition: var(--focus_transition) !important;
-	width: 24px !important;
-}
-
-#root [class*="login_CloseButton_"]:hover
-{
-	background-color: var(--button_hover_bg) !important;
-}
-
-#root [class*="login_CloseButton_"]:active
-{
-	background-color: var(--button_active_bg) !important;
-}
-
-#root [class*="login_CloseButton_"] > svg
-{
-	height: 10px !important;
-	margin-left: 7px !important;
-	margin-top: 5px !important;
-	width: 10px !important;
-}
-
-#root [class*="login_CloseButton_"] > svg > *
-{
-	stroke: var(--headerbar_fg) !important;
-}
-
 #root [class*="login_Login_"]
 {
 	height: 100% !important;
@@ -215,7 +181,8 @@
 
 #root [class*="login_Login_"] [class*="newlogindialog_EmbeddedRoot_"]
 {
-	gap: 16px !important;
+	column-gap: 16px !important;
+	row-gap: 0 !important;
 	flex-grow: 1 !important;
 }
 
@@ -234,11 +201,28 @@
 #root [class*="login_Login_"] [class*="newlogindialog_Compact_"]
 {
 	width: 100% !important;
+	padding: 24px !important;
+	gap: 0 !important;
+	color: var(--popover_fg) !important;
+	font-family: var(--basefont) !important;
+	font-size: 15px !important;
+	line-height: normal !important;
+	font-weight: 400 !important;
+	letter-spacing: normal !important;
+	text-transform: none !important;
 }
 
-#root [class*="login_Login_"] [class*="newlogindialog_Compact_"] [class*="newlogindialog_PrimaryHeader_"]
+#root [class*="login_Login_"] [class*="newlogindialog_Compact_"] [class*="newlogindialog_PrimaryHeader_"],
+#root [class*="login_Login_"] [class*="newlogindialog_Compact_"] [class*="newlogindialog_FailureTitle_"]
 {
+	color: var(--popover_fg) !important;
+	font-family: var(--basefont) !important;
+	font-size: 20px !important;
+	line-height: normal !important;
+	font-weight: 800 !important;
+	letter-spacing: normal !important;
 	text-transform: none !important;
+	text-align: center;
 }
 
 #root [class*="login_Login_"] [class*="newlogindialog_Compact_"] [class*="newlogindialog_FormContainer_"]

diff --git a/web_themes/base/3_library.css b/web_themes/base/3_library.css
@@ -336,3 +336,25 @@
 {
 	background: var(--button_hover_bg) !important;
 }
+
+/* Drag & Drop */
+[class*="gamelistentry_Container_"][class*="gamelistentry_DropTarget_"] {
+	background-color: var(--button_bg) !important;
+	border-left: 1px solid var(--accent_bg) !important;
+	border-right: 1px solid var(--accent_bg) !important;
+}
+
+[class*="gamelistsectionheader_Container_"][class*="gamelistsectionheader_DropOption_"] {
+	background-color: var(--button_bg) !important;
+}
+
+[class*="gamelistsectionheader_Container_"][class*="gamelistsectionheader_DropTarget_"] {
+	border-left: 1px solid var(--accent_bg) !important;
+	border-right: 1px solid var(--accent_bg) !important;
+	border-top: 1px solid var(--accent_bg) !important;
+}
+
+[class*="gamelistentry_Container_"][class*="gamelistentry_DropTarget_"][class*="gamelistentry_LastInCollection_"],
+[class*="gamelistsectionheader_Container_"][class*="gamelistsectionheader_DropTarget_"][class*="gamelistsectionheader_SingleLine_"] {
+	border-bottom: 1px solid var(--accent_bg) !important;
+}
diff --git a/web_themes/full/5_game_details.css b/web_themes/full/5_game_details.css
@@ -184,7 +184,8 @@
 }
 
 /* Partner Updates */
-[class*="appactivityday_PartnerEventLargeUpdate_"]
+[class*="appactivityday_PartnerEventLargeUpdate_"],
+[class*="appactivityday_PartnerEventFeatured_"]
 {
 	box-shadow: none !important;
 }

diff --git a/web_themes/full/8_chat.css b/web_themes/full/8_chat.css
@@ -60,7 +60,8 @@
 	margin-top: 1px !important;
 }
 
-.currentUserAvatar .avatarHolder
+.currentUserAvatar .avatarHolder,
+.currentUserAvatar .avatarFrame img
 {
 	border: none !important;
 	height: 44px !important;