Skip to content

B
bpm
Commit ce210701 by zhangyy
Options

4.3 修改index样式

parent bbc6803a
Showing with 61 additions and 36 deletions
src/main/resources/static/css/common/main_style.css
...@@ -3,25 +3,12 @@ ...@@ -3,25 +3,12 @@
html,body{ html,body{
height:100%; height:100%;
} }
.lf{
float: left;
}
.rt{
float:right;
}
.header{
width:100%;
height:50px;
color:#fff;
padding:0 10px;
background: rgba(26, 188, 156, 0.898039215686275);
border-bottom: 2px solid #238f7a;
overflow: hidden;
}
.web_logo{ .web_logo{
margin-top:9px; margin-top:9px;
} }
.web_logo img{ .web_logo img{
width:33px; width:33px;
height:33px; height:33px;
......
src/main/resources/static/css/common/models.css
...@@ -1172,7 +1172,7 @@ input[type="submit"].ke-button:hover { ...@@ -1172,7 +1172,7 @@ input[type="submit"].ke-button:hover {
} }
.MainBox .mainContentBox { .MainBox .mainContentBox {
position: absolute; position: absolute;
top: 50px; top: 74px;
left: 125px; left: 125px;
bottom: 0; bottom: 0;
right: 0; right: 0;
......
src/main/resources/static/css/common/models.less
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
} }
.mainContentBox{ .mainContentBox{
.absolute; .absolute;
top: 80px; top: 148px;
left: 250px; left: 250px;
bottom: 0; bottom: 0;
right: 0; right: 0;
......
src/main/resources/templates/bpm/index.html
...@@ -11,46 +11,82 @@ ...@@ -11,46 +11,82 @@
<link rel="stylesheet" type="text/css" th:href="@{/css/common/models.css}"> <link rel="stylesheet" type="text/css" th:href="@{/css/common/models.css}">
<link rel="stylesheet" type="text/css" th:href="@{/css/common/main_style.css}"> <link rel="stylesheet" type="text/css" th:href="@{/css/common/main_style.css}">
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
<link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<style>
.glyphicon-user{
color: #007bff;
}
.mb-3{
margin-bottom: 0!important;
}
.navbar{
border-radius: 0;
width: 100%;
justify-content: flex-start;
margin-bottom: 0;
}
#aside_nav{
border-left:none;
background:#343a40!important;
}
</style>
<script src="https://cdn.bootcss.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<script src="https://unpkg.com/element-ui/lib/index.js"></script> <script src="https://unpkg.com/element-ui/lib/index.js"></script>
</head> </head>
<body> <body>
<!--首页--> <!--首页-->
<div class="MainBox"> <div class="MainBox">
<!-- <input id="userId" type="hidden" th:value="${userId}"/>
<input id="flag" type="hidden" th:value="${session.userInfo.flag}"/>-->
<!--头部--> <!--头部-->
<div class="header" style="height: 50px"> <!--<div class="navbar navbar-dark bg-dark box-shadow">-->
<shiro:hasRole name="1"> <!--<div style="width: 90%;">-->
<div class="web_logo lf"> <!--<a href="#" class="navbar-brand d-flex align-items-center" >-->
<img class="lf" th:src="@{/images/bpm.png}" style="margin-top: -3px;border-radius: 7px;" alt=""> <!--<img th:src="@{/images/bpmwh.png}" alt="logo" style="width: 14%;">-->
<div class="lf"> <!--<strong>BPM后台管理系统</strong>-->
<p style="font-size:18px;font-family: '微软雅黑 Bold', '微软雅黑';">BPM后台管理系统</p> <!--</a>-->
</div> <!--</div>-->
</div>
</shiro:hasRole>
<div class="userBox right" style="padding-right:100px;"> <!--<div >-->
<span class="glyphicon glyphicon-user"><span th:text="${userName}"></span> </span> <!--<span class="glyphicon glyphicon-user"><span th:text=" ${userName}"></span> &nbsp;</span>-->
<a href="/logout"> <span class="glyphicon glyphicon-off" style="cursor: pointer" title="退出登陆"></span></a> <!--<a class="navbar-toggler" href="/logout">Sign up</a>-->
</div> <!--</div>-->
<!--</div>-->
<div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 bg-white border-bottom box-shadow">
<h4 class="my-0 mr-md-auto font-weight-normal">
<img th:src="@{/images/bpm.png}" alt="logo" style="width: 14%;">BPM后台管理系统
</h4>
<span class="glyphicon glyphicon-user"><span th:text="${userName}"></span> &nbsp;</span>
<a class="btn btn-outline-primary" href="/logout">Sign up</a>
</div> </div>
<!--end 头部--> <!--end 头部-->
<!--左边导航--> <!--左边导航-->
<div class="main_wrap clearfix" > <div class="main_wrap clearfix" >
<ul id="aside_nav" class="navBox" style='width:125px;min-height: 680px;'> <ul id="aside_nav" class="navBox" style='width:125px;min-height: 680px;'>
<li class="s_menu_item"><a target="main_frame" href="/bpm/user/welcome">查看流程</a></li> <li class="s_menu_item"><a target="main_frame" href="/bpm/user/welcome"><span class=""></span>查看流程</a></li>
<li class="s_menu_item"><a target="main_frame" href="/model/createNew">创建流程</a></li> <li class="s_menu_item"><a target="main_frame" href="/model/createNew">创建流程</a></li>
<li class="s_menu_item"><a target="main_frame" href="/model/createNew">组织结构</a></li> <li class="s_menu_item"><a target="main_frame" href="/model/createNew">组织结构</a></li>
<li class="s_menu_item"><a target="main_frame" href="/swagger-ui.html">API</a></li> <li class="s_menu_item"><a target="main_frame" href="/swagger-ui.html">API</a></li>
</ul> </ul>
</div> </div>
<!--end 左边导航-->
<!--&lt;!&ndash;end 左边导航&ndash;&gt;-->
<div class="mainContentBox"> <div class="mainContentBox">
<iframe id="main_frame" width="100%" height="100%" frameborder="0" onload="" name="main_frame" src="/bpm/user/welcome" <iframe id="main_frame" width="100%" height="100%" frameborder="0" onload="" name="main_frame" src="/bpm/user/welcome"
style="overflow:hidden; position:absolute;"></iframe> style="overflow:hidden; position:absolute;"></iframe>
</div><!--主体内容--> </div>
<!--主体内容-->
<!--end 主体内容--> <!--end 主体内容-->
</div> </div>
......
src/main/resources/templates/login.html
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
<head> <head>
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<title>工作流</title> <title>工作流</title>
<link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> <link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<script src="https://cdn.bootcss.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script> <script src="https://cdn.bootcss.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
</head> </head>
<body class="text-center"> <body class="text-center">
<div style="margin-top: 100px;"> <div style="margin-top: 100px;">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment