Commit @457680ff59e9aeef784191929b6c23b0ab4fd914

doortts 2018-10-23

mention: Change rendered mention css style

@457680ff59e9aeef784191929b6c23b0ab4fd914

cca1b79

457680f

app/assets/stylesheets/less/_page.less

--- app/assets/stylesheets/less/_page.less

+++ app/assets/stylesheets/less/_page.less


                     }
                 }
                 .one-line-comment {
-                    :hover {
-                       background-color: #f1f1f1;
-                    }
-
                     .contents {
                         text-align: left;
                         margin-left: 12px;

   text-decoration: none !important;
 }
 
+.user-link {
+    -webkit-font-smoothing: antialiased;
+    -webkit-text-size-adjust: 100%;
+    -webkit-font-feature-settings: "kern" 1;
+    -moz-font-feature-settings: "kern" 1;
+    -o-font-feature-settings: "kern" 1;
+    font-feature-settings: "kern" 1;
+    font-kerning: normal;
+    border: 1px solid #4FC3F7;
+    border-radius: 3px;
+    margin-right: 3px;
+    padding-left: 2px;
+    padding-right: 2px;
+    background-color: #4FC3F7;
+    color: white;
+
+    &.me {
+        background-color: #4FC3F7;
+    }
+
+    &:hover {
+        color: black;
+        background-color: #4FC3F7 !important;
+    }
+
+    span {
+        font-weight: 600;
+        color: white;
+    }
+}
+
 .ago-date {
   vertical-align: middle;
 }

cca1b79

457680f

app/models/User.java

--- app/models/User.java

+++ app/models/User.java


                 pureName = this.name;
             }
             if (pureName.contains(spliter)) {
-                pureName = this.name.substring(0, this.name.indexOf(spliter));
+                pureName = this.name.substring(0, this.name.indexOf(spliter)).trim();
             }
         }
 

cca1b79

457680f

app/utils/AutoLinkRenderer.java

--- app/utils/AutoLinkRenderer.java

+++ app/utils/AutoLinkRenderer.java


 /**
- * Yobi, Project Hosting SW
- *
- * Copyright 2014 NAVER Corp.
- * http://yobi.io
- *
- * @author Changgun Kim
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ * Yona, 21st Century Project Hosting SW
+ * <p>
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
+ * https://yona.io
+ **/
+
 package utils;
 
 import controllers.UserApp;

                 userName = user.getPureNameOnly(lang);
             }
 
-            return new Link(RouteUtil.getUrl(user), "no-text-decoration", "<span data-toggle='popover' data-placement='top' data-trigger='hover' data-html='true' data-content=\"" + StringEscapeUtils.escapeHtml4(avatarImage + user.name + " " + user.loginId) + "\">@" + userName + "</span>");
+            return new Link(RouteUtil.getUrl(user), "no-text-decoration user-link", "<span data-toggle='popover' data-placement='top' data-trigger='hover' data-html='true' data-content=\"" + StringEscapeUtils.escapeHtml4(avatarImage + user.name + " " + user.loginId) + "\">@" + userName + "</span>");
         }
     }
 

Add a comment

Open 0
Closed 0

List

...	...	@@ -2937,10 +2937,6 @@
2937	2937	}
2938	2938	}
2939	2939	.one-line-comment {
2940		- :hover {
2941		- background-color: #f1f1f1;
2942		- }
2943		-
2944	2940	.contents {
2945	2941	text-align: left;
2946	2942	margin-left: 12px;
...	...	@@ -6639,6 +6635,37 @@
6639	6635	text-decoration: none !important;
6640	6636	}
6641	6637
	6638	+.user-link {
	6639	+ -webkit-font-smoothing: antialiased;
	6640	+ -webkit-text-size-adjust: 100%;
	6641	+ -webkit-font-feature-settings: "kern" 1;
	6642	+ -moz-font-feature-settings: "kern" 1;
	6643	+ -o-font-feature-settings: "kern" 1;
	6644	+ font-feature-settings: "kern" 1;
	6645	+ font-kerning: normal;
	6646	+ border: 1px solid #4FC3F7;
	6647	+ border-radius: 3px;
	6648	+ margin-right: 3px;
	6649	+ padding-left: 2px;
	6650	+ padding-right: 2px;
	6651	+ background-color: #4FC3F7;
	6652	+ color: white;
	6653	+
	6654	+ &.me {
	6655	+ background-color: #4FC3F7;
	6656	+ }
	6657	+
	6658	+ &:hover {
	6659	+ color: black;
	6660	+ background-color: #4FC3F7 !important;
	6661	+ }
	6662	+
	6663	+ span {
	6664	+ font-weight: 600;
	6665	+ color: white;
	6666	+ }
	6667	+}
	6668	+
6642	6669	.ago-date {
6643	6670	vertical-align: middle;
6644	6671	}

...	...	@@ -1076,7 +1076,7 @@
1076	1076	pureName = this.name;
1077	1077	}
1078	1078	if (pureName.contains(spliter)) {
1079		- pureName = this.name.substring(0, this.name.indexOf(spliter));
	1079	+ pureName = this.name.substring(0, this.name.indexOf(spliter)).trim();
1080	1080	}
1081	1081	}
1082	1082

...	...	@@ -1,23 +1,10 @@
1	1	/**
2		- * Yobi, Project Hosting SW
3		- *
4		- * Copyright 2014 NAVER Corp.
5		- * http://yobi.io
6		- *
7		- * @author Changgun Kim
8		- *
9		- * Licensed under the Apache License, Version 2.0 (the "License");
10		- * you may not use this file except in compliance with the License.
11		- * You may obtain a copy of the License at
12		- *
13		- * http://www.apache.org/licenses/LICENSE-2.0
14		- *
15		- * Unless required by applicable law or agreed to in writing, software
16		- * distributed under the License is distributed on an "AS IS" BASIS,
17		- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18		- * See the License for the specific language governing permissions and
19		- * limitations under the License.
20		- */
	2	+ * Yona, 21st Century Project Hosting SW
	3	+ * <p>
	4	+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
	5	+ * https://yona.io
	6	+ **/
	7	+
21	8	package utils;
22	9
23	10	import controllers.UserApp;
...	...	@@ -338,7 +325,7 @@
338	325	userName = user.getPureNameOnly(lang);
339	326	}
340	327
341		- return new Link(RouteUtil.getUrl(user), "no-text-decoration", "<span data-toggle='popover' data-placement='top' data-trigger='hover' data-html='true' data-content=\"" + StringEscapeUtils.escapeHtml4(avatarImage + user.name + " " + user.loginId) + "\">@" + userName + "</span>");
	328	+ return new Link(RouteUtil.getUrl(user), "no-text-decoration user-link", "<span data-toggle='popover' data-placement='top' data-trigger='hover' data-html='true' data-content=\"" + StringEscapeUtils.escapeHtml4(avatarImage + user.name + " " + user.loginId) + "\">@" + userName + "</span>");
342	329	}
343	330	}
344	331

Delete comment