theme

themes/cis-theme/src/css/_custom.scss

@@ -1371,7 +1371,216 @@ body.oldDesign{
 
 
 
+/* main */
 
+.flag-menu ul li img{
+    margin-right: 10px;
+}
+.flag-menu .portlet-body ul li a {
+    color : #333333;
+    font-size: 14px;
+    padding: 0 15px 15px 0;
+}
+
+.flag-menu .portlet-body ul li a:hover {
+    background-color: #fff;
+    color: #004376;
+}
+
+
+.gallerydivScroll{
+            height: 251px;
+            overflow: auto;
+            overflow-x: hidden;
+            margin-right: 10px;
+            margin-bottom: 15px;
+  }
+.modal {
+  	text-align: center;
+  	padding: 0!important;
+}
+
+.gallerydivScroll .gallery-item {
+    padding-right: 10px;
+    width: 100%;
+}
+.gallerydivScroll .gallery-item .description {
+    margin: 15px 0;
+    text-align: left;
+}
+
+.key-international-projects {
+	padding: 0 15px 15px 0;
+	text-align: center;
+}
+
+.key-international-projects .img-space{
+  margin: 0 5px;
+}
+
+
+.current-projects img {
+    margin-right: 5px;
+    max-width: 41px !important;
+    width: 41px;
+    height: 41px;
+}
+
+.current-projects {
+    height: 440px;
+    overflow: auto;
+    overflow-x: hidden;
+    margin-right: 10px;
+    margin-bottom: 15px;
+}
+
+.current-projects .col-sm-6 {
+    margin-bottom: 15px;
+}
+
+.home-news section .portlet-content .portlet-body {
+    padding: 0;
+}
+
+.home-news .rating-label{
+		display:none;
+	}
+.home-news .taglib-ratings{
+		display:inline;
+	}
+.home-news section .portlet-content .portlet-body {
+    padding: 0;
+}
+
+.home-news ul.news_list li hr {
+    margin: 15px 0;
+}
+.home-news ul.news_list li div, .home-news ul.news_list li a {padding: 0 15px;display: block;}
+
+.home-news ul.news_list + p .btn-link {
+    border: 1px solid #004376;
+    border-radius: 3px;
+}
+.home-news ul.news_list + p {
+    padding: 10px 15px 10px 15px;
+}
+
+.home-news ul.news_list li div.date {
+    margin-bottom: 5px;
+}
+
+.home-news ul.news_list li:last-child hr {
+    display: none;
+}
+
+.useful-links-scroll {
+    height: 350px;
+    overflow: auto;
+    overflow-x: hidden;
+    margin-right: 10px;
+    margin-bottom: 15px;
+}
+
+.useful-links-scroll .taglib-vertical-card {
+    margin-right: 10px;
+}
+.useful-links-scroll .taglib-vertical-card .cis-text-color {
+	margin-bottom: 10px
+}
+
+/* width */
+::-webkit-scrollbar {
+    width: 6px;
+}
+
+/* Track */
+::-webkit-scrollbar-track {
+    background: #f1f1f1; 
+}
+ 
+/* Handle */
+::-webkit-scrollbar-thumb {
+    background: #888; 
+}
+
+/* Handle on hover */
+::-webkit-scrollbar-thumb:hover {
+    background: #555; 
+}
+
+.current-projects a {
+    display: table;
+    min-height: 50px;
+}
+
+.current-projects div {
+    display: table-cell;
+    vertical-align: middle;
+}
+
+.oecd-header {
+    background-color: #FFF;
+    color: #1f5182;
+}
+.logo-header-right a {
+    color: #1f5182;
+}
+
+.oecd-search .form-control {
+    border: 1px solid #1f5182;
+    color: #1f5182;
+}
+
+.logo-header-right .oecd-search a {
+    color: #fff;
+}
+
+.oecd-search .lfr-ddm-field-group {
+    background-color: #1f5182;
+    margin-left: 10px;
+}
+
+.icon-monospaced {
+    height: 34px;
+    line-height: 34px;
+}
+
+.oecd-navbar .nav > li > a {
+    padding: 13px 20px;
+}
+
+.navbar-nav > li > .dropdown-menu {
+    margin-top: 53px;
+}
+
+
+.dropdown-menu li a {
+	padding: 0;
+}
+.oecd-menu-bottom-wrapper li {
+    white-space: normal;
+}
+
+.oecd-main-nav .dropdown-menu ul.grandchild-menu {
+    margin: 0;
+    padding: 0;
+    position: relative;
+}
+
+.oecd-main-nav .dropdown-menu li > a {
+    text-decoration: none;
+    font-size: 14px;
+    color: #666;
+    font-weight: bold;
+}
+
+.oecd-main-nav .dropdown-menu ul.grandchild-menu li {
+    padding: 5px 0;
+}
+
+.oecd-main-nav .dropdown-menu ul.grandchild-menu li a {
+    font-weight: normal;
+}
 
 
 

themes/cis-theme/src/templates/navigation.ftl

@@ -28,7 +28,7 @@
 					/>
 				</#if>
 
-				<li ${nav_item_attr_selected} class="${nav_item_css_class} col-sm-2" id="layout_${nav_item.getLayoutId()}" role="presentation">
+				<li ${nav_item_attr_selected} class="${nav_item_css_class}" id="layout_${nav_item.getLayoutId()}" role="presentation">
 					<a aria-labelledby="layout_${nav_item.getLayoutId()}" ${nav_item_attr_has_popup} ${nav_item_attr_dropdown} href="${nav_item.getURL()}" ${nav_item.getTarget()} role="${nav_item_role}"><span><@liferay_theme["layout-icon"] layout=nav_item_layout /> ${nav_item.getName()}</span>
 						<#if nav_item.hasChildren()>
 							<i class="glyphicon glyphicon-menu-down icon-before"></i>
@@ -51,9 +51,44 @@
 								/>
 							</#if>
 							
+							<#if nav_child.getName()=="SignIn">
+								<#if is_signed_in>
+									<li class="${nav_child_css_class}">
+										<a href="${sign_out_url}" id="sign-out" rel="nofollow" class="oecd-header__current-page">${sign_out_text}</a>
+									</li>
+								<#else>
+								<li class="${nav_child_css_class}">
+									<a href="${sign_in_url}" id="sign-in" rel="nofollow" class="oecd-header__current-page">${sign_in_text}</a>
+								</li>
+								</#if>
+							<#else>
+
 							<li ${nav_child_attr_selected} class="${nav_child_css_class}" id="layout_${nav_child.getLayoutId()}" role="presentation">
 								<a aria-labelledby="layout_${nav_child.getLayoutId()}" href="${nav_child.getURL()}" ${nav_child.getTarget()} role="menuitem">${nav_child.getName()}</a>
+								
+									<#if nav_child.hasChildren()>
+										<ul class="grandchild-menu" role="menu">
+											<div>
+												<#list nav_child.getChildren() as nav_grandchild>
+													<#assign
+														nav_grandchild_attr_selected = ""
+														nav_grandchild_css_class = ""
+													/>
+													<#if nav_grandchild.isSelected()>
+														<#assign
+															nav_grandchild_attr_selected = "aria-selected='true'"
+															nav_grandchild_css_class = "selected"
+														/>
+													</#if>
+													<li ${nav_grandchild_attr_selected} class="${nav_grandchild_css_class}" id="layout_${nav_grandchild.getLayoutId()}" role="presentation">
+														<a aria-labelledby="layout_${nav_grandchild.getLayoutId()}" href="${nav_grandchild.getURL()}" ${nav_grandchild.getTarget()} role="menuitem">${nav_grandchild.getName()}</a>
+													</li>
+												</#list>
+											</div>
+										</ul>
+									</#if>
 							</li>
+						 </#if>
 						</#list>
 						</div>
 					</ul>

themes/cis-theme/src/templates/portal_normal.ftl

@@ -61,15 +61,6 @@
 	<div id="banner" role="banner">
 		<div id="heading">
 			<div class="oecd-menu oecd-menu--bg-dark-blue">
-				<div class="oecd-menu-top-wrapper">
-					<div class="container">
-						<div class="oecd-menu-top hidden-xs">
-							<ul class="oecd-header__primary" tabindex="0">
-								<#include "${full_templates_path}/topmenu.ftl" />
-							</ul>
-						</div>
-					</div>
-				</div>
 
 			<#assign show_breadcrumps = true />
 			<#if has_navigation && is_setup_complete>