Skip to content

F
flowable-engine-fontend
Commit 1af3bc1f authored by 王万里's avatar 王万里
Browse files
Options

add: 修改样式

parent 59d59a3a
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 17 deletions
editor-app/css/style.css
View file @ 1af3bc1f
...@@ -253,9 +253,11 @@ div.canvas-wrapper { ...@@ -253,9 +253,11 @@ div.canvas-wrapper {
} }
div.propertySection { div.propertySection {
display: flex;
align-items: center;
height: 100%; height: 100%;
background-color: #e8edf1; /* background-color: #e8edf1; */
margin-bottom: 0px; margin-right: 20px;
} }
/*滚动条样式*/ /*滚动条样式*/
...@@ -293,17 +295,18 @@ div.propertySection { ...@@ -293,17 +295,18 @@ div.propertySection {
font-size: 14px; font-size: 14px;
} }
.pull-right-btn{ .pull-right-btn{
position: fixed; /* position: fixed; */
z-index: 999; z-index: 999;
top: 400px; /* top: 418px; */
right: 280px; /* right: 300px; */
margin-right: 20px;
cursor: pointer; cursor: pointer;
} }
.pull-left-btn{ .pull-left-btn{
position: fixed; /* position: fixed; */
z-index: 999; z-index: 999;
top: 400px; /* top: 400px; */
right: 40px; /* right: 40px; */
cursor: pointer; cursor: pointer;
display: none; display: none;
} }
...@@ -311,7 +314,10 @@ div.propertySection { ...@@ -311,7 +314,10 @@ div.propertySection {
color: #1a1a1a; color: #1a1a1a;
text-decoration: none; text-decoration: none;
} }
.selected-item-section{
background: rgb(232, 237, 241);
width: 100%;
}
.selected-item-section > div > .pull-right { .selected-item-section > div > .pull-right {
line-height: 50px; line-height: 50px;
margin: 0px 10px; margin: 0px 10px;
...@@ -335,7 +341,8 @@ div.propertySection { ...@@ -335,7 +341,8 @@ div.propertySection {
.selected-item-body { .selected-item-body {
padding: 0; padding: 0;
overflow: auto; overflow: auto;
width: 260px; /* width: 260px; */
width: 95%;
/* height: 199px; */ /* height: 199px; */
max-height: 730px; max-height: 730px;
} }
...@@ -1230,6 +1237,7 @@ hot-table .column-header.label { ...@@ -1230,6 +1237,7 @@ hot-table .column-header.label {
} }
#contentCanvasWrapper { #contentCanvasWrapper {
width: 100%;
/* padding-left: 300px; */ /* padding-left: 300px; */
transition: 0.3s padding-left; transition: 0.3s padding-left;
display: flex; display: flex;
......
editor-app/editor-controller.js
View file @ 1af3bc1f
...@@ -133,6 +133,7 @@ angular.module('flowableModeler') ...@@ -133,6 +133,7 @@ angular.module('flowableModeler')
this.style.display = "none" this.style.display = "none"
paletteHelpWrapper.addClass('close'); paletteHelpWrapper.addClass('close');
contentCanvasWrapper.addClass('collapsedCanvasWrapper'); contentCanvasWrapper.addClass('collapsedCanvasWrapper');
contentCanvasWrapper.addClass('col-xs-12');
paletteSectionOpen.removeClass('hidden'); paletteSectionOpen.removeClass('hidden');
paletteSectionOpen.css("display", "block") paletteSectionOpen.css("display", "block")
}); });
...@@ -141,6 +142,7 @@ angular.module('flowableModeler') ...@@ -141,6 +142,7 @@ angular.module('flowableModeler')
this.style.display = "none" this.style.display = "none"
paletteHelpWrapper.removeClass('close'); paletteHelpWrapper.removeClass('close');
contentCanvasWrapper.removeClass('collapsedCanvasWrapper'); contentCanvasWrapper.removeClass('collapsedCanvasWrapper');
contentCanvasWrapper.addClass('col-xs-12');
paletteSectionOpen.addClass('hidden'); paletteSectionOpen.addClass('hidden');
paletteSectionFooter.css("display", "block") paletteSectionFooter.css("display", "block")
}); });
......
editor-app/editor.html
View file @ 1af3bc1f
...@@ -78,11 +78,11 @@ ...@@ -78,11 +78,11 @@
<i class="glyphicon glyphicon-chevron-left"></i> <i class="glyphicon glyphicon-chevron-left"></i>
</div> </div>
</div> </div>
<div id="contentCanvasWrapper"> <div id="contentCanvasWrapper row" style="width: 100%;">
<div id="paletteSectionOpen" class="hidden"> <div id="paletteSectionOpen" class="hidden">
<i class="glyphicon glyphicon-chevron-right"></i> <i class="glyphicon glyphicon-chevron-right"></i>
</div> </div>
<div id="canvasHelpWrapper" class="col-xs-12"> <div id="canvasHelpWrapper" class="col-xs-9">
<div class="canvas-wrapper" id="canvasSection" <div class="canvas-wrapper" id="canvasSection"
ng-model="droppedElement" ng-model="droppedElement"
data-drop="true" data-drop="true"
...@@ -121,8 +121,11 @@ ...@@ -121,8 +121,11 @@
</div> </div>
</div> </div>
<!-- <div id="propertiesHelpWrapper" class="col-xs-12 propertiesHelpWrapper"> --> <!-- <div id="propertiesHelpWrapper" class="col-xs-12 propertiesHelpWrapper"> -->
<div id="propertiesHelpWrapper" class="propertiesHelpWrapper"> <div id="propertiesHelpWrapper" class="propertiesHelpWrapper col-xs-3">
<div class="propertySection" id="propertySection" ng-class="{collapsed: propertyWindowState.collapsed}"> <div class="propertySection" id="propertySection" ng-class="{collapsed: propertyWindowState.collapsed}">
<div class="pull-right-btn" ng-click="pullRight()">
<i class="glyphicon glyphicon-chevron-right"></i>
</div>
<div class="selected-item-section"> <div class="selected-item-section">
<div class="clearfix"> <div class="clearfix">
<div class="pull-right" ng-if="selectedItem.auditData.createDate"> <div class="pull-right" ng-if="selectedItem.auditData.createDate">
...@@ -162,9 +165,6 @@ ...@@ -162,9 +165,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="pull-right-btn" ng-click="pullRight()">
<i class="glyphicon glyphicon-chevron-right"></i>
</div>
</div> </div>
<div class="pull-left-btn" id="pull-left-btn" ng-click="pullLeft()"> <div class="pull-left-btn" id="pull-left-btn" ng-click="pullLeft()">
<i class="glyphicon glyphicon-chevron-left"></i> <i class="glyphicon glyphicon-chevron-left"></i>
......
editor-app/stencil-controller.js
View file @ 1af3bc1f
...@@ -1717,11 +1717,22 @@ angular.module('flowableModeler') ...@@ -1717,11 +1717,22 @@ angular.module('flowableModeler')
$scope.pullRight = function() { $scope.pullRight = function() {
document.getElementById("propertySection").style.display = "none" document.getElementById("propertySection").style.display = "none"
document.getElementById("pull-left-btn").style.display = "block" document.getElementById("pull-left-btn").style.display = "block"
document.getElementById("pull-left-btn").style.zIndex = "999"
document.getElementById("pull-left-btn").style.position = "fixed"
document.getElementById("pull-left-btn").style.top = "418px"
document.getElementById("pull-left-btn").style.right = "40px"
} }
$scope.pullLeft = function() { $scope.pullLeft = function() {
document.getElementById("propertySection").style.display = "block" document.getElementById("propertySection").style.display = "block"
document.getElementById("propertySection").style.display = "flex"
document.getElementById("propertySection").style.zIndex = "999"
// document.getElementById("pull-right-btn").style.position = "fixed"
// document.getElementById("pull-right-btn").style.top = "418px"
// document.getElementById("pull-right-btn").style.right = "40px"
document.getElementById("propertySection").style.alignItems = "center"
document.getElementById("propertySection").style.marginRight = "20px"
document.getElementById("pull-left-btn").style.display = "none" document.getElementById("pull-left-btn").style.display = "none"
} }
}]); }]);
......
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