Commit @802ec6e2dc5d07d75cc6a74e4ed685579cd5cba4

insanehong 2015-04-28

Globalheader: Change separator style on global header

- change opacity to 35%

@802ec6e2dc5d07d75cc6a74e4ed685579cd5cba4

71e67a8

802ec6e

app/assets/stylesheets/less/_page.less

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

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


         margin-left:15px;
         list-style: none;
         font-size: 14px;
-        color:#788ba7;
+        color: #a2a2a2;
         display:block;
 
         li {
             float:left;
             position: relative;
 
-            &:after {
-                content: "|";
-                color: #788ba7;
-            }
+            &.divider {
+                line-height: 40px;
+                font-size: 12px;
 
-            &:last-child:after {
-                content: "";
+                &:after {
+                    content: "|";
+                    color: #a2a2a2;
+                    .opacity(35);
+                }
             }
 
             a {

             margin:5px 0;
             position: relative;
 
-            &:after {
-                content: "|";
-                color: #788ba7;
+            &.divider {
+                line-height: 30px;
+
+                &:after {
+                    content: "|";
+                    color: #788ba7;
+                    .opacity(35);
+                }
             }
 
             &:last-child {
                 margin-left:10px;
-
-                &:after {
-                    content: "";
-                }
-
             }
 
             form {

71e67a8

802ec6e

app/views/common/navbar.scala.html

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

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


                 <a href="@routes.ProjectApp.projects()">@Messages("title.projectList")</a>
             </li>
             @if(appFeedbackUrl){
+            <li class="divider"></li>
             <li>
                 <a href="@appFeedbackUrl" target="_blank">@Messages("title.yobi.feedback")</a>
             </li>

71e67a8

802ec6e

app/views/common/usermenu.scala.html

--- app/views/common/usermenu.scala.html

+++ app/views/common/usermenu.scala.html


 <ul class="gnb-usermenu">
     @requestHeader.session.get("loginId") match {
       case Some(loginId) => {
-        <li class="gnb-usermenu-item">
+       <li class="gnb-usermenu-item">
           <a href="@routes.Application.index()" class="user-item-btn">@Messages("notification")</a>
-        </li>
-        <li class="gnb-usermenu-item">
+       </li>
+       <li class="divider"></li>
+       <li class="gnb-usermenu-item">
           <a href="@routes.IssueApp.userIssues()" class="user-item-btn">@Messages("issue.myIssue")</a>
         </li>
+        <li class="divider"></li>
         @if(UserApp.currentUser.isSiteManager) {
         <li class="gnb-usermenu-item">
             <a href="@routes.SiteApp.userList()" data-toggle="tooltip" title="@Messages("menu.siteAdmin")" data-placement="bottom" class="usermenu-icon-button">
                 <i class="yobicon-wrench"></i>
             </a>
         </li>
+        <li class="divider"></li>
         }
         <li class="gnb-usermenu-dropdown">
             <a href="javascript:void(0);" class="gnb-dropdown-toggle" data-toggle="dropdown">

                 }
             </ul>
         </li>
-          <li class="gnb-usermenu-dropdown">
-              <a href="javascript:void(0);" class="gnb-dropdown-toggle dropdwon-box-btn" data-toggle="dropdown">
-                  <i class="yobicon-plus"></i>
-                  <span class="caret"></span>
-              </a>
-              <ul class="dropdown-menu flat right">
-                  <li>
-                      <a href="@routes.ProjectApp.newProjectForm()">
-                      @Messages("button.newProject")
-                      </a>
-                  </li>
-                  <li>
-                      <a href="@routes.OrganizationApp.newForm()">
-                      @Messages("title.newOrganization")
-                      </a>
-                  </li>
-              </ul>
-          </li>
+      <li class="gnb-usermenu-dropdown">
+          <a href="javascript:void(0);" class="gnb-dropdown-toggle dropdwon-box-btn" data-toggle="dropdown">
+              <i class="yobicon-plus"></i>
+              <span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu flat right">
+              <li>
+                  <a href="@routes.ProjectApp.newProjectForm()">
+                  @Messages("button.newProject")
+                  </a>
+              </li>
+              <li>
+                  <a href="@routes.OrganizationApp.newForm()">
+                  @Messages("title.newOrganization")
+                  </a>
+              </li>
+          </ul>
+      </li>
       }
       case None => {
         <li class="gnb-usermenu-item">

           @Messages("title.login")
           </a>
         </li>
+        <li class="divider"></li>
         <li>
             <a href="@routes.UserApp.signupForm()" class="ybtn ybtn-success">
                 @Messages("title.signup")

Add a comment

Open 0
Closed 0

List

...	...	@@ -92,20 +92,22 @@
92	92	margin-left:15px;
93	93	list-style: none;
94	94	font-size: 14px;
95		- color:#788ba7;
	95	+ color: #a2a2a2;
96	96	display:block;
97	97
98	98	li {
99	99	float:left;
100	100	position: relative;
101	101
102		- &:after {
103		- content: "\|";
104		- color: #788ba7;
105		- }
	102	+ &.divider {
	103	+ line-height: 40px;
	104	+ font-size: 12px;
106	105
107		- &:last-child:after {
108		- content: "";
	106	+ &:after {
	107	+ content: "\|";
	108	+ color: #a2a2a2;
	109	+ .opacity(35);
	110	+ }
109	111	}
110	112
111	113	a {
...	...	@@ -153,18 +155,18 @@
153	155	margin:5px 0;
154	156	position: relative;
155	157
156		- &:after {
157		- content: "\|";
158		- color: #788ba7;
	158	+ &.divider {
	159	+ line-height: 30px;
	160	+
	161	+ &:after {
	162	+ content: "\|";
	163	+ color: #788ba7;
	164	+ .opacity(35);
	165	+ }
159	166	}
160	167
161	168	&:last-child {
162	169	margin-left:10px;
163		-
164		- &:after {
165		- content: "";
166		- }
167		-
168	170	}
169	171
170	172	form {

...	...	@@ -56,6 +56,7 @@
56	56	<a href="@routes.ProjectApp.projects()">@Messages("title.projectList")</a>
57	57	</li>
58	58	@if(appFeedbackUrl){
	59	+ <li class="divider"></li>
59	60	<li>
60	61	<a href="@appFeedbackUrl" target="_blank">@Messages("title.yobi.feedback")</a>
61	62	</li>

...	...	@@ -24,18 +24,21 @@
24	24	<ul class="gnb-usermenu">
25	25	@requestHeader.session.get("loginId") match {
26	26	case Some(loginId) => {
27		- <li class="gnb-usermenu-item">
	27	+ <li class="gnb-usermenu-item">
28	28	<a href="@routes.Application.index()" class="user-item-btn">@Messages("notification")</a>
29		- </li>
30		- <li class="gnb-usermenu-item">
	29	+ </li>
	30	+ <li class="divider"></li>
	31	+ <li class="gnb-usermenu-item">
31	32	<a href="@routes.IssueApp.userIssues()" class="user-item-btn">@Messages("issue.myIssue")</a>
32	33	</li>
	34	+ <li class="divider"></li>
33	35	@if(UserApp.currentUser.isSiteManager) {
34	36	<li class="gnb-usermenu-item">
35	37	<a href="@routes.SiteApp.userList()" data-toggle="tooltip" title="@Messages("menu.siteAdmin")" data-placement="bottom" class="usermenu-icon-button">
36	38	<i class="yobicon-wrench"></i>
37	39	</a>
38	40	</li>
	41	+ <li class="divider"></li>
39	42	}
40	43	<li class="gnb-usermenu-dropdown">
41	44	<a href="javascript:void(0);" class="gnb-dropdown-toggle" data-toggle="dropdown">
...	...	@@ -98,24 +101,24 @@
98	101	}
99	102	</ul>
100	103	</li>
101		- <li class="gnb-usermenu-dropdown">
102		- <a href="javascript:void(0);" class="gnb-dropdown-toggle dropdwon-box-btn" data-toggle="dropdown">
103		- <i class="yobicon-plus"></i>
104		- <span class="caret"></span>
105		- </a>
106		- <ul class="dropdown-menu flat right">
107		- <li>
108		- <a href="@routes.ProjectApp.newProjectForm()">
109		- @Messages("button.newProject")
110		- </a>
111		- </li>
112		- <li>
113		- <a href="@routes.OrganizationApp.newForm()">
114		- @Messages("title.newOrganization")
115		- </a>
116		- </li>
117		- </ul>
118		- </li>
	104	+ <li class="gnb-usermenu-dropdown">
	105	+ <a href="javascript:void(0);" class="gnb-dropdown-toggle dropdwon-box-btn" data-toggle="dropdown">
	106	+ <i class="yobicon-plus"></i>
	107	+ <span class="caret"></span>
	108	+ </a>
	109	+ <ul class="dropdown-menu flat right">
	110	+ <li>
	111	+ <a href="@routes.ProjectApp.newProjectForm()">
	112	+ @Messages("button.newProject")
	113	+ </a>
	114	+ </li>
	115	+ <li>
	116	+ <a href="@routes.OrganizationApp.newForm()">
	117	+ @Messages("title.newOrganization")
	118	+ </a>
	119	+ </li>
	120	+ </ul>
	121	+ </li>
119	122	}
120	123	case None => {
121	124	<li class="gnb-usermenu-item">
...	...	@@ -123,6 +126,7 @@
123	126	@Messages("title.login")
124	127	</a>
125	128	</li>
	129	+ <li class="divider"></li>
126	130	<li>
127	131	<a href="@routes.UserApp.signupForm()" class="ybtn ybtn-success">
128	132	@Messages("title.signup")

Delete comment