Skip to content

chore: update develop & deploy & settings & modules ui to match new spec #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NathanFlurry wants to merge 1 commit into from
Closed

chore: update develop & deploy & settings & modules ui to match new spec #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Assets/Rivet/Editor/Images/FontAwesome/house.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions Assets/Rivet/Editor/Images/FontAwesome/house.svg.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Assets/Rivet/Editor/Images/FontAwesome/plus.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions Assets/Rivet/Editor/Images/FontAwesome/plus.svg.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/Rivet/Editor/UI/Elements/Header.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<ui:VisualElement name="Header" style="flex-grow: 0; flex-direction: row; flex-shrink: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; align-items: center; margin-bottom: 8px;">
<ui:VisualElement name="Icon" class="icon" style="flex-grow: 0; flex-shrink: 0; width: 16px; height: 16px; -unity-background-scale-mode: scale-to-fit; margin-right: 4px;" />
<ui:Label tabindex="-1" text="Title" parse-escape-sequences="true" display-tooltip-when-elided="true" enable-rich-text="false" name="Title" class="title" style="-unity-font-style: bold; flex-grow: 1; flex-shrink: 1; text-overflow: ellipsis; overflow: hidden;" />
<ui:Label tabindex="-1" text="Reload" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Action" class="action" style="margin-left: 4px;" />
<ui:Label tabindex="-1" text="Refresh" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Action" class="action" style="margin-left: 4px;" />
</ui:VisualElement>
</ui:UXML>
14 changes: 5 additions & 9 deletions Assets/Rivet/Editor/UI/RivetPlugin.uss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,17 @@
}

#DashboardButton .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/browser.svg?fileID=7388822144124034973&guid=d5b6438060c4b4e59a8c5bf1dd267d0f&type=3#browser");
}

#DocsButton .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/book.svg?fileID=7388822144124034973&guid=6e8f178e0ec88464f9ad9f45ad22d210&type=3#book");
}

#DiscordButton .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/discord.svg?fileID=7388822144124034973&guid=0a164d5f5d70b46e1a709a15ca016836&type=3#discord");
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/house.svg?fileID=7388822144124034973&guid=3b1a5b5822799496da64c559e533a1a8&type=3#house");
}

#FeedbackButton .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/bug.svg?fileID=7388822144124034973&guid=b156156de32b04827b7eb6b334ccaf0d&type=3#bug");
}

#SettingsButton .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/gear.svg?fileID=7388822144124034973&guid=4395aa38d356747bc8b01eb63a802209&type=3#gear");
}

#Logo {
-unity-background-image-tint-color: var(--unity-colors-default-text);
}
9 changes: 3 additions & 6 deletions Assets/Rivet/Editor/UI/RivetPlugin.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@
<ui:Instance template="IconButton" name="DashboardButton" class="dashboardButton">
<AttributeOverrides element-name="Label" text="Dashboard" />
</ui:Instance>
<ui:Instance template="IconButton" name="DocsButton" class="docsButton">
<AttributeOverrides element-name="Label" text="Docs" />
</ui:Instance>
<ui:Instance template="IconButton" name="DiscordButton" class="discordButton">
<AttributeOverrides element-name="Label" text="Discord" />
</ui:Instance>
<ui:Instance template="IconButton" name="FeedbackButton" class="feedbackButton">
<AttributeOverrides element-name="Label" text="Feedback" />
</ui:Instance>
<ui:Instance template="IconButton" name="SettingsButton" class="settingsButton">
<AttributeOverrides element-name="Label" text="Settings" />
</ui:Instance>
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement name="Screens" style="flex-grow: 1;">
Expand Down
4 changes: 4 additions & 0 deletions Assets/Rivet/Editor/UI/Screens/Main.uss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/cloud-arrow-up.svg?fileID=7388822144124034973&guid=44dad88c1451c446d807e891e2bad2d8&type=3#cloud-arrow-up");
}

#TabBar #Modules .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg?fileID=7388822144124034973&guid=082b7f4beb7e042028ea32b7567dc2d3&type=3#puzzle");
}

#TabBar #Settings .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/gear.svg?fileID=7388822144124034973&guid=4395aa38d356747bc8b01eb63a802209&type=3#gear");
}
Expand Down
5 changes: 4 additions & 1 deletion Assets/Rivet/Editor/UI/Screens/Main.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
<ui:Instance template="TabBarButton" name="Deploy" style="flex-grow: 1;">
<AttributeOverrides element-name="Label" text="Deploy" />
</ui:Instance>
<ui:Instance template="TabBarButton" name="Settings" style="flex-grow: 1;">
<ui:Instance template="TabBarButton" name="Modules" style="flex-grow: 1;">
<AttributeOverrides element-name="Label" text="Modules" />
</ui:Instance>
<ui:Instance template="TabBarButton" name="Settings" style="flex-grow: 1; display: none;">
<AttributeOverrides element-name="Label" text="Settings" />
</ui:Instance>
</ui:VisualElement>
Expand Down
13 changes: 11 additions & 2 deletions Assets/Rivet/Editor/UI/Tabs/Deploy.uss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
#BuildDeployButton .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/hammer.svg?fileID=7388822144124034973&guid=57861a0f5a3f5403995884fd2bd0639b&type=3#hammer");
#AddButton .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/plus.svg?fileID=7388822144124034973&guid=be349c2e728b24cb18e09addf902709c&type=3#plus");
}

#ModulesHeader .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg?fileID=7388822144124034973&guid=082b7f4beb7e042028ea32b7567dc2d3&type=3#puzzle");
display: flex;
}

#CreateButton .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg?fileID=7388822144124034973&guid=d163064dfce68421abbdd81e072c9b86&type=3#pen-to-square");
}
1 change: 1 addition & 0 deletions Assets/Rivet/Editor/UI/Tabs/Deploy.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<ui:Instance template="Header" name="DeployHeader" class="action">
<AttributeOverrides element-name="Title" text="Deploy" />
</ui:Instance>
<ui:Label tabindex="-1" text="Game servers will be started &amp; stopped automatically as players join." parse-escape-sequences="true" display-tooltip-when-elided="true" style="overflow: hidden; white-space: normal; margin-bottom: 6px;" />
<ui:DropdownField index="0" label="Environment" name="EnvironmentDropdown" />
<ui:DropdownField choices="Game Server &amp; Backend,Only Game Server, Only Backend" index="0" label="Steps" name="StepsDropdown" style="margin-bottom: 8px;" />
<ui:Instance template="IconButton" name="BuildDeployButton">
Expand Down
14 changes: 2 additions & 12 deletions Assets/Rivet/Editor/UI/Tabs/Develop.uss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@
display: flex;
}

#LocalGameServerHeader .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/server.svg?fileID=7388822144124034973&guid=7bcd10cbcf44540858a99dc18ebb77c3&type=3#server");
display: flex;
}

#BackendHeader .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/gear-code.svg?fileID=7388822144124034973&guid=e9347091e532b4c26b3832355cb4812a&type=3#gear-code");
display: flex;
}

#StartButton .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/play.svg?fileID=7388822144124034973&guid=9c12e8ede8d8142448922406ab7718f3&type=3#play");
}
Expand All @@ -33,7 +23,7 @@
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/square-sliders.svg?fileID=7388822144124034973&guid=071bfd08c297a4f43886df844a2cb2d7&type=3#square-sliders");
}

#PlayerHeader .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/desktop.svg?fileID=7388822144124034973&guid=81aa27a3f3dde4e7698c22bfcd3120c4&type=3#desktop");
#PlayHeader .icon {
background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/joystick%201.svg?fileID=7388822144124034973&guid=e2339b8045892476da1e39eceaabfbd4&type=3#joystick 1");
display: flex;
}
Loading