Merge changes from dev

1 files changed, 6 insertions, 13 deletions

diff --git a/modules/ui_gradio_extensions.py b/modules/ui_gradio_extensions.py
index 0d368f8b..f5278d22 100644
--- a/modules/ui_gradio_extensions.py
+++ b/modules/ui_gradio_extensions.py
@@ -1,17 +1,12 @@
 import os

 import gradio as gr

 

-from modules import localization, shared, scripts

-from modules.paths import script_path, data_path, cwd

+from modules import localization, shared, scripts, util

+from modules.paths import script_path, data_path

 

 

 def webpath(fn):

-    if fn.startswith(cwd):

-        web_path = os.path.relpath(fn, cwd)

-    else:

-        web_path = os.path.abspath(fn)

-

-    return f'file={web_path}?{os.path.getmtime(fn)}'

+    return f'file={util.truncate_path(fn)}?{os.path.getmtime(fn)}'

 

 

 def javascript_html():

@@ -40,13 +35,11 @@ def css_html():
         return f'<link rel="stylesheet" property="stylesheet" href="{webpath(fn)}">'

 

     for cssfile in scripts.list_files_with_name("style.css"):

-        if not os.path.isfile(cssfile):

-            continue

-

         head += stylesheet(cssfile)

 

-    if os.path.exists(os.path.join(data_path, "user.css")):

-        head += stylesheet(os.path.join(data_path, "user.css"))

+    user_css = os.path.join(data_path, "user.css")

+    if os.path.exists(user_css):

+        head += stylesheet(user_css)

 

     return head