reset themes/cakephp/layout.html & themes/cakephp/static/default.css

ekos · Mar 20, 2013 · 893d03e · 893d03e
1 parent 87344e0
commit 893d03e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 30 deletions.
diff --git a/themes/cakephp/layout.html b/themes/cakephp/layout.html
@@ -4,6 +4,7 @@
 {% endblock -%}
 
 {% block extrahead %}
+<link href="{{ pathto('_static/favicon.ico', 1) }}" type="image/x-icon" rel="icon" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 {% for lang in languages %}
@@ -106,7 +107,7 @@
 		<div class="columns three root-link">
 			<a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>
 		</div>
-		<div class="columns six">
+		<div class="columns nine">
 			<ul class="inline breadcrumb">
 			{%- for parent in parents %}
 			<li itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
@@ -120,21 +121,6 @@
 				<li><a href="http://book.cakephp.org/1.1/en">1.1 Book</a></li>
 			</ul>
 		</div>
-		<div class="columns three">
-			<ul class="languages inline">
-			{% for lang in languages %}
-				<li>
-					{%- if lang == language -%}
-					<span class="active">{{ lang }}</span>
-					{%- elif has_lang(lang, pagename) -%}
-					<a href="{{ lang_link(lang, pagename) }}">{{ lang }}</a>
-					{%- else -%}
-					<span class="disabled">{{ lang }}</span>
-					{%- endif -%}
-				</li>
-			{% endfor %}
-			</ul>
-		</div>
 	</div>
 </div>
 {% endblock -%}
@@ -187,7 +173,23 @@
 			Submit a correction on <a href="https://github.com/cakephp/docs">github</a><br />
 			<a href="http://book.cakephp.org/2.0/en/contributing/documentation.html">[ documentation on how to contribute ]</a>
 		</div>
+		<div class="languages columns three">
+			<ul class="languages inline">
+			{% for lang in languages %}
+				<li>
+					{%- if lang == language -%}
+					<span class="active">{{ lang }}</span>
+					{%- elif has_lang(lang, pagename) -%}
+					<a href="{{ lang_link(lang, pagename) }}">{{ lang }}</a>
+					{%- else -%}
+					<span class="disabled">{{ lang }}</span>
+					{%- endif -%}
+				</li>
+			{% endfor %}
+			</ul>
+		</div>
 	</div>
+
 	<div class="row">
 		<div class="columns nine offset-by-three copyright">
 			{%- if show_copyright %}

diff --git a/themes/cakephp/static/default.css b/themes/cakephp/static/default.css
@@ -60,16 +60,7 @@ body {
 	top: 0;
 	padding: 6px;
 }
-.breadcrumb-header .languages {
-	background: #417282;
-	display: block;
-	margin: 0;
-	position: absolute;
-	top: 0;
-	right: 0;
-	padding: 6px;
-}
-.versions a , .languages a {
+.versions a {
 	padding: 0 4px;
 }
 .root-link,
@@ -152,9 +143,6 @@ body {
 	.versions.inline {
 		display: none;
 	}
-	.languages.inline {
-		display: none;
-	}
 	.masthead img {
 		margin-left: 10%;
 		margin-top: 9px;
@@ -570,6 +558,10 @@ dt tt {
     float: right;
     margin-right: 10px
 }
+.languages li,
+.languages a {
+  color: #417282;
+}
 .languages .disabled {
     opacity: 0.5;
 }
@@ -597,4 +589,4 @@ dt tt {
 	.row .related-pages {
 		float: none;
 	}
-}
+}