#1 improve country indicator

sizing/overflow
Hack23 · Mar 22, 2018 · af2376f · af2376f
1 parent a04aa5e
commit af2376f
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 7 deletions.
diff --git a/...cia/web/impl/ui/application/views/common/menufactory/impl/CountryMenuItemFactoryImpl.java b/...cia/web/impl/ui/application/views/common/menufactory/impl/CountryMenuItemFactoryImpl.java
@@ -128,7 +128,7 @@ public void createCountryTopicMenu(final MenuItem charts) {
 	 */
 	private static void addSourcesAndIndicatorsToMenu(final MenuItem countryIndicators,
 			final Map<String, List<ViewWorldbankIndicatorDataCountrySummary>> sourceIndicatorMap) {
-
+		
 		final Map<String, List<ViewWorldbankIndicatorDataCountrySummary>> sortedIndicatorMap = sourceIndicatorMap
 				.entrySet().stream().sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey()))
 				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
@@ -137,15 +137,16 @@ private static void addSourcesAndIndicatorsToMenu(final MenuItem countryIndicato
 				.entrySet()) {
 
 			final MenuItem sourceItems = countryIndicators.addItem(entry.getKey(), null, null);
-
+			
 			final List<ViewWorldbankIndicatorDataCountrySummary> sortedEntries = entry.getValue().stream()
 					.sorted((e1, e2) -> e1.getIndicatorName().compareTo(e2.getIndicatorName()))
 					.collect(Collectors.toList());
 
 			for (final ViewWorldbankIndicatorDataCountrySummary indciatorSummary : sortedEntries) {
-				sourceItems.addItem(indciatorSummary.getIndicatorName(),
+				MenuItem addItem = sourceItems.addItem(indciatorSummary.getIndicatorName(),
 						new PageModeMenuCommand(UserViews.COUNTRY_RANKING_VIEW_NAME, PageMode.INDICATORS,
 								indciatorSummary.getEmbeddedId().getIndicatorId()));
+				addItem.setStyleName("RestrictedHeader");
 			}
 		}
 

diff --git a/citizen-intelligence-agency/src/main/webapp/VAADIN/themes/cia/cia.scss b/citizen-intelligence-agency/src/main/webapp/VAADIN/themes/cia/cia.scss
@@ -175,11 +175,35 @@
 	}
 
 	.v-menubar-submenu-Header {
-	 font-size: 14px;
+	 font-size: 12px;
 	}
 
 	.v-menubar-selected-Header {
-	 font-size: 14px;
+	 font-size: 12px;
+	}
+
+	.v-menubar-menuitem-RestrictedHeader {
+	 font-size: 12px;
+     width:320px;
+     overflow: auto;
 	}
 
+	.v-menubar-menuitem-caption-RestrictedHeader {
+	 font-size: 12px;
+	 width:320px;
+	 overflow: auto;
+	}
+
+	.v-menubar-submenu-RestrictedHeader {
+	 font-size: 12px;
+	 width:320px;
+	 overflow: auto;
+	}
+
+	.v-menubar-selected-RestrictedHeader {
+	 font-size: 12px;
+	 width:320px;
+	 overflow: auto;
+	}
+
 }
diff --git a/citizen-intelligence-agency/src/main/webapp/VAADIN/themes/cia/styles.css b/citizen-intelligence-agency/src/main/webapp/VAADIN/themes/cia/styles.css
@@ -17659,11 +17659,35 @@ div.v-layout.v-horizontal.v-widget {
 }
 
 .cia .v-menubar-submenu-Header {
-	font-size: 14px;
+	font-size: 12px;
 }
 
 .cia .v-menubar-selected-Header {
-	font-size: 14px;
+	font-size: 12px;
+}
+
+.cia .v-menubar-menuitem-RestrictedHeader {
+	font-size: 12px;
+	width: 320px;
+	overflow: auto;
+}
+
+.cia .v-menubar-menuitem-caption-RestrictedHeader {
+	font-size: 12px;
+	width: 320px;
+	overflow: auto;
+}
+
+.cia .v-menubar-submenu-RestrictedHeader {
+	font-size: 12px;
+	width: 320px;
+	overflow: auto;
+}
+
+.cia .v-menubar-selected-RestrictedHeader {
+	font-size: 12px;
+	width: 320px;
+	overflow: auto;
 }
 
 @media screen and (min-resolution: 2dppx) {