baogq
/
ATJ_MES_WEB_ZY
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

前端表单样式修改成圆角

Browse Source
master
RuoYi 4 years ago committed by Limy
parent 65cc61e650
commit 65dcff75eb
7 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2-bootstrap.css vendored
View File

File diff suppressed because one or more lines are too long

14
ruoyi-admin/src/main/resources/static/css/login.css
Unescape Escape View File

@ -144,4 +144,18 @@ body.signin {
font-weight: normal; /*改变了rememberme的字体*/ font-weight: normal; /*改变了rememberme的字体*/
margin-bottom: 0; margin-bottom: 0;
text-align: left; text-align: left;
}
.form-control, .form-control:focus, .has-error .form-control:focus, .has-success .form-control:focus, .has-warning .form-control:focus, .navbar-collapse, .navbar-form, .navbar-form-custom .form-control:focus, .navbar-form-custom .form-control:hover, .open .btn.dropdown-toggle, .panel, .popover, .progress, .progress-bar {
box-shadow: none;
}
.form-control{
border-radius: 1px!important;
padding: 6px 12px!important;
height: 34px!important;
}
.form-control:focus{
border-color: #1ab394 !important;
} }

2
ruoyi-admin/src/main/resources/static/css/login.min.css vendored
Unescape Escape View File

@ -1 +1 @@
html{height:100%}body.signin{height:auto;background:url(../img/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover;color:rgba(255,255,255,.95)}.signinpanel{width:750px;margin:10% auto 0}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:420px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left} html{height:100%}body.signin{height:auto;background:url(../img/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover;color:rgba(255,255,255,.95)}.signinpanel{width:750px;margin:10% auto 0}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:420px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left}.form-control,.form-control:focus,.has-error .form-control:focus,.has-success .form-control:focus,.has-warning .form-control:focus,.navbar-collapse,.navbar-form,.navbar-form-custom .form-control:focus,.navbar-form-custom .form-control:hover,.open .btn.dropdown-toggle,.panel,.popover,.progress,.progress-bar{box-shadow:none}.form-control{border-radius:1px!important;padding:6px 12px!important;height:34px!important}.form-control:focus{border-color:#1ab394!important}

13
ruoyi-admin/src/main/resources/static/css/style.css
Unescape Escape View File

@ -865,9 +865,9 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
color: #cacaca; color: #cacaca;
} }
.form-control, .form-control:focus, .has-error .form-control:focus, .has-success .form-control:focus, .has-warning .form-control:focus, .navbar-collapse, .navbar-form, .navbar-form-custom .form-control:focus, .navbar-form-custom .form-control:hover, .open .btn.dropdown-toggle, .panel, .popover, .progress, .progress-bar { /* .form-control, .form-control:focus, .has-error .form-control:focus, .has-success .form-control:focus, .has-warning .form-control:focus, .navbar-collapse, .navbar-form, .navbar-form-custom .form-control:focus, .navbar-form-custom .form-control:hover, .open .btn.dropdown-toggle, .panel, .popover, .progress, .progress-bar { */
box-shadow: none; /* box-shadow: none; */
} /* } */
.btn-outline { .btn-outline {
color: inherit; color: inherit;
@ -1818,18 +1818,19 @@ table.dataTable thead .sorting:after {
.form-control, .single-line { .form-control, .single-line {
background: #FFFFFF none; background: #FFFFFF none;
border: 1px solid #e5e6e7; border: 1px solid #e5e6e7;
border-radius: 1px; border-radius: 4px;
color: inherit; color: inherit;
display: block; display: block;
padding: 6px 12px; padding: 3px 6px 4px;
-webkit-transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s; -webkit-transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s; transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
width: 100%; width: 100%;
height: 31px;
font-size: 14px; font-size: 14px;
} }
.form-control:focus, .single-line:focus { .form-control:focus, .single-line:focus {
border-color: #1ab394 !important; border-color: #3c8dbc !important;
} }
.has-success .form-control { .has-success .form-control {

BIN
ruoyi-admin/src/main/resources/static/img/blue.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

32
ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
Unescape Escape View File

@ -330,7 +330,7 @@
label.error { label.error {
position: absolute; position: absolute;
right: 18px; right: 18px;
top: 10px; top: 6px;
color: #ef392b; color: #ef392b;
font-size: 12px; font-size: 12px;
z-index:99; z-index:99;
@ -644,10 +644,10 @@ label {
margin: 5px 15px 5px 0px; margin: 5px 15px 5px 0px;
} }
.select-list li p, .select-list li label:not(.radio-box):not(.select-time){ .select-list li p, .select-list li label:not(.radio-box){
float: left; float: left;
width: 65px; width: 65px;
margin: 5px 5px 5px 0px; margin: 5px 0px 0px 0px;
text-align:right; text-align:right;
} }
@ -681,11 +681,11 @@ label {
.bootstrap-select.form-control .btn-default { .bootstrap-select.form-control .btn-default {
color: inherit; color: inherit;
padding: 6px 12px; padding: 4px 6px 4px;
border-radius: 1px; border-radius: 4px;
border: 1px solid #e5e6e7; border: 1px solid #e5e6e7;
outline: none; outline: none;
height: 34px; height: 31px;
background: #FFFFFF none background: #FFFFFF none
} }
@ -1068,6 +1068,7 @@ label {
visibility: visible; visibility: visible;
} }
/* 设置滚动条样式 */
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 6px; width: 6px;
height: 10px; height: 10px;
@ -1077,4 +1078,21 @@ label {
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
border-radius: 6px; border-radius: 6px;
background-color: #999; background-color: #999;
} }
/* 设置placeholder样式 */
::-webkit-input-placeholder {
color: #b3b3b3!important;
}
:-moz-placeholder {
color: #b3b3b3!important;
}
::-moz-placeholder {
color: #b3b3b3!important;
}
:-ms-input-placeholder {
color: #b3b3b3!important;
}

4
sql/ry_20200617.sql → sql/ry_20200620.sql
Unescape Escape View File

@ -651,8 +651,8 @@ create table gen_table (
table_id bigint(20) not null auto_increment comment '编号', table_id bigint(20) not null auto_increment comment '编号',
table_name varchar(200) default '' comment '表名称', table_name varchar(200) default '' comment '表名称',
table_comment varchar(500) default '' comment '表描述', table_comment varchar(500) default '' comment '表描述',
sub_table_name varchar(64) default null comment '关联父表的表名', sub_table_name varchar(64) default null comment '关联子表的表名',
sub_table_fk_name varchar(64) default null comment '本表关联父表的外键名', sub_table_fk_name varchar(64) default null comment '子表关联的外键名',
class_name varchar(100) default '' comment '实体类名称', class_name varchar(100) default '' comment '实体类名称',
tpl_category varchar(200) default 'crud' comment '使用的模板（crud单表操作 tree树表操作 sub主子表操作）', tpl_category varchar(200) default 'crud' comment '使用的模板（crud单表操作 tree树表操作 sub主子表操作）',
package_name varchar(100) comment '生成包路径', package_name varchar(100) comment '生成包路径',
Write Preview
Loading…
Cancel
Save