[gatein-commits] gatein SVN: r8161 - portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet.

Author: phuong_vu Date: 2011-11-30 02:50:18 -0500 (Wed, 30 Nov 2011) New Revision: 8161 Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css Log: GTNPORTAL-2286 A small wrong CSS 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-30 04:57:54 UTC (rev 8160) +++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2011-11-30 07:50:18 UTC (rev 8161) @@ -260,11 +260,6 @@ background-color:#ffa200; } -.UINavigationPortlet .GroupNavigation .HighlightNavigationTab > span { -<<<<<<< HEAD - background-color:#ffcf01; -} -======= +.UINavigationPortlet .GroupNavigation .HighlightNavigationTab > span { background-color:#ffcf01; -} ->>>>>>> 4765c2a... EXOGTN-427 [DOM] Admin Toolbar optimization +}