Skip to content

Commit

Permalink
Web full: cloud conflict dialog, move dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
@tkashkin
tkashkin committed Dec 17, 2022
1 parent 4ad8301 commit f0c5d2b
Show file tree
Hide file tree
Showing 3 changed files with 112 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Adwaita/resource/menus/steam.menu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ menubar
{
text=""

SkinVersion { text="Adwaita for Steam v0.21" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }
SkinVersion { text="Adwaita for Steam v0.22" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" }

Divider {}

Expand Down
6 changes: 6 additions & 0 deletions web_themes/base/1_root.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,16 @@
--accent: #78aeed;
--accent_bg: #3584e4;
--accent_fg: var(--fg);
--accent_disabled: rgba(120, 174, 237, 0.5);
--accent_hover_bg: rgba(120, 174, 237, 0.07);
--accent_active_bg: rgba(120, 174, 237, 0.16);

--destructive: #ff7b63;
--destructive_bg: #c01c28;
--destructive_fg: var(--fg);
--destructive_disabled: rgba(255, 123, 99, 0.5);
--destructive_hover_bg: rgba(255, 123, 99, 0.07);
--destructive_active_bg: rgba(255, 123, 99, 0.16);

--success: #8ff0a4;
--success_bg: #26a269;
Expand Down
124 changes: 105 additions & 19 deletions web_themes/full/7_dialogs.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,42 @@

.GenericConfirmDialog .DialogHeader,
.GenericConfirmDialog .DialogBodyText,
.GenericConfirmDialog .DialogBodyText[class*="cloudconflict_CloudConflictWarning_"]
.GenericConfirmDialog .DialogBodyText[class*="cloudconflict_CloudConflictWarning_"],
.GenericConfirmDialog [class*="cloudconflict_FooterNote_"],
.GenericConfirmDialog [class*="cloudconflict_ChoiceNote_"],
.GenericConfirmDialog [class*="moveappsdialog_MoveAppsDialog_"] > .DialogBody
{
color: var(--popover_fg) !important;
font-family: var(--basefont) !important;
font-size: 20px !important;
font-size: 15px !important;
line-height: normal !important;
font-weight: 800 !important;
font-weight: 400 !important;
letter-spacing: normal !important;
text-transform: none !important;
text-align: center;
margin: 0 !important;
padding: 24px 24px 16px 24px !important
padding: 0 24px !important;
box-sizing: border-box !important;
}

.GenericConfirmDialog .DialogBodyText,
.GenericConfirmDialog .DialogBodyText[class*="cloudconflict_CloudConflictWarning_"]
.GenericConfirmDialog [class*="cloudconflict_FooterNote_"]
{
font-size: 15px !important;
font-weight: 400 !important;
padding: 0 24px !important;
flex-grow: 1 !important;
}

.GenericConfirmDialog [class*="cloudconflict_FooterNote_"],
.GenericConfirmDialog [class*="cloudconflict_ChoiceNote_"]
{
padding-top: 24px !important;
}

.GenericConfirmDialog .DialogHeader
{
font-size: 20px !important;
font-weight: 800 !important;
padding: 24px 24px 16px 24px !important;
}

.GenericConfirmDialog .DialogBody
{
overflow: hidden !important;
Expand All @@ -56,6 +69,69 @@
display: none !important;
}

.GenericConfirmDialog .DialogBodyText[class*="cloudconflict_Title_"]
{
font-weight: 800 !important;
}

.GenericConfirmDialog [class*="cloudconflict_DialogChoiceRow_"]
{
width: auto !important;
margin: 0 24px !important;
height: 50px !important;
}

.GenericConfirmDialog [class*="cloudconflict_DialogChoiceRow_"] > [class*="cloudconflict_DialogChoiceButton_"]
{
background: var(--button_bg) !important;
box-sizing: border-box !important;
box-shadow: none !important;
margin: 0 !important;
padding: 0 !important;
height: 50px !important;
border: none !important;
border-radius: 0 !important;
border-bottom: 1px var(--headerbar_shade) solid !important;
user-select: none !important;
}

.GenericConfirmDialog [class*="cloudconflict_DialogChoiceRow_"]:nth-child(1) > [class*="cloudconflict_DialogChoiceButton_"]
{
border-top-left-radius: var(--card_radius) !important;
border-top-right-radius: var(--card_radius) !important;
}

.GenericConfirmDialog [class*="cloudconflict_DialogChoiceRow_"]:nth-child(2) > [class*="cloudconflict_DialogChoiceButton_"]
{
border-bottom-left-radius: var(--card_radius) !important;
border-bottom-right-radius: var(--card_radius) !important;
border-bottom: none !important;
}

.GenericConfirmDialog [class*="cloudconflict_DialogChoiceRow_"] > [class*="cloudconflict_DialogChoiceButton_"]:hover
{
background: var(--button_hover_bg) !important;
box-shadow: none !important;
}

.GenericConfirmDialog [class*="cloudconflict_DialogChoiceRow_"] > [class*="cloudconflict_DialogChoiceButton_"]:active
{
background: var(--button_active_bg) !important;
box-shadow: none !important;
}

.GenericConfirmDialog [class*="cloudconflict_ConflictChoiceText_"] .DialogBodyText
{
padding: 0 !important;
}

.GenericConfirmDialog [class*="moveappsdialog_MoveAppsDialog_"] > .DialogBody .DialogInputLabelGroup
{
margin-top: 24px !important;
margin-bottom: 0 !important;
text-align: start !important;
}

.GenericConfirmDialog .DialogFooter
{
margin-top: 24px !important;
Expand All @@ -68,7 +144,7 @@
overflow: hidden !important;
}

.GenericConfirmDialog .DialogFooter .DialogButton
.GenericConfirmDialog .DialogFooter .DialogButton:not([class*="cloudconflict_DialogChoiceButton_"])
{
height: 42px !important;
color: var(--button_fg) !important;
Expand All @@ -93,31 +169,36 @@
display: none !important;
}

.GenericConfirmDialog .DialogFooter .DialogButton:hover
.GenericConfirmDialog .DialogFooter .DialogButton:not([class*="cloudconflict_DialogChoiceButton_"]):hover
{
background: rgba(255, 255, 255, 0.07) !important;
box-shadow: none !important;
}

.GenericConfirmDialog .DialogFooter .DialogButton:active
.GenericConfirmDialog .DialogFooter .DialogButton:not([class*="cloudconflict_DialogChoiceButton_"]):active
{
background: rgba(255, 255, 255, 0.16) !important;
box-shadow: none !important;
}

.GenericConfirmDialog .DialogFooter .DialogButton.Primary
.GenericConfirmDialog .DialogFooter .DialogButton:not([class*="cloudconflict_DialogChoiceButton_"]).Primary
{
color: var(--accent) !important;
}

.GenericConfirmDialog .DialogFooter .DialogButton.Primary:hover
.GenericConfirmDialog .DialogFooter .DialogButton:not([class*="cloudconflict_DialogChoiceButton_"]).Primary.Disabled
{
color: var(--accent_disabled) !important;
}

.GenericConfirmDialog .DialogFooter .DialogButton:not([class*="cloudconflict_DialogChoiceButton_"]).Primary:hover
{
background: rgba(120, 174, 237, 0.07) !important;
background: var(--accent_hover_bg) !important;
}

.GenericConfirmDialog .DialogFooter .DialogButton.Primary:active
.GenericConfirmDialog .DialogFooter .DialogButton:not([class*="cloudconflict_DialogChoiceButton_"]).Primary:active
{
background: rgba(120, 174, 237, 0.16) !important;
background: var(--accent_active_bg) !important;
}

.GenericConfirmDialog > .DialogContent_InnerWidth > form > div[class*="uninstalldialog_UninstallDialog_"]
Expand All @@ -132,14 +213,19 @@
color: var(--destructive) !important;
}

.GenericConfirmDialog > .DialogContent_InnerWidth > form > div[class*="uninstalldialog_UninstallDialog_"] .DialogButton.Primary.Disabled
{
color: var(--destructive_disabled) !important;
}

.GenericConfirmDialog > .DialogContent_InnerWidth > form > div[class*="uninstalldialog_UninstallDialog_"] .DialogButton.Primary:hover
{
background: rgba(255, 123, 99, 0.07) !important;
background: var(--destructive_hover_bg) !important;
}

.GenericConfirmDialog > .DialogContent_InnerWidth > form > div[class*="uninstalldialog_UninstallDialog_"] .DialogButton.Primary:active
{
background: rgba(255, 123, 99, 0.16) !important;
background: var(--destructive_active_bg) !important;
}

/* Window controls */
Expand Down

0 comments on commit f0c5d2b

Please sign in to comment.