diff --git a/README.md b/README.md index e43223f..82f710a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ - + -# sd-webui-oldsix_prompt v1.33.3 +# sd-webui-oldsix_prompt v1.60 ### 老版词库 @路过银河&网上收集 ### 新词库由群里小伙伴 @麻瓜 @万碎爷 @元一斤 整理 ### 100%完全自制插件,不是魔改别人,最近有个别up未均本人允许,在多个平台打着nsfw词库的旗号拿本插件吸粉入群,别人安装插件出问题又无法提供解决方案 ### diff --git a/javascript/old_six_prompt.js b/javascript/old_six_prompt.js index 85e080f..5a6438b 100644 --- a/javascript/old_six_prompt.js +++ b/javascript/old_six_prompt.js @@ -21,6 +21,8 @@ function loadNodes() { btnClearP:[], btnClearNP:[], pClasses:[], + txtLeftLayout:getEle('#txt2img_results'), + imgLeftLayout:getEle('#img2img_results'), @@ -32,7 +34,9 @@ let dicClass={ 0:{}, 1:{} } - + +let tabButtonCss="svelte-1g805jl svelte-kqij2n" +let subClassBtnTitleCss="svelte-1ipelgc svelte-cmf5ev" const loadTime=3000 @@ -161,7 +165,7 @@ function createBtnTitle(name,val,parent,pageindex){ let div=document.createElement('div') let btn=document.createElement('button') setCss(div,'oldsix-row ') - setCss(btn,'oldsix-btn-tit sm primary gradio-button svelte-1ipelgc') + setCss(btn,`oldsix-btn-tit sm primary gradio-button ${subClassBtnTitleCss}`) btn.innerHTML=name div.appendChild(btn) parent.appendChild(div) @@ -215,7 +219,7 @@ function addDicClasses(key,val,pageindex) function CreateClassesBtn(btnName,pageindex) { let btn=document.createElement('button') - setCss(btn,'sm secondary gradio-button svelte-1ipelgc') + setCss(btn,`sm secondary gradio-button ${subClassBtnTitleCss}`) btn.innerHTML=btnName Elements.pClasses[pageindex].appendChild(btn); btn.addEventListener('click',function(){ @@ -234,7 +238,7 @@ function CreateClassesBtn(btnName,pageindex) function createBtnPrompt(key,val,parent,pageindex){ let btn=document.createElement('button') - setCss(btn,'sm secondary gradio-button svelte-1ipelgc oldsix-btn') + setCss(btn,`sm secondary gradio-button oldsix-btn ${subClassBtnTitleCss}`) btn.innerHTML=key btn.dataset.sixoldtit=val btn.dataset.pageindex=pageindex @@ -299,7 +303,7 @@ function reloadNodes(jsonstring, btnreloadDom) { let contentContainer=document.createElement('div') let count=0 Object.keys(jsonObj).forEach(function (key) { - let tabbtn=CreateEle('button',tabnav,'svelte-1g805jl',key) + let tabbtn=CreateEle('button',tabnav,tabButtonCss,key) tabbtn.dataset.tabitem=count tabbtn.addEventListener('click',()=>{ tabClick(tabbtn) @@ -315,8 +319,8 @@ function reloadNodes(jsonstring, btnreloadDom) { count++ }); - setCss(tabs, 'oldsix-tabs gradio-tabs svelte-1g805jl') - setCss(tabnav, 'oldsix-tab-nav scroll-hide svelte-1g805jl') + setCss(tabs, `oldsix-tabs gradio-tabs ${tabButtonCss}`) + setCss(tabnav, `oldsix-tab-nav scroll-hide ${tabButtonCss}`) setCss(contentContainer, 'tab-container') tabs.appendChild(tabnav) @@ -485,7 +489,7 @@ function initBtnsEvent(){ onUiLoaded(()=> { - + initData() }) diff --git a/scripts/old_six_prompt.py b/scripts/old_six_prompt.py index 8f44ddd..dc15b80 100644 --- a/scripts/old_six_prompt.py +++ b/scripts/old_six_prompt.py @@ -80,7 +80,7 @@ class Script(scripts.Script): eid='oldsix-prompt1' tid='oldsix-area1' with gr.Row(elem_id=eid): - with gr.Accordion(label="SixGod_K提示词 v1.33.3",open=False): + with gr.Accordion(label="SixGod_K提示词 v1.60",open=False): gr.HTML('【使用说明书】') textarea=gr.TextArea(self.json,elem_id=tid,visible=False) diff --git a/style.css b/style.css index 6397d8e..d9201e6 100644 --- a/style.css +++ b/style.css @@ -1,142 +1,145 @@ .oldsix-content { - display: grid; - grid-template-columns: repeat(auto-fit, minmax(30%, 1fr)); - gap: 15px; + display: grid; + grid-template-columns: repeat(auto-fit, minmax(30%, 1fr)); + gap: 15px; } - + .oldsix-btn-tit { - width: 100%; - margin-bottom:5px !important + width: 100%; + margin-bottom:5px !important } .oldsix-row { - /* width: 100%; */ - border: 1px solid #eeee; - border-radius: 8px; - box-shadow: 0 0 15px #3d363650; - padding: 10px; - - + /* width: 100%; */ + border: 1px solid #eeee; + border-radius: 8px; + box-shadow: 0 0 15px #3d363650; + padding: 10px; + + } .oldsix-row>.oldsix-row{ - width: 48%; - display: inline-block; - margin-bottom: 2%; - margin-right: 2%; - vertical-align: top; - min-height: 150px; + width: 48%; + display: inline-block; + margin-bottom: 2%; + margin-right: 2%; + vertical-align: top; + min-height: 150px; } .oldsix-btn { - margin: 3px !important; - position: relative !important; - display: inline-block!important; - overflow:visible!important + margin: 3px !important; + position: relative !important; + display: inline-block!important; + overflow:visible!important } .oldsix-btn:hover::after{ - content: attr(data-sixoldtit); - position: absolute; - top: 100%; - left: 0; - background-image: linear-gradient(120deg, #d4fc79 0%, #96e6a1 100%); - border-radius: 5px; - z-index: 9999!important; - transform: translateY(15px); - width: max-content; - line-height: 2em; - word-wrap: normal; - color:black; - font-weight: bold; - transition: width 0.3s linear; - display: inline-block; - overflow:hidden; - padding: 10px; + content: attr(data-sixoldtit); + position: absolute; + top: 100%; + left: 0; + background-image: linear-gradient(120deg, #d4fc79 0%, #96e6a1 100%); + border-radius: 5px; + z-index: 9999!important; + transform: translateY(15px); + width: max-content; + line-height: 2em; + word-wrap: normal; + color:black; + font-weight: bold; + transition: width 0.3s linear; + display: inline-block; + overflow:hidden; + padding: 10px; +} + + +.oldsix-btn:hover::before{ + content: ''; + display: inline-block; + width: 0; + height: 0; + border-top: 10px solid transparent; + border-left: 10px solid transparent; + border-right: 10px solid transparent; + border-bottom: 10px solid #96e6a1; + position: absolute; + left:0; + top: 100%; + z-index: 9999!important; + } + + + .six-hide{ + display: none; + } + + .six-show{ + display: block; +} + +#oldsix-optit{ + display: block; + +} +#oldsix-optit button{ + margin: 5px; +} +.oldsix-reload{ + width: 50px !important; + +} +.oldsix-clear{ + width: fit-content!important; + +} + +.oldsix-btn.active{ + background: linear-gradient(120deg, #d4fc79 0%, #96e6a1 100%)!important; + color:black; +} + +.oldsix-btn.active:hover{ + background: linear-gradient(120deg, #a8d63d 10%, #96e6a1 100%)!important; +} +.oldsix-tab-nav button{ + position: relative; +} +.oldsix-tab-nav button.active::after{ + position: absolute; + content: ''; + display: block; + width: 8px; + height: 8px; + border-radius: 50%; + background-image: linear-gradient(to top, #0ba360 0%, #3cba92 100%); + right: 3px; + top:50%; + transform: translateY(-50%); +} + +.old-six-shop{ + + background-color: #0ba360; + + +} + +.oldsix-checklock{ + width: fit-content !important; + display: inline-block!important; + margin-left: 15px !important; + + +} + +.oldsix-inline{ + + min-width: min(50%, 100%) !important; } -.oldsix-btn:hover::before{ - content: ''; - display: inline-block; - width: 0; - height: 0; - border-top: 10px solid transparent; - border-left: 10px solid transparent; - border-right: 10px solid transparent; - border-bottom: 10px solid #96e6a1; - position: absolute; - left:0; - top: 100%; - z-index: 9999!important; - } - - - .six-hide{ - display: none; - } - - .six-show{ - display: block; - } - - #oldsix-optit{ - display: block; - - } - #oldsix-optit button{ - margin: 5px; - } - .oldsix-reload{ - width: 50px !important; - - } - .oldsix-clear{ - width: fit-content!important; - - } - - .oldsix-btn.active{ - background: linear-gradient(120deg, #d4fc79 0%, #96e6a1 100%)!important; - color:black; - } - - .oldsix-btn.active:hover{ - background: linear-gradient(120deg, #a8d63d 10%, #96e6a1 100%)!important; - } - .oldsix-tab-nav button{ - position: relative; - } - .oldsix-tab-nav button.active::after{ - position: absolute; - content: ''; - display: block; - width: 8px; - height: 8px; - border-radius: 50%; - background-image: linear-gradient(to top, #0ba360 0%, #3cba92 100%); - right: 3px; - top:50%; - transform: translateY(-50%); - } - - .old-six-shop{ - - background-color: #0ba360; - - - } - - .oldsix-checklock{ - /* width: fit-content !important; */ - margin-left: 30px !important; - } - - .oldsix-inline{ - display: inline-block!important; - max-width: 500px !important; - } - -