Author: theute Date: 2011-11-22 03:04:03 -0500 (Tue, 22 Nov 2011) New Revision: 8114 Modified: portal/trunk/pom.xml portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css Log: GTNPORTAL-2281: Can't maximize gadgets Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2011-11-22 07:21:59 UTC (rev 8113) +++ portal/trunk/pom.xml 2011-11-22 08:04:03 UTC (rev 8114) @@ -41,7 +41,7 @@ <org.exoplatform.core.version>2.4.2-GA</org.exoplatform.core.version> <org.exoplatform.ws.version>2.2.2-GA</org.exoplatform.ws.version> <org.exoplatform.jcr.version>1.14.2-GA</org.exoplatform.jcr.version> - <org.shindig.version>2.0.2</org.shindig.version> + <org.shindig.version>2.0.2-CR01</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> <org.gatein.common.version>2.0.4-GA</org.gatein.common.version> <org.gatein.wci.version>2.1.0-GA</org.gatein.wci.version> Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css =================================================================== --- portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2011-11-22 07:21:59 UTC (rev 8113) +++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2011-11-22 08:04:03 UTC (rev 8114) @@ -199,8 +199,8 @@ .UINavigationPortlet .MenuItemContainer .ItemIcon { height: 24px; width: auto; - background-position: right;/* orientation=rt */ -} + background-position: right;/* orientation=rt */ +} /*============ Scroll Buttons =====================*/ @@ -261,10 +261,10 @@ } .UINavigationPortlet .GroupNavigation .HighlightNavigationTab > span { -<<<<<<< HEAD - background-color:#ffcf01; -} -======= +<<<<<<< HEAD background-color:#ffcf01; } ->>>>>>> 4765c2a... EXOGTN-427 [DOM] Admin Toolbar optimization +======= + background-color:#ffcf01; +} +>>>>>>> 4765c2a... EXOGTN-427 [DOM] Admin Toolbar optimization