Merge pull request #7 from plone/plip13091

Plip13091
plone · Mar 25, 2015 · 8fb6bcc · 8fb6bcc
2 parents 3f0167c + 2e3b457
commit 8fb6bcc
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 14 deletions.
diff --git a/plonetheme/barceloneta/theme/index.html b/plonetheme/barceloneta/theme/index.html
@@ -4,25 +4,19 @@
     <title>Plone Theme</title>
 
     <link rel="shortcut icon" type="image/x-icon"
-          href="./++resource++plonetheme.barceloneta-favicon.ico"/>
+          href="barceloneta-favicon.ico"/>
     <link rel="apple-touch-icon"
-          href="./++resource++plonetheme.barceloneta-apple-touch-icon.png" />
+          href="barceloneta-apple-touch-icon.png" />
     <link rel="apple-touch-icon-precomposed" sizes="144x144"
-          href="./++resource++plonetheme.barceloneta-apple-touch-icon-144x144-precomposed.png" />
+          href="barceloneta-apple-touch-icon-144x144-precomposed.png" />
     <link rel="apple-touch-icon-precomposed" sizes="114x114"
-          href="./++resource++plonetheme.barceloneta-apple-touch-icon-114x114-precomposed.png" />
+          href="barceloneta-apple-touch-icon-114x114-precomposed.png" />
     <link rel="apple-touch-icon-precomposed" sizes="72x72"
-          href="./++resource++plonetheme.barceloneta-apple-touch-icon-72x72-precomposed.png" />
+          href="barceloneta-apple-touch-icon-72x72-precomposed.png" />
     <link rel="apple-touch-icon-precomposed" sizes="57x57"
-          href="./++resource++plonetheme.barceloneta-apple-touch-icon-57x57-precomposed.png" />
+          href="barceloneta-apple-touch-icon-57x57-precomposed.png" />
     <link rel="apple-touch-icon-precomposed"
-          href="./++resource++plonetheme.barceloneta-apple-touch-icon-precomposed.png" />
-
-    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script type="text/javascript"
-            src="./++resource++plonetheme.barceloneta-legacy.js"></script>
-    <![endif]-->
+          href="barceloneta-apple-touch-icon-precomposed.png" />
 
   </head>
 

diff --git a/plonetheme/barceloneta/theme/less/barceloneta-compiled.css b/plonetheme/barceloneta/theme/less/barceloneta-compiled.css
diff --git a/plonetheme/barceloneta/theme/less/barceloneta-compiled.css.map b/plonetheme/barceloneta/theme/less/barceloneta-compiled.css.map
diff --git a/plonetheme/barceloneta/theme/less/header.plone.less b/plonetheme/barceloneta/theme/less/header.plone.less
@@ -7,6 +7,17 @@
 	#portal-logo {
 		float: left;
 	}
+	#portal-languageselector {
+		float: left;
+		clear: both;
+		display: inline-block;
+		margin-right: 29px;
+		padding-top: 5px;
+		li {
+			display: inline-block;
+			margin-right: 10px;
+		}
+	}  
 
 	//mobile search
 	#portal-searchbox {
@@ -37,6 +48,11 @@
 
 	//non mobile search
 	@media (min-width: @plone-grid-float-breakpoint) {
+		#portal-languageselector {
+			float: right;
+			clear: none;
+		}
+
 	    #portal-searchbox {
 	    	position: relative;
 	    	margin-top: 5px; //visual balance