fix issue #200 - New UI Feedback and usability

theonedev · Nov 17, 2020 · a7914f2 · a7914f2
1 parent 89c0003
commit a7914f2
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 25 deletions.
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
@@ -17,6 +17,7 @@
     --light: #F3F6F9;
     --dark: #181C32;
 	--light-dark: #D1D3E0;
+	--dark-blue: #1f3b7b;
 }
 
 html, body {
@@ -34,7 +35,7 @@ a {
 	transition: color 0.15s ease, background-color 0.15s ease, border-color 0.15s ease, box-shadow 0.15s ease;	
 }
 a, a:not([href]):not([class]) {
-	color: #1f3b7b;
+	color: var(--dark-blue);
 }
 a:hover, a:focus, a:not([href]):not([class]):hover, a:not([href]):not([class]):focus {
 	text-decoration: none;

diff --git a/...r-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/...r-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -405,7 +405,7 @@ public void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String comp
 
 			@Override
 			public String getCssClass() {
-				return "text-gray d-none d-md-table-cell";
+				return "d-none d-md-table-cell";
 			}
 
 		});

diff --git a/...-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.html b/...-core/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.html
@@ -1,9 +1,9 @@
 <wicket:panel>
 	<span class="contributor text-muted">
-		<a wicket:id="author" class="name text-muted"></a> 
+		<a wicket:id="author" class="name link-gray"></a> 
         committed 
         <wicket:enclosure child="committer">
-		with <a wicket:id="committer" class="name text-muted"></a>
+		with <a wicket:id="committer" class="name link-gray"></a>
 		</wicket:enclosure>
 		<span wicket:id="date"></span>
 	</span>

diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -61,7 +61,7 @@
 				<div wicket:id="fields" class="field"></div>
 			</div>
 			<div class="last-update flex-shrink-0 d-none d-lg-block text-muted font-size-sm">
-				<a wicket:id="user" class="text-muted"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
+				<a wicket:id="user" class="link-gray"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
 			</div>
 		</div>
 	</wicket:fragment>

diff --git a/...e/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/...e/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
@@ -49,7 +49,7 @@
 				<a wicket:id="source" title="Source"></a>
 			</div>
 			<div class="last-update ml-auto d-none d-lg-block text-muted font-size-sm">
-				<a wicket:id="user" class="text-muted"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
+				<a wicket:id="user" class="link-gray"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
 			</div>
 		</div>
 	</wicket:fragment>

diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/card/card.css b/server-core/src/main/java/io/onedev/server/web/component/user/card/card.css
@@ -7,7 +7,7 @@
 .user-card>.info {
     padding: 8px 12px 12px 80px;
 }
-.user-card img {
+.user-card img.avatar {
     position: absolute;
     width: 64px;
     height: 64px;

diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -413,7 +413,7 @@ a.disabled:not(.btn), a[disabled]:not(.btn) {
     margin-left: 0.4rem !important;
 }
 .tree-theme-human span.tree-content a {
-	color: var(--gray-dark) !important;
+	color: var(--dark-blue) !important;
 	text-decoration: none !important;
 }
 .tree-theme-human span.tree-content a:not(.selectable):hover {

diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -141,37 +141,26 @@ protected List<SidebarMenu> getSidebarMenus() {
 		List<SidebarMenuItem> menuItems = new ArrayList<>();
 
 		if (SecurityUtils.canReadCode(getProject())) {
-			List<SidebarMenuItem> codeMenuItems = new ArrayList<>();
-			codeMenuItems.add(new SidebarMenuItem.Page(null, "Files", 
+			menuItems.add(new SidebarMenuItem.Page("files", "Files", 
 					ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject())));
-			codeMenuItems.add(new SidebarMenuItem.Page(null, "Commits", 
+			menuItems.add(new SidebarMenuItem.Page("commit", "Commits", 
 					ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getProject(), null), 
 					Lists.newArrayList(CommitDetailPage.class)));
-			codeMenuItems.add(new SidebarMenuItem.Page(null, "Branches", 
+			menuItems.add(new SidebarMenuItem.Page("branch", "Branches", 
 					ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(getProject())));
-			codeMenuItems.add(new SidebarMenuItem.Page(null, "Tags", 
+			menuItems.add(new SidebarMenuItem.Page("tag", "Tags", 
 					ProjectTagsPage.class, ProjectTagsPage.paramsOf(getProject())));
-			codeMenuItems.add(new SidebarMenuItem.Page(null, "Comments", 
-					ProjectCodeCommentsPage.class, ProjectCodeCommentsPage.paramsOf(getProject(), 0)));
-			codeMenuItems.add(new SidebarMenuItem.Page(null, "Compare", 
-					RevisionComparePage.class, RevisionComparePage.paramsOf(getProject())));
-
-			menuItems.add(new SidebarMenuItem.SubMenu("code", "Code", codeMenuItems));
-
 			menuItems.add(new SidebarMenuItem.Page("pull-request", "Pull Requests", 
 					ProjectPullRequestsPage.class, ProjectPullRequestsPage.paramsOf(getProject(), 0), 
 					Lists.newArrayList(NewPullRequestPage.class, PullRequestDetailPage.class, InvalidPullRequestPage.class)));
 		}		
 		if (getProject().isIssueManagementEnabled()) {
-			List<SidebarMenuItem> issueMenuItems = new ArrayList<>();
-			issueMenuItems.add(new SidebarMenuItem.Page(null, "List", 
+			menuItems.add(new SidebarMenuItem.Page("bug", "Issues", 
 					ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(getProject(), 0), 
 					Lists.newArrayList(NewIssuePage.class, IssueDetailPage.class)));
-			issueMenuItems.add(new SidebarMenuItem.Page(null, "Boards", 
+			menuItems.add(new SidebarMenuItem.Page("split", "Boards", 
 					IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject())));
 
-			menuItems.add(new SidebarMenuItem.SubMenu("bug", "Issues", issueMenuItems));
-
 			menuItems.add(new SidebarMenuItem.Page("milestone", "Milestones", 
 					MilestoneListPage.class, MilestoneListPage.paramsOf(getProject(), false, null), 
 					Lists.newArrayList(NewMilestonePage.class, MilestoneDetailPage.class, MilestoneEditPage.class)));
@@ -182,6 +171,10 @@ protected List<SidebarMenu> getSidebarMenus() {
 				Lists.newArrayList(BuildDetailPage.class, InvalidBuildPage.class)));
 
 		if (SecurityUtils.canReadCode(getProject())) {
+			menuItems.add(new SidebarMenuItem.Page("comments", "Code Comments", 
+					ProjectCodeCommentsPage.class, ProjectCodeCommentsPage.paramsOf(getProject(), 0)));
+			menuItems.add(new SidebarMenuItem.Page("diff", "Code Compare", 
+					RevisionComparePage.class, RevisionComparePage.paramsOf(getProject())));
 			List<SidebarMenuItem> statsMenuItems = new ArrayList<>();
 			statsMenuItems.add(new SidebarMenuItem.Page(null, "Contributions", 
 					ProjectContribsPage.class, ProjectContribsPage.paramsOf(getProject())));