[Pkg-owncloud-commits] [owncloud-doc] 70/80: Adjustments for main nav ownCloud.org

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit 2639851b55f2536ac7f2c0386830a29339970e67
Author: Marieke van Campen <marieke at pixelsteamer.nl>
Date:   Thu Jun 19 14:37:16 2014 +0200

    Adjustments for main nav ownCloud.org
---
 _shared_assets/themes/owncloud_org/layout.html     |   9 +-
 .../themes/owncloud_org/static/styles.css          | 114 +++++++++++++++------
 2 files changed, 87 insertions(+), 36 deletions(-)

diff --git a/_shared_assets/themes/owncloud_org/layout.html b/_shared_assets/themes/owncloud_org/layout.html
index 2283539..14238ea 100644
--- a/_shared_assets/themes/owncloud_org/layout.html
+++ b/_shared_assets/themes/owncloud_org/layout.html
@@ -67,12 +67,13 @@
 
     <nav class="collapse navbar-collapse" role="navigation">
       <ul id="menu-header" class="nav navbar-nav">
-        <li class="menu-news"><a href="http://owncloud.org//news/">News</a></li>
-        <li class="menu-features"><a href="http://owncloud.org//features/">Features</a></li>
+        <li class="menu-news"><a href="http://owncloud.org/news/">News</a></li>
+        <li class="menu-features"><a href="http://owncloud.org/features/">Features</a></li>
         <li class="menu-demo"><a href="http://demo.owncloud.org">Demo</a></li>
         <li class="menu-documentation"><a href="http://doc.owncloud.org">Documentation</a></li>
-        <li class="menu-commercial"><a target="_blank" href="https://owncloud.com">Enterprise Edition <span style="font-size: 16px">&#x2197;</span></span></a></li>
-        <li class="menu-install"><a href="http://owncloud.org//install/">Install</a></li>
+        <li class="menu-contribute"><a href="http://owncloud.org/contribute/">Contribute</a>
+        <li class="menu-commercial"><a target="_blank" href="https://owncloud.com">Enterprise Edition</a></li>
+        <li class="menu-install"><a href="http://owncloud.org/install/">Install</a></li>
       </ul>
     </nav>
   </div>
diff --git a/_shared_assets/themes/owncloud_org/static/styles.css b/_shared_assets/themes/owncloud_org/static/styles.css
index a472277..9bbdf07 100644
--- a/_shared_assets/themes/owncloud_org/static/styles.css
+++ b/_shared_assets/themes/owncloud_org/static/styles.css
@@ -1,6 +1,6 @@
-/* This css file should only be used for Documentation, not replace the styles.css in owncloud.org website */
+/* This css file should only be used for Documentation. Do not replace styles.css in owncloud.org website with this file */
 
-/* -- begin specific css for documentation -- */
+/* -- Start specific css for documentation -- */
 
 ul#menu-support.menu {
   padding-left: 0;
@@ -29,7 +29,86 @@ li.next {
   float: right;
 }
 
-/*  --  End of specific css for documentation --  */
+ at media (min-width: 1200px) {
+  .banner ul#menu-header.nav>li:not(.menu-install)>a {
+	width: auto;
+	margin-bottom: 19px;
+  }
+}
+
+ at media (min-width: 992px) and (max-width: 1199px) {
+    .banner ul#menu-header.nav {
+	width: 49%;
+	padding-top: 0;
+   }
+   .banner ul#menu-header.nav>li:not(.menu-install)>a {
+	height: 1.5em;
+	margin-bottom: 10px;
+   }
+    body.install div#instructions-server div.instructions,
+    body.install div#instructions-web div.instructions,
+    body.install div#instructions-packages div.instructions {
+    margin-top: 11%;
+  }
+}
+
+ at media (min-width: 768px) and (max-width: 991px) {
+    .banner ul#menu-header.nav {
+	width: 64%;
+	padding-top: 0;
+   }
+   .banner ul#menu-header.nav>li:not(.menu-install)>a {
+	height: 1.5em;
+	margin-bottom: 10px;
+   }
+    body.install div#instructions-server div.instructions,
+    body.install div#instructions-web div.instructions,
+    body.install div#instructions-packages div.instructions {
+    margin-top: 16%;
+  }
+}
+
+ at media (min-width: 500px) and (max-width: 767px) {
+    body.install div#instructions-server div.instructions,
+    body.install div#instructions-web div.instructions,
+    body.install div#instructions-packages div.instructions {
+    margin-top: 20%;
+  }
+}
+
+ at media (max-width: 499px) {
+    body.install div#instructions-server div.instructions,
+    body.install div#instructions-web div.instructions,
+    body.install div#instructions-packages div.instructions {
+    margin-top: 32%;
+  }
+}
+
+ at media (max-width: 767px) {
+  a.brand {
+    padding-left: 15px;
+  }
+  .banner ul#menu-header.nav {
+    float: left;
+  }
+  .banner ul#menu-header.nav > li {
+      padding-top: 0px;
+  }
+  .banner ul#menu-header.nav > li.menu-install {
+      margin-top: 23px;
+      margin-bottom: 10px;
+  }
+  .banner ul#menu-header.nav > li:not(.menu-install) > a {
+      line-height: 1.5em;
+      margin-bottom: 14px;
+      padding-bottom: 0;
+  }
+  .navbar-collapse.in {
+    overflow-y: visible;
+   }
+}
+
+/*  --  End specific css for documentation --  */
 
 .navbar-header .logo {
 	width: 121px;
@@ -129,32 +208,3 @@ div.thumbnail > img {
 	padding-bottom: 6px;
 }
 
- at media (min-width: 992px) {
-  .banner ul#menu-header.nav>li:not(.menu-install)>a {
-	width: auto;
-	margin-bottom: 19px;
-  }
-}
-
- at media (min-width: 768px) and (max-width: 991px) {
-  .banner ul#menu-header.nav {
-	 width: 65%;
-	padding-top: 0;
-   }
-   .banner ul#menu-header.nav>li:not(.menu-install)>a {
-	height: 1.5em;
-	margin-bottom: 10px;
-   }
-}
-
-/*
- at media (max-width: 767px) {
-	ul {
-		float: left;
-		margin-left: 20px;
-		margin-bottom: 35px;
-	}
-	body {
-		background-color:grey;
-	}
-}*/
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git