Skip to content

Commit 757830e

Browse files
committed
add readjust layout to topbar
1 parent 4adb673 commit 757830e

File tree

7 files changed

+45
-39
lines changed

7 files changed

+45
-39
lines changed

dist/kityminder.editor.css

+30-29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/kityminder.editor.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

less/editor.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ div.minder-editor-container {
112112
@import (less) "topTab/idea/resource.less";
113113
@import (less) "topTab/appearance/templatePanel.less";
114114
@import (less) "topTab/appearance/themePanel.less";
115+
@import (less) "topTab/appearance/layout.less";
115116
@import (less) "_tool_group.less";
116-
@import (less) "_layout.less";
117117
@import (less) "_styleOperator.less";
118118
@import (less) "_fontOperator.less";
119119
@import (less) "_colorPanel.less";

less/_layout.less less/topTab/appearance/layout.less

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
.inline-directive {
1+
.readjust-layout {
22
display: inline-block;
3+
vertical-align: middle;
4+
padding: 0 10px 0 5px;
5+
border-right: 1px dashed #eee;
36
}
47

58
.btn-icon {
69
width: 25px;
710
height: 25px;
811
margin-left: 12px;
9-
margin-bottom: 3px;
10-
margin-top: 4px;
1112
display: block;
1213
}
1314

@@ -17,7 +18,7 @@
1718

1819
.btn-wrap {
1920
width: 50px;
20-
height: 50px;
21+
height: 42px;
2122
cursor: pointer;
2223
display: inline-block;
2324
text-decoration: none;

ui/directive/layout/layout.directive.js

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ angular.module('kityminderEditor')
66
scope: {
77
minder: '='
88
},
9+
replace: true,
910
link: function(scope) {
1011

1112
}

ui/directive/layout/layout.html

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<a ng-click="minder.execCommand('resetlayout')" class="btn-wrap" ng-disabled="minder.queryCommandState('resetlayout') === -1">
2-
<span class="btn-icon reset-layout-icon"></span>
3-
<span class="btn-label">{{ 'resetlayout' | lang: 'ui/command' }}</span>
4-
</a>
1+
<div class="readjust-layout">
2+
<a ng-click="minder.execCommand('resetlayout')" class="btn-wrap" ng-disabled="minder.queryCommandState('resetlayout') === -1">
3+
<span class="btn-icon reset-layout-icon"></span>
4+
<span class="btn-label">{{ 'resetlayout' | lang: 'ui/command' }}</span>
5+
</a>
6+
</div>

ui/directive/topTab/topTab.html

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<tab heading="{{ 'appearence' | lang: 'ui/tabs'; }}">
1414
<template-list minder="minder" class="inline-directive"></template-list>
1515
<theme-list minder="minder"></theme-list>
16+
<layout minder="minder" class="inline-directive"></layout>
1617
</tab>
1718
<tab heading="{{ 'view' | lang: 'ui/tabs'; }}">视图面板</tab>
1819
</tabset>

0 commit comments

Comments
 (0)