diff --git a/apps/shark_studio/web/index.py b/apps/shark_studio/web/index.py index d1b97c2f78..756ecad0ca 100644 --- a/apps/shark_studio/web/index.py +++ b/apps/shark_studio/web/index.py @@ -76,8 +76,8 @@ def launch_webui(address): def webui(): from apps.shark_studio.modules.shared_cmd_opts import cmd_opts from apps.shark_studio.web.ui.utils import ( - nodicon_loc, - nodlogo_loc, + amdicon_loc, + amdlogo_loc, ) launch_api = cmd_opts.api @@ -172,9 +172,9 @@ def register_outputgallery_button(button, selectedid, inputs, outputs): analytics_enabled=False, title="Shark Studio 2.0 Beta", ) as studio_web: - nod_logo = Image.open(nodlogo_loc) + amd_logo = Image.open(amdlogo_loc) gr.Image( - value=nod_logo, + value=amd_logo, show_label=False, interactive=False, elem_id="tab_bar_logo", @@ -209,7 +209,7 @@ def register_outputgallery_button(button, selectedid, inputs, outputs): inbrowser=True, server_name="0.0.0.0", server_port=cmd_opts.server_port, - favicon_path=nodicon_loc, + favicon_path=amdicon_loc, ) diff --git a/apps/shark_studio/web/ui/css/sd_dark_theme.css b/apps/shark_studio/web/ui/css/sd_dark_theme.css index e17b90c862..89c5bb576c 100644 --- a/apps/shark_studio/web/ui/css/sd_dark_theme.css +++ b/apps/shark_studio/web/ui/css/sd_dark_theme.css @@ -367,7 +367,7 @@ footer { #tab_bar_logo .image-container { object-fit: scale-down; position: absolute !important; - top: 14px; + top: 10px; right: 0px; height: 36px; -} \ No newline at end of file +} diff --git a/apps/shark_studio/web/ui/logos/amd-icon.jpg b/apps/shark_studio/web/ui/logos/amd-icon.jpg new file mode 100644 index 0000000000..445f789c44 Binary files /dev/null and b/apps/shark_studio/web/ui/logos/amd-icon.jpg differ diff --git a/apps/shark_studio/web/ui/logos/amd-logo.jpg b/apps/shark_studio/web/ui/logos/amd-logo.jpg new file mode 100644 index 0000000000..419e57c980 Binary files /dev/null and b/apps/shark_studio/web/ui/logos/amd-logo.jpg differ diff --git a/apps/shark_studio/web/ui/logos/nod-icon.png b/apps/shark_studio/web/ui/logos/nod-icon.png deleted file mode 100644 index 29f7e32220..0000000000 Binary files a/apps/shark_studio/web/ui/logos/nod-icon.png and /dev/null differ diff --git a/apps/shark_studio/web/ui/logos/nod-logo.png b/apps/shark_studio/web/ui/logos/nod-logo.png deleted file mode 100644 index 4727e15a19..0000000000 Binary files a/apps/shark_studio/web/ui/logos/nod-logo.png and /dev/null differ diff --git a/apps/shark_studio/web/ui/outputgallery.py b/apps/shark_studio/web/ui/outputgallery.py index a3de6f7b57..0ed467d3fc 100644 --- a/apps/shark_studio/web/ui/outputgallery.py +++ b/apps/shark_studio/web/ui/outputgallery.py @@ -10,7 +10,7 @@ get_generated_imgs_path, get_generated_imgs_todays_subdir, ) -from apps.shark_studio.web.ui.utils import nodlogo_loc +from apps.shark_studio.web.ui.utils import amdlogo_loc from apps.shark_studio.web.utils.metadata import displayable_metadata # -- Functions for file, directory and image info querying @@ -60,7 +60,7 @@ def output_subdirs() -> list[str]: # --- Define UI layout for Gradio with gr.Blocks() as outputgallery_element: - nod_logo = Image.open(nodlogo_loc) + amd_logo = Image.open(amdlogo_loc) with gr.Row(elem_id="outputgallery_gallery"): # needed to workaround gradio issue: @@ -73,7 +73,7 @@ def output_subdirs() -> list[str]: with gr.Column(scale=6): logo = gr.Image( label="Getting subdirectories...", - value=nod_logo, + value=amd_logo, interactive=False, visible=True, show_label=True, diff --git a/apps/shark_studio/web/ui/utils.py b/apps/shark_studio/web/ui/utils.py index cee1a6d02e..f3e0aa1e9a 100644 --- a/apps/shark_studio/web/ui/utils.py +++ b/apps/shark_studio/web/ui/utils.py @@ -10,8 +10,8 @@ def resource_path(relative_path): return os.path.join(base_path, relative_path) -nodlogo_loc = resource_path("logos/nod-logo.png") -nodicon_loc = resource_path("logos/nod-icon.png") +amdlogo_loc = resource_path("logos/amd-logo.jpg") +amdicon_loc = resource_path("logos/amd-icon.jpg") class HSLHue(IntEnum): diff --git a/dataset/annotation_tool.py b/dataset/annotation_tool.py index 60f607146d..ae98cd37c6 100644 --- a/dataset/annotation_tool.py +++ b/dataset/annotation_tool.py @@ -10,7 +10,7 @@ shark_root = Path(__file__).parent.parent demo_css = shark_root.joinpath("web/demo.css").resolve() -nodlogo_loc = shark_root.joinpath("web/models/stable_diffusion/logos/nod-logo.png") +nodlogo_loc = shark_root.joinpath("web/models/stable_diffusion/logos/amd-logo.jpg") with gr.Blocks(title="Dataset Annotation Tool", css=demo_css) as shark_web: