Skip to content

R
rbc-demo
Commit 4961407a by 乔延琦
Options

Merge branch 'develop-yangchunyan' into 'develop' 

根据扫描报告修改

See merge request GFP/RBC/rbc-frontend!58
parents 5226cb8d d3588865
Showing with 8 additions and 4 deletions
develop/@rbc/control-strategy/src/components/toolbar/toolbar.vue
...@@ -801,7 +801,8 @@ export default { ...@@ -801,7 +801,8 @@ export default {
height: 37px; height: 37px;
border-bottom: 1px solid #BEC5C8; border-bottom: 1px solid #BEC5C8;
background-color: transparent; background-color: transparent;
background: url("./assets/img/toorbar_background.png") left; background: url("./assets/img/toorbar_background.png");
background-position: left;
.toolbar_frame { .toolbar_frame {
.ivu-poptip { .ivu-poptip {
height: 37px; height: 37px;
......
develop/@rbc/control-strategy/src/components/toolbar/toolbar2.vue
...@@ -319,7 +319,8 @@ export default { ...@@ -319,7 +319,8 @@ export default {
height: 37px; height: 37px;
border-bottom: 2px solid #BEC5C8; border-bottom: 2px solid #BEC5C8;
background-color: transparent; background-color: transparent;
background: url("./assets/img/toorbar_background.png") left; background: url("./assets/img/toorbar_background.png");
background-position: left;
.toolbar-item { .toolbar-item {
height: 37px; height: 37px;
......
develop/@rbc/control-strategy/src/components/toolbarold/toolbar.vue
...@@ -807,7 +807,8 @@ export default { ...@@ -807,7 +807,8 @@ export default {
height: 37px; height: 37px;
border-bottom: 1px solid #BEC5C8; border-bottom: 1px solid #BEC5C8;
background-color: transparent; background-color: transparent;
background: url("./assets/img/toorbar_background.png") left; background: url("./assets/img/toorbar_background.png");
background-position: left;
.toolbar_frame { .toolbar_frame {
.ivu-poptip { .ivu-poptip {
height: 37px; height: 37px;
......
develop/@rbc/control-strategy/src/components/toolbarold/toolbar2.vue
...@@ -319,7 +319,8 @@ export default { ...@@ -319,7 +319,8 @@ export default {
height: 37px; height: 37px;
border-bottom: 2px solid #BEC5C8; border-bottom: 2px solid #BEC5C8;
background-color: transparent; background-color: transparent;
background: url("./assets/img/toorbar_background.png") left; background: url("./assets/img/toorbar_background.png");
background-position: left;
.toolbar-item { .toolbar-item {
height: 37px; height: 37px;
......
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