Skip to content

Commit

Permalink
Merge branch 'pull/51'
Browse files Browse the repository at this point in the history
Merge #51
Fix #50
  • Loading branch information
somini committed Sep 24, 2015
2 parents 049fdc4 + be48860 commit ed2c144
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,16 @@
0="image( x1 - 12, y0 + 6, x1, y1, resource/account_arrow )"
}
}

AccountURLStyle:disabled
{
textcolor=labelfocus
render
{
0="image( x1 - 12, y0 + 6, x1, y1, resource/account_arrow )"
}
padding-right=9
}

AccountURLStyle:selected
{
Expand Down Expand Up @@ -617,7 +627,7 @@
place { control="fullscreen" tooltiptext="#tooltip_view_list" align=right y=78 height=23 margin-right=9 width=30 }

place { control="InboxButton" height=12 y=52 margin-right=51 align=right }
place { control="ParentalLockButton" align=right end-right="account_balance" margin-top=35 margin-right=10 height=26 }
place { control="ParentalLockButton" align=right end-right="account_URL" margin-top=35 margin-right=50 height=26 }
place { control="SupportAlert" y=3 align=right end-right="ParentalLockButton" margin-right=10 height=26 }

place [!$OSX] { control="frame_minimize,frame_maximize,frame_close" align=right margin-top=6 margin-right=2 spacing=-6 }
Expand Down
12 changes: 11 additions & 1 deletion resource/layout/steamrootdialog.layout
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,16 @@
0="image( x1 - 12, y0 + 6, x1, y1, resource/account_arrow )"
}
}

AccountURLStyle:disabled
{
textcolor=labelfocus
render
{
0="image( x1 - 12, y0 + 6, x1, y1, resource/account_arrow )"
}
padding-right=9
}

AccountURLStyle:selected
{
Expand Down Expand Up @@ -617,7 +627,7 @@
place { control="fullscreen" tooltiptext="#tooltip_view_list" align=right y=78 height=23 margin-right=9 width=109 }

place { control="InboxButton" height=12 y=52 margin-right=51 align=right }
place { control="ParentalLockButton" align=right end-right="account_balance" margin-top=35 margin-right=10 height=26 }
place { control="ParentalLockButton" align=right end-right="account_URL" margin-top=35 margin-right=50 height=26 }
place { control="SupportAlert" y=3 align=right end-right="ParentalLockButton" margin-right=10 height=26 }

place [!$OSX] { control="frame_minimize,frame_maximize,frame_close" align=right margin-top=6 margin-right=2 spacing=-6 }
Expand Down

0 comments on commit ed2c144

Please sign in to comment.