manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增2套主题风格

Browse Source
This commit is contained in:
thinkgem
2022-02-14 16:31:03 +08:00
parent 53ceb352e0
commit 57e172802d
9 changed files with 528 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
View File

Binary file not shown.

6
modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
View File

@@ -118,8 +118,10 @@
绿灰=Green Grey
红灰=Red Grey
黄灰=Yellow Grey
亮蓝（新）=Bright Blue
浅蓝（新）=Light Blue
亮蓝(经典)=Bright Blue
浅蓝(经典)=Light Blue
亮蓝(无界)=Bright Blue2
浅蓝(无界)=Light Blue2
表单弹窗模式=Form popup mode
取消页签模式=Cancel tab mode

11
modules/core/src/main/resources/views/include/head.html
View File

@@ -10,8 +10,11 @@
<script src="${ctxStatic}/jquery/jquery-3.5.0.min.js"></script>
<script src="${ctxStatic}/jquery/jquery-migrate-3.2.0.min.js"></script>
<!--[if lt IE 9]><script src="${ctxStatic}/common/h5fix.min.js"></script><![endif]-->
<% if(parameter.__layer! == 'true'){ if(parameter.__layer_title! == 'false'){ %>
<style>.main-content>.box-main>.box-header{padding-right:45px;}</style>
<% if(parameter.__layer! == 'true'){ %>
<style>.ui-layout-container,.main-content{padding:0!important}</style>
<% if(parameter.__layer_title! == 'false'){ %>
<style>.main-content>.box-main>.box-header{padding-right:45px}</style>
<% }else{ %>
<style>.main-content>.box-main>.box-header{display:none;}</style>
<% } } %>
<style>.main-content>.box-main>.box-header{display:none}</style>
<% }
} %>

29
modules/core/src/main/resources/views/modules/sys/switchSkin.html
View File

@@ -1,5 +1,4 @@
<% layout('/layouts/default.html', {title:'切换主题'}){ %>
<link rel="stylesheet" href="${ctxStatic}/icheck/1.0/square/blue.css?${_version}">
<style>
.list-unstyled{margin:10px;}
.full-opacity-hover{opacity:1;filter:none;border:1px solid #fff}
@@ -139,7 +138,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">${text('亮蓝（新）')}</p>
<p class="text-center no-margin">${text('亮蓝(经典)')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-blue-light2" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -148,11 +147,29 @@
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">${text('浅蓝（新）')}</p>
<p class="text-center no-margin">${text('浅蓝(经典)')}</p>
</li>
<li style="float:left;padding:18px 0 0 45px;">
<#form:checkbox name="formLayerModel" label="${text('表单弹窗模式')}" class="form-control" data-style="square-blue" style="margin-right:20px"/>
<#form:checkbox name="tabPageModel" label="${text('取消页签模式')}" class="form-control" data-style="square-blue"/>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-blue3" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;background:#1648ab"></span>
<span style="display:block;width:80%;float:left;height:13px;background:#1951be"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">${text('亮蓝(无界)')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-blue-light3" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
<span style="display:block;width:20%;float:left;height:13px;background:#1681e5"></span>
<span style="display:block;width:80%;float:left;height:13px;background:#1890ff"></span>
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">${text('浅蓝(无界)')}</p>
</li>
<li style="float:left;width:32%;padding-top:8px;text-align:center;">
<#form:checkbox name="formLayerModel" label="${text('表单弹窗模式')}" class="form-control"/>
<#form:checkbox name="tabPageModel" label="${text('取消页签模式')}" class="form-control"/>
</li>
</ul>
<% } %>