Commit @739e19d5bf98451cf5f7c5d46c472579b298f519

[Notice] Announcing the End of Demo Server [Read me]

Jihan Kim 2013-05-07

fix dropdown CSS

@739e19d5bf98451cf5f7c5d46c472579b298f519

4a7049b

739e19d

app/assets/stylesheets/less/_hiveUI.less

--- app/assets/stylesheets/less/_hiveUI.less

+++ app/assets/stylesheets/less/_hiveUI.less


 .btn .caret {
     border-top-color:@blue;
 }
+.dropdown-menu li {
+    margin-bottom:1px;
+}
 .dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a {
-    background-color:@darkgray !important;
-    .linear-gradient(@darkgray, darken(@darkgray, 10%));
+    background:@darkgray !important;
+    /*.linear-gradient(@darkgray, darken(@darkgray, 10%));*/
 }
 .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
     color:#fff;
-    background-color:@darkgray !important;
-    .linear-gradient(@darkgray, darken(@darkgray, 10%));    
+    background:@darkgray !important;
+    /*.linear-gradient(@darkgray, darken(@darkgray, 10%));*/    
 }
-
+.dropdown-menu .disabled span {
+    padding-left:10px;
+    font-weight:bold; color:@darkgray;
+}
 /** buttons **/
 .nbtn {
     text-align :center;

4a7049b

739e19d

app/views/navbar.scala.html

--- app/views/navbar.scala.html

+++ app/views/navbar.scala.html


 					<ul class="dropdown-menu">
 						<li><a href="@routes.UserApp.userInfo(session.get("loginId"))">@Messages("userinfo.profile")</a></li>
 						<li><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></li>
+						<li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
 						<li class="divider"></li>
-						
 				@defining(User.findByLoginId(session.get("loginId")).myProjects()) { myProjects =>
 					@if(myProjects.length > 0){
+						<li class="disabled"><span>@Messages("project.myproject")</span></li>
 						@for(project <- myProjects){
 						<li><a href="@routes.ProjectApp.project(project.owner, project.name)">@project.name (@project.owner)</a></li>
 						}
-						<li class="divider"></li>
 					}
 				}
-						<li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
 					</ul>
 				</div>
 				} else {

4a7049b

739e19d

app/views/topmenu.scala.html

--- app/views/topmenu.scala.html

+++ app/views/topmenu.scala.html


 					<ul class="dropdown-menu">
 						<li><a href="@routes.UserApp.userInfo(session.get("loginId"))">@Messages("userinfo.profile")</a></li>
 						<li><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></li>
+						<li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
 						<li class="divider"></li>
 				@defining(User.findByLoginId(session.get("loginId")).myProjects()) { myProjects =>
 					@if(myProjects.length > 0){
+						<li class="disabled"><span>@Messages("project.myproject")</span></li>
 						@for(project <- myProjects){
 						<li><a href="@routes.ProjectApp.project(project.owner, project.name)">@project.name (@project.owner)</a></li>
 						}
-						<li class="divider"></li>
 					}
 				}
-						<li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
 					</ul>
 				</div>
 				} else {

Add a comment

Open 0
Closed 0

List

...	...	@@ -53,16 +53,22 @@
53	53	.btn .caret {
54	54	border-top-color:@blue;
55	55	}
	56	+.dropdown-menu li {
	57	+ margin-bottom:1px;
	58	+}
56	59	.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a {
57		- background-color:@darkgray !important;
58		- .linear-gradient(@darkgray, darken(@darkgray, 10%));
	60	+ background:@darkgray !important;
	61	+ /.linear-gradient(@darkgray, darken(@darkgray, 10%));/
59	62	}
60	63	.dropdown-menu .active > a, .dropdown-menu .active > a:hover {
61	64	color:#fff;
62		- background-color:@darkgray !important;
63		- .linear-gradient(@darkgray, darken(@darkgray, 10%));
	65	+ background:@darkgray !important;
	66	+ /.linear-gradient(@darkgray, darken(@darkgray, 10%));/
64	67	}
65		-
	68	+.dropdown-menu .disabled span {
	69	+ padding-left:10px;
	70	+ font-weight:bold; color:@darkgray;
	71	+}
66	72	/ buttons /
67	73	.nbtn {
68	74	text-align :center;

...	...	@@ -29,16 +29,16 @@
29	29	<ul class="dropdown-menu">
30	30	<li><a href="@routes.UserApp.userInfo(session.get("loginId"))">@Messages("userinfo.profile")</a></li>
31	31	<li><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></li>
	32	+ <li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
32	33	<li class="divider"></li>
33	34	@defining(User.findByLoginId(session.get("loginId")).myProjects()) { myProjects =>
34	35	@if(myProjects.length > 0){
	36	+ <li class="disabled"><span>@Messages("project.myproject")</span></li>
35	37	@for(project <- myProjects){
36	38	<li><a href="@routes.ProjectApp.project(project.owner, project.name)">@project.name (@project.owner)</a></li>
37	39	}
38		- <li class="divider"></li>
39	40	}
40	41	}
41		- <li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
42	42	</ul>
43	43	</div>
44	44	} else {

...	...	@@ -38,17 +38,16 @@
38	38	<ul class="dropdown-menu">
39	39	<li><a href="@routes.UserApp.userInfo(session.get("loginId"))">@Messages("userinfo.profile")</a></li>
40	40	<li><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></li>
	41	+ <li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
41	42	<li class="divider"></li>
42		-
43	43	@defining(User.findByLoginId(session.get("loginId")).myProjects()) { myProjects =>
44	44	@if(myProjects.length > 0){
	45	+ <li class="disabled"><span>@Messages("project.myproject")</span></li>
45	46	@for(project <- myProjects){
46	47	<li><a href="@routes.ProjectApp.project(project.owner, project.name)">@project.name (@project.owner)</a></li>
47	48	}
48		- <li class="divider"></li>
49	49	}
50	50	}
51		- <li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
52	51	</ul>
53	52	</div>
54	53	} else {

Delete comment