diff options
author | Vitaly Takmazov | 2017-05-23 00:17:41 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2017-05-23 00:17:41 +0300 |
commit | 0179e9286416ae038e7a2e87c54e355651efb1d2 (patch) | |
tree | ae0b238316bde28c1d9148c80642d83c5fbbf494 | |
parent | c00f7ea7691f2a9b8f49cc084b7e0d7dd60547e7 (diff) |
juick-www: fix some css warnings
-rw-r--r-- | juick-www/.csslintrc | 3 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/controllers/User.java | 2 | ||||
-rw-r--r-- | juick-www/src/main/java/com/juick/www/controllers/UserThread.java | 2 | ||||
-rw-r--r-- | juick-www/src/main/static/style.css | 31 |
4 files changed, 9 insertions, 29 deletions
diff --git a/juick-www/.csslintrc b/juick-www/.csslintrc index 90bccdf0..a46c04e0 100644 --- a/juick-www/.csslintrc +++ b/juick-www/.csslintrc @@ -1,5 +1,6 @@ { "box-sizing": false, "box-model": false, - "ids": false + "ids": false, + "floats": false } diff --git a/juick-www/src/main/java/com/juick/www/controllers/User.java b/juick-www/src/main/java/com/juick/www/controllers/User.java index bc5ebfe3..bb58a739 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/User.java +++ b/juick-www/src/main/java/com/juick/www/controllers/User.java @@ -280,7 +280,7 @@ public class User { out.println("<aside id=\"column\">"); out.println(" <div id=\"ctitle\"><a href=\"./\"><img src=\"//i.juick.com/as/" + user.getUid() + ".png\" alt=\"\"/>" + user.getName() + "</a></div>"); if (visitor.getUid() > 0 && visitor.getUid() != user.getUid()) { - out.println(" <ul id=\"ctoolbar\">"); + out.println(" <ul class=\"toolbar\">"); if (userService.isSubscribed(visitor.getUid(), user.getUid())) { out.println(" <li><a href=\"/post?body=U+%40" + user.getName() + "\" title=\"Подписан\"><div style=\"background-position: -48px 0\"></div></a></li>"); } else { diff --git a/juick-www/src/main/java/com/juick/www/controllers/UserThread.java b/juick-www/src/main/java/com/juick/www/controllers/UserThread.java index 25460666..1d1bb30b 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/UserThread.java +++ b/juick-www/src/main/java/com/juick/www/controllers/UserThread.java @@ -195,7 +195,7 @@ public class UserThread { out.println(" </div>"); out.println(" </li>"); - out.println(" <li id=\"mtoolbar\"><ul>"); + out.println(" <li class=\"toolbar\"><ul>"); out.println(" <li><a href=\"/" + msg.getMid() + "\"><div style=\"background-position: -64px 0\"></div>" + msg.getMid() + "</a></li>"); if (visitor.getUid() > 0 && !messagesService.isReadonly()) { if (visitor.getUid() != msg.getUser().getUid()) { diff --git a/juick-www/src/main/static/style.css b/juick-www/src/main/static/style.css index 4fda41df..d3e47dd1 100644 --- a/juick-www/src/main/static/style.css +++ b/juick-www/src/main/static/style.css @@ -313,7 +313,6 @@ article .tags>a, .msg-tags>a { background: url("menu.png") no-repeat; display: block; height: 16px; - vertical-align: top; width: 16px; } .msg-ts, article .t { @@ -415,18 +414,18 @@ q { margin: 10px 0 10px 10px; padding-left: 10px; } -#mtoolbar { +.toolbar { background: #E5E5DD; border-top: 1px solid #CCC; width: 680px; } -#mtoolbar ul, #mtoolbar a { +.toolbar ul, .toolbar a { padding: 5px; } -#mtoolbar li { +.toolbar li { display: inline; } -#mtoolbar div { +.toolbar div { background: url("toolbar-icons.png") no-repeat; display: inline-block; height: 16px; @@ -541,26 +540,6 @@ q { margin-right: 5px; vertical-align: middle; } -#ctoolbar { - background: #E5E5DD; - line-height: 0; - margin: 10px 0; - padding: 5px; -} -#ctoolbar li { - display: inline; -} -#ctoolbar a { - padding: 5px 10px; -} -#ctoolbar div { - background: url("toolbar-icons.png") no-repeat; - display: inline-block; - height: 16px; - margin: 5px 0; - vertical-align: middle; - width: 16px; -} #ustats li { font-size: 10pt; margin: 3px 0; @@ -775,7 +754,7 @@ fieldset { -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } - body,body>header,#topwrapper,#content,#footer,#mtoolbar { + body,body>header,#topwrapper,#content,#footer,.toolbar { float: none; margin: 0 auto; min-width: 310px; |