Commit 86c65610 authored by Van's avatar Van

add article tag style & bug

parent 8554bffe
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
* @file frontend tool. * @file frontend tool.
* *
* @author <a href="mailto:liliyuan@fangstar.net">Liyuan Li</a> * @author <a href="mailto:liliyuan@fangstar.net">Liyuan Li</a>
* @version 1.3.2.0, Oct 8, 2016 * @version 1.3.2.0, Nov 9, 2016
*/ */
'use strict'; 'use strict';
...@@ -44,7 +44,6 @@ gulp.task('build', function () { ...@@ -44,7 +44,6 @@ gulp.task('build', function () {
'./src/main/webapp/js/lib/jquery/file-upload-9.10.1/jquery.fileupload.js', './src/main/webapp/js/lib/jquery/file-upload-9.10.1/jquery.fileupload.js',
'./src/main/webapp/js/lib/jquery/jquery.bowknot.min.js', './src/main/webapp/js/lib/jquery/jquery.bowknot.min.js',
'./src/main/webapp/js/lib/tiny_mce/tiny_mce.js', './src/main/webapp/js/lib/tiny_mce/tiny_mce.js',
'./src/main/webapp/js/lib/KindEditor/kindeditor-min.js',
// codemirror // codemirror
'./src/main/webapp/js/lib/CodeMirrorEditor/codemirror.js', './src/main/webapp/js/lib/CodeMirrorEditor/codemirror.js',
'./src/main/webapp/js/lib/editor/placeholder.js', './src/main/webapp/js/lib/editor/placeholder.js',
......
...@@ -633,7 +633,7 @@ a[class*=" icon-"]:hover { ...@@ -633,7 +633,7 @@ a[class*=" icon-"]:hover {
font-weight: 400; font-weight: 400;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
vertical-align: middle; vertical-align: baseline;
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
background-image: none; background-image: none;
...@@ -643,6 +643,7 @@ a[class*=" icon-"]:hover { ...@@ -643,6 +643,7 @@ a[class*=" icon-"]:hover {
color: #fff; color: #fff;
height: auto; height: auto;
outline: none; outline: none;
line-height: 18px;
} }
.form button:hover { .form button:hover {
...@@ -823,35 +824,41 @@ button#submitArticle:hover, ...@@ -823,35 +824,41 @@ button#submitArticle:hover,
margin: 2px 12px 0 0; margin: 2px 12px 0 0;
} }
.completed-panel { .completed-panel {
background-color: #ECECEC; background-color: #fff;
border: 1px solid #CCCCCC; border: 1px solid #ddd;
color: #0000CC; color: #0000CC;
display: none; display: none;
overflow: auto; overflow: auto;
padding: 2px; padding: 2px;
position: absolute; position: absolute;
z-index: 10; z-index: 10;
width: 50%;
border-top: 0;
} }
.completed-panel a { .completed-panel a {
display: block; display: block;
text-decoration: none; text-decoration: none;
line-height: 26px;
padding: 0 5px;
} }
.completed-panel a.selected { .completed-panel a.selected {
background-color: #FFFFFF; background-color: #f5f5f5;
color: #D54121; color: #fa8564;
} }
.completed-ck { .completed-ck {
margin-top: 9px; margin-top: 9px;
} }
.completed-ck span { .completed-ck span,
.signs button {
margin: 5px 10px 5px 0; margin: 5px 10px 5px 0;
display: inline-block; display: inline-block;
background-color: #c7cbd6; background-color: #c7cbd6;
border-color: #c7cbd6; border-color: #c7cbd6;
} }
.completed-ck span:hover { .completed-ck span:hover,
.signs button:hover {
background-color: #b0b5b9; background-color: #b0b5b9;
border-color: #b0b5b9; border-color: #b0b5b9;
} }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.3.4.5, Nov 8, 2016 * @version 1.3.5.5, Nov 9, 2016
*/ */
admin.article = { admin.article = {
currentEditorType: '', currentEditorType: '',
...@@ -415,7 +415,7 @@ admin.article = { ...@@ -415,7 +415,7 @@ admin.article = {
height: 160, height: 160,
buttonText: Label.selectLabel, buttonText: Label.selectLabel,
data: tags data: tags
}); }).width($("#tag").parent().width() - 68);
$("#loadMsg").text(""); $("#loadMsg").text("");
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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