diff --git a/module/bug/css/common.css b/module/bug/css/common.css new file mode 100644 index 0000000000..5b15a82d70 --- /dev/null +++ b/module/bug/css/common.css @@ -0,0 +1 @@ +.ke-toolbar .ke-outline[data-name='savetemplate'] {display: none} diff --git a/module/bug/css/create.css b/module/bug/css/create.css index beee04a958..f2d241b1be 100644 --- a/module/bug/css/create.css +++ b/module/bug/css/create.css @@ -1,4 +1,5 @@ -.ke-outline .ke-icon-savetemplate {background-image: url(theme/default/images/kindeditor/save.gif); background-position: center; width: 56px; height: 20px;} +.ke-toolbar .ke-outline[data-name='savetemplate'] {display: block;} +.ke-outline .ke-icon-savetemplate {background-image: url(theme/default/images/kindeditor/save.gif); background-position: center; width: 56px; height: 20px;} /* template box */ #tplBox .list-group-item {padding: 6px 6px;} diff --git a/module/common/view/kindeditor.html.php b/module/common/view/kindeditor.html.php index 2bcd6f5ddf..f2b6681322 100755 --- a/module/common/view/kindeditor.html.php +++ b/module/common/view/kindeditor.html.php @@ -41,6 +41,7 @@ function initKindeditor(afterInit) $.each(editor.id, function(key, editorID) { editorTool = simpleTools; + console.log(editor.tools); if(editor.tools == 'bugTools') editorTool = bugTools; if(editor.tools == 'fullTools') editorTool = fullTools; diff --git a/module/project/css/burn.css b/module/project/css/burn.css index e379fba8e6..a2e7cb3847 100644 --- a/module/project/css/burn.css +++ b/module/project/css/burn.css @@ -1,4 +1,4 @@ -.container {max-width: 950px;} +.container {max-width: 950px!important;} .container .actions {margin-bottom: 10px; padding: 0 25px} .container .actions > .text {padding: 5px 5px 5px 15px; line-height: 20px} .mw-220px {max-width: 220px!important} diff --git a/module/project/css/create.css b/module/project/css/create.css index 1871e373e8..089e01876c 100644 --- a/module/project/css/create.css +++ b/module/project/css/create.css @@ -1,5 +1,6 @@ #tipsModal {margin-top: 10%;} #begin + .input-group-addon {border-left: none; border-right: none;} +#begin,#end {max-width: 120px; width: auto} #copyProjectModal {padding: 0} #copyProjectModal {padding: 0 2px} @@ -11,4 +12,4 @@ #copyProjectModal a.active:after {position: absolute; content: '\e60d'; font-family: ZenIcon; font-size: 20px; right: 25px;} #copyProjectModal a.cancel {color: #D2322D} -.modal-dialog {margin-top: 10%;} +.modal-dialog {margin-top: 10%!important;} diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index d90ae9ccce..b724967485 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -56,7 +56,7 @@ project->dateRange;?>
- project->begin . "'");?> + project->begin . "'");?> project->to;?> project->end . "'");?>
diff --git a/module/story/css/common.css b/module/story/css/common.css index e8428733e8..bbf40b4424 100644 --- a/module/story/css/common.css +++ b/module/story/css/common.css @@ -1,2 +1,3 @@ .linkbox{height:180px; overflow-y:auto} .tab-pane .table-borderless {border: 1px solid #ddd!important} +.tab-pane .table-data.table-borderless {border: none!important} diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 9e9138f21c..e6a928889a 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -70,8 +70,8 @@ -
-
+
+
story->legendSpec;?> @@ -95,7 +95,7 @@
-
+