p01469285
/
aggregation-platform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

何并分支

This commit is contained in:
wu ming 2016-09-08 23:01:53 +08:00
parent 3aec8f7361 4ffba40f1f
commit c0c6e85564
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/hawtio-kubernetes.js vendored
View File

File diff suppressed because one or more lines are too long

22
new/sj_style.css
View File

@ -23,7 +23,9 @@ a:hover,a:active{color:#333;}
a.sj_btn_grey{ display:inline-block; padding:0px 15px; height:30px; line-height:30px; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; background-image:-webkit-linear-gradient(top, #fdfdfd,#e8e8e8);background-image:linear-gradient(top,#fdfdfd,#e8e8e8); border:1px solid #cecece; color:#505050;}
a:hover.sj_btn_grey{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3d3);background-image:linear-gradient(top,#eeeeee,#d3d3d3);}
.sj_btn_grey{ display:inline-block; padding:0px 15px; height:30px; line-height:30px; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; background-image:-webkit-linear-gradient(top, #fdfdfd,#e8e8e8);background-image:linear-gradient(top,#fdfdfd,#e8e8e8); border:1px solid #cecece; color:#505050;}
.sj_btn_grey:hover{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3d3);background-image:linear-gradient(top,#eeeeee,#d3d3d3);}
.sj_btn_grey:hover{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3d3);background-image:linear-gradient(top,#eeeeee,#d3d3d3);border:1px solid #cecece; color:#505050;}
.sj_btn_blue{ display:inline-block; padding:0px 15px; height:30px; line-height:30px; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; background-image:-webkit-linear-gradient(top, #2a84e9,#0d62c1);background-image:linear-gradient(top,#2a84e9,#0d62c1);border:1px solid #1362b4; color:#fff;}
.sj_btn_blue:hover{ background-image:-webkit-linear-gradient(top, #4894ea,#3a83d6);background-image:linear-gradient(top,#4894ea,#3a83d6);}
/* sj_header */
.sj_header{ height:70px; width:100%; background:#1d1d1d;}
.sj_header a.sj_logo{ display:block; height:41px; width:146px; padding:14px 20px 0 12px;}
@ -85,4 +87,20 @@ a:hover.sj_btn_grey{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3
.sj_nav_taps li a{ display: inline-block; font-size: 12px; border:1px solid #cecece;background-image:-webkit-linear-gradient(top, #fcfcfc,#e9e9e9);background-image:linear-gradient(top, #fcfcfc,#e9e9e9); padding:5px 15px; color:#505050; margin-right:5px;}
.sj_nav_taps li a:hover,.sj_nav_taps li a.active{ background:#cdcdcd; border:1px solid #9e9e9e;}
.sj_nav_taps > li.active > a, .sj_nav_taps > li.active > a:hover, .sj_nav_taps > li.active > a:focus { background:#cdcdcd; border:1px solid #9e9e9e; color:#505050;}
.sj_fluid{ padding:0;}
.sj_fluid{ padding:0;}
.treecontrol{ font-size: 14px; height: 32px; line-height: 32px; padding-left: 15px;}
treecontrol.tree-classic li.tree-expanded i.tree-branch-head { padding: 1px 15px; padding-right:25px;background: url(../new/images/sj_tree_files.png) 0 -23px no-repeat;}
treecontrol.tree-classic li.tree-collapsed i.tree-branch-head{ padding: 1px 15px;padding-right:25px;background: url(../new/images/sj_tree_files.png) 0 0px no-repeat;}
treecontrol.tree-classic li.tree-leaf i.tree-leaf-head { padding: 1px 15px; padding-right:10px;background: url(../new/images/sj_tree_files.png) 0 -48px no-repeat;}
treecontrol.tree-classic li .tree-selected{background-color: #e5f0fb; color: #333; }
treecontrol li{ line-height: 30px; padding-left: 25px;}
treecontrol li:hover{}
.sj_modal_body{ height: 210px; overflow: auto;padding-left: 0; padding-right: 0;}
.modal{ width: 500px;}
.sj_modal-header{ height:42px; line-height: 42px; border-bottom: 1px solid #ddd; }
.sj_modal-header h4{ margin-top: 5px; font-weight: bold;}
.sj_modal_select{ width: 350px; height: 30px; line-height: 30px; border: 1px solid #ccc; }
.sj_contro_label{ height: 30px; line-height: 30px;}
.sj_contro_label{ padding-right:10px; }
.sj_fluid{ padding-right: 0px; padding-left: 0px;}

18
plugins/developer/html/workspaces.html
View File

@ -56,16 +56,16 @@
</div>
</div>
</div>
<div modal="migrationClick.dialog.show ">
<div modal="migrationClick.dialog.show " >
<form name="selectFolder " class=" " ng-submit="migrationClick.onOk() ">
<div class="modal-header ">
<h4>数据迁移</h4></div>
<div class="modal-body">
<div class="row">
<label class="col-sm-3 control-label" for="selectedItem ">
<div class="modal-header sj_modal-header" >
<h4 >数据迁移</h4></div>
<div class="modal-body sj_modal_body">
<div class="row sj_model_row">
<label class="col-sm-3 control-label sj_contro_label" for="selectedItem ">
请选择迁移集群
</label>
<select ng-model="migrationClick.selectedItem " class="col-sm-3" title="name of the new namespace " id="selectedItem " ng-options="x.$oracleName for x in filterReplicationControllers " />
<select ng-model="migrationClick.selectedItem " class="col-sm-3 sj_modal_select" title="name of the new namespace " id="selectedItem " ng-options="x.$oracleName for x in filterReplicationControllers " />
</div>
<div>
<treecontrol class="tree-classic" tree-model="dataForTheTree" options="treeOptions" on-selection="showSelected(node)" selected-node="selectNode">
@ -74,8 +74,8 @@
</div>
</div>
<div class="modal-footer ">
<input class="btn btn-primary " type="submit" ng-disabled="!selectNode || selectNode.children.length <= 0" value="确定">
<button class="btn btn-warning cancel " type="button" ng-click="migrationClick.close()">取消</button>
<input class="btn btn-primary sj_btn_blue" type="submit" ng-disabled="!selectNode || selectNode.children.length <= 0" value="确定">
<button class="btn btn-warning cancel sj_btn_grey" type="button" ng-click="migrationClick.close()">取消</button>
</div>
</form>
</div>