From be80de0631f526869de90236e9e30f49cee63be6 Mon Sep 17 00:00:00 2001
From: Alex Eng <loones1595@gmail.com>
Date: Mon, 5 Nov 2012 10:04:38 +1000
Subject: [PATCH] Reduce top menu bar:
 https://bugzilla.redhat.com/show_bug.cgi?id=873019

---
 .../zanata/webtrans/client/view/AppView.ui.xml |  8 ++++----
 .../client/view/DocumentListView.ui.xml        | 17 ++++++++---------
 .../client/view/TransFilterView.ui.xml         |  4 ++--
 .../client/view/TransUnitNavigationView.ui.xml |  8 ++++----
 .../client/view/TranslationEditorView.ui.xml   |  8 ++++----
 zanata-war/src/main/webapp/stylesheet/menu.css | 18 +++++++++---------
 6 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
index 9ed84a4d60..2dbb69698e 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
@@ -122,7 +122,7 @@
 		
 	</ui:style>
 	<g:LayoutPanel stylePrimaryName="{style.rootContainer}" ui:field="rootContainer">
-		<g:layer top="0px" height="30px">
+		<g:layer top="0px" height="25px">
 			<g:LayoutPanel styleName="subHeader">
 				<g:layer left="25px" right="25px">
 					<g:HorizontalPanel width="100%" height="100%" verticalAlignment="ALIGN_MIDDLE" styleName="{style.fixedLayout}">
@@ -153,11 +153,11 @@
 		
 		<g:layer top="25px" bottom="0px" left='0px' right='0px' >
 				<g:LayoutPanel ui:field="contentContainer">
-					<g:layer top="5px" bottom="3px" left="25px" right="25px">
+					<g:layer top="0px" bottom="3px" left="25px" right="25px">
 						<g:TabLayoutPanel ui:field="content" barHeight="0" barUnit='PX' />
 					</g:layer>
 					
-					<g:layer left="0" width="24px" top="5px" height="82px">
+					<g:layer left="0" width="24px" top="0px" height="82px">
 						<g:HTMLPanel>
 							<g:Label styleName="icon-list {style.viewMenuTab}" ui:field="documentListTab"/>
 							<g:Label styleName="icon-edit {style.viewMenuTab}" ui:field="editorTab"/>
@@ -168,7 +168,7 @@
 				
 		</g:layer>
 		
-		<g:layer right="0" width="24px" top="30px" bottom="10px">
+		<g:layer right="0" width="24px" top="25px" bottom="10px">
 			<g:LayoutPanel ui:field="sideMenuContainer"/>
 		</g:layer>
 		
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
index 61794aa5a5..2efaf98376 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
@@ -24,18 +24,17 @@
 		.statsOption
 		{
 			display:inline-block;
-			width:120px;
 			text-align:left;
 		}
 		
 		.filterTextBox
 		{
-			font-size:18px;
+			font-size:16px;
 			margin: 0px;
 			border: 2px solid #C5C5C5;
 			border-radius: 3px;
 			width:415px;
-			line-height:25px;
+			line-height:18px;
 			padding-left:25px;
 		}
 		
@@ -56,19 +55,19 @@
 		
 		.searchIcon
 		{
-			font-size:22px;
+			font-size:20px;
 		}
         
     </ui:style>
     <g:LayoutPanel>
         <g:layer top="0px" bottom="0px">
             <g:LayoutPanel styleName="{style.mainPanel}">
-                <g:layer top='0' height='40px' left="0px" right="0px">
+                <g:layer top='0' height='32px' left="0px" right="0px">
                 	<g:HorizontalPanel styleName="{style.topBar}" verticalAlignment="ALIGN_MIDDLE">
                 		<g:cell width="420px">
                 			<g:TextBox ui:field='filterTextBox' addStyleNames="{style.filterTextBox}"/>
                 		</g:cell>
-                		<g:cell>
+                		<g:cell width="210px">
                 			<g:HTMLPanel>
                 				<g:CheckBox ui:field="caseSensitiveCheckBox" styleName="{style.optionStyle}"><ui:msg>Case sensitive</ui:msg></g:CheckBox>
                 				<g:CheckBox ui:field="exactSearchCheckBox" styleName="{style.optionStyle}"><ui:msg>Exact match</ui:msg></g:CheckBox>
@@ -77,16 +76,16 @@
                 		<g:cell horizontalAlignment="ALIGN_RIGHT">
                 			<g:HTMLPanel>
                         		<g:InlineLabel styleName="{style.optionStyle}"><ui:msg>Statistic: </ui:msg></g:InlineLabel>
-                        		<g:RadioButton ui:field="statsByWord" styleName="{style.optionStyle} {style.statsOption}" name="statsOption"/><br/>
+                        		<g:RadioButton ui:field="statsByWord" styleName="{style.optionStyle} {style.statsOption}" name="statsOption"/>
                         		<g:RadioButton ui:field="statsByMsg" styleName="{style.optionStyle} {style.statsOption}" name="statsOption"/>
                         	</g:HTMLPanel>
                 		</g:cell>
                 	</g:HorizontalPanel>
                 </g:layer>
-                 <g:layer top='8px' height='24px' left="13px" width="24px">
+                 <g:layer top='5px' height='24px' left="13px" width="24px">
             	 	<g:InlineLabel styleName="icon-search {style.searchIcon}"/>
             	 </g:layer>
-                <g:layer top='40px' bottom="0px">
+                <g:layer top='32px' bottom="0px">
                 	<g:ScrollPanel styleName="{style.listContainer}">
                 		<g:VerticalPanel width="100%">
 	                		<g:FlowPanel ui:field="documentListContainer"/>
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
index 2a28fe90a5..4fdaac9f98 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
@@ -5,11 +5,11 @@
 	<ui:style type="org.zanata.webtrans.client.view.TransFilterView.Styles">
 		.transFilterTextBox {
 			margin: 0px;
-			font-size: 18px;
+			font-size: 16px;
 			border: 2px solid #C5C5C5;
 			border-radius: 3px;
 			width:415px;
-			line-height:25px;
+			line-height:18px;
 			padding-left:25px;
 		}
 		
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
index ef22d63ae5..a234c42086 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
@@ -5,8 +5,8 @@
 	<ui:style>
             
         .nav-button {
-	       width:40px;
-	       height:16px;
+	       width:36px;
+	       height:12px;
 	       border-radius:2px; 
 	       margin-right:3px;
 	       border-style:solid;
@@ -14,8 +14,8 @@
         }
         
         .nav-button img {
-	       margin-top:3px;
-	       margin-left:4px;
+	       margin-top:1px;
+	       margin-left:3px;
         }
         
        
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
index 47f0ff9fc2..7617693a0c 100644
--- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
+++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
@@ -50,13 +50,13 @@
 		
 		.searchIcon
 		{
-			font-size:22px;
+			font-size:20px;
 		}
 		
 	</ui:style>
 	
 			<g:LayoutPanel>
-				<g:layer top="0" height="40px">
+				<g:layer top="0" height="32px">
 					<g:HorizontalPanel styleName="{style.topBar}" verticalAlignment="ALIGN_MIDDLE">
 						<g:cell width="450px">
 							<g:HTMLPanel ui:field="filterPanelContainer"/>		
@@ -69,11 +69,11 @@
 						</g:cell>
 					</g:HorizontalPanel>
 				</g:layer>
-	            <g:layer top='8px' height='24px' left="13px" width="24px">
+	            <g:layer top='5px' height='24px' left="13px" width="24px">
             	 	<g:InlineLabel styleName="icon-search {style.searchIcon}"/>
             	 </g:layer>
 	           
-				<g:layer top="40px" bottom="2em">
+				<g:layer top="32px" bottom="2em">
 					<g:LayoutPanel ui:field="editor" styleName="{style.editor}"/>
 				</g:layer>
 				<g:layer bottom="0px" height="2em" left="0" right="16px">
diff --git a/zanata-war/src/main/webapp/stylesheet/menu.css b/zanata-war/src/main/webapp/stylesheet/menu.css
index 3fe47eefc2..08584e4862 100644
--- a/zanata-war/src/main/webapp/stylesheet/menu.css
+++ b/zanata-war/src/main/webapp/stylesheet/menu.css
@@ -3,7 +3,7 @@
 	position:absolute;
 	left:0;
 	right:0;
-	top:45px;
+	top:37px;
 	bottom:0;
 }
 
@@ -24,7 +24,7 @@
 .header {
 	width: 100%;
 	min-width:960px;
-	height: 44px;
+	height: 36px;
 	margin: 0;
 	background: -webkit-linear-gradient(top, #F1F1F1 0%, #D3D3D3 100%);
 	background: -moz-linear-gradient(top, #F1F1F1 0%, #D3D3D3 100%);
@@ -73,15 +73,15 @@
 
 .navBar ul li a {
 	display: block;
-	height: 44px;
-	line-height: 44px;
-	font-size: 14px;
+	height: 36px;
+	line-height: 36px;
+	font-size: 13px;
 	color: #595959;
 	font-family: helvetica;
 	font-weight: bold;
 	text-decoration: none;
 	outline: none;
-	width: 130px;
+	width: 120px;
 	margin: 0 auto;
 }
 
@@ -114,7 +114,7 @@
 }
 
 #logoCol img {
-	padding-top: 8px;
+	padding-top: 5px;
 }
 
 
@@ -152,7 +152,7 @@
 
 #userCol div.submenu
 {
-	margin-left:-20px;
+	margin-left:-30px;
 }
 
 
@@ -229,7 +229,7 @@ div.submenu ul li a {
 	color: #454545;
 	font-size: 13px;
 	text-shadow: none;
-	line-height: 44px;
+	line-height: 36px;
 	text-align: left;
 	margin-left: 5px;
 	margin-right: 5px;