Login dialog fixes

Hardware survey dialog
tkashkin · Jan 2, 2023 · 161785e · 161785e
1 parent 84106b5
commit 161785e
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 26 deletions.
diff --git a/Adwaita/resource/layout/login_dialog.layout b/Adwaita/resource/layout/login_dialog.layout
@@ -1,11 +1,5 @@
-"resource/layout/login_dialog.layout"
+login_dialog.layout
 {
-	controls
-	{
-		LoginDialog { controlname="Frame" title="#Steam_Login_Title" style="LoginDialog" }
-		HTMLRoot { controlname=HTML style="HTMLRoot" }
-	}
-
 	styles
 	{
 		LoginDialog
@@ -16,26 +10,13 @@
 		HTML
 		{
 			inset="1 1 1 1"
-			render_bg
-			{
-				0="fill( x0, y0, x1, y1, window_bg )"
-		    }
+			bgcolor="window_bg"
+			render_bg {}
 		}
 	}
 
 	layout
 	{
-		region { name="root" y=0 x=0 width=max height=max }
-
-		place
-		{
-			control=HTMLRoot
-			region=root
-			x=0
-			y=26
-			width=max
-			height=max
-		}
+		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
@@ -4,7 +4,7 @@ menubar
 	{
 		text=""
 
-		SkinVersion			{ text="Adwaita for Steam v0.22" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }
+		SkinVersion			{ text="Adwaita for Steam v0.23" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }
 
 		Divider				{}
 

diff --git a/Adwaita/steam/cached/ValveSurveyControllerCradle.res b/Adwaita/steam/cached/ValveSurveyControllerCradle.res
@@ -0,0 +1,23 @@
+ValveSurveyControllerCradle.res
+{
+	styles
+	{
+		ImagePanel
+		{
+			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)"
+				2="fill(x0, y1+165, x1, y1+166, window_bg)"
+				3="image(x0, y1+154, x0+12, y1+166, assets/corners/12_mask_window_bg/bl)"
+				4="image(x1-12, y1+154, x1, y1+166, assets/corners/12_mask_window_bg/br)"
+			}
+		}
+	}
+
+	layout
+	{
+		place { control="Label1,CradleImage" x=16 y=16 width=max margin-right=16 spacing=16 }
+		place { control="SurveyControllerCradleNo,SurveyControllerCradleYes,SurveyControllerCradleDontHave" start="CradleImage" dir=down width=max height=50 margin-top=16 margin-right=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
@@ -181,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;
 }
 
@@ -200,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_"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ menubar @@
     	{
     		text=""
-    		SkinVersion			{ text="Adwaita for Steam v0.22" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }
+    		SkinVersion			{ text="Adwaita for Steam v0.23" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }
     		Divider				{}
@@ Expand Down @@