Commit 5b7ca1c3 authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Merge branch 'menu_structure' into 'master'

Change the menu structure

Changes the menu structure based on #10

Things left to do:

1. Find a way to fix the footer, requires more time
parents 9d13f540 d240ca91
<div id="footer">
<div class="container">
<div class="row">
<div class="span4">
<div class="span3">
<h3>Products</h3>
<ul class="animated">
<li><a href="/gitlab-ce/">Community Edition</a></li>
<li><a href="/features/">Enterprise Edition</a></li>
<li><a href="/gitlab-ci/">GitLab CI</a></li>
</ul>
</div>
<div class="span3">
<h3>Services</h3>
<ul class="animated">
<li><a href="/subscription/">Subscription</a></li>
<li><a href="/consultancy/">Consultancy</a></li>
<li><a href="/training/">Training</a></li>
<li><a href="/cloud/">Cloud</a></li>
</ul>
</div>
<div class="span3">
<h3>Company</h3>
<ul class="animated">
<li><a href="/blog/">Blog</a></li>
<li><a href="/about/">About Us</a></li>
<li><a href="/jobs/">Jobs</a></li>
<li><a href="/privacy/">Privacy Policy</a></li>
<li><a href="/terms/">Terms</a></li>
<li><a href="/press/">Press</a></li>
<li><a href="/dmca/">DMCA Policy</a></li>
<li><a href="/disclosure/">Responsible Disclosure Policy</a></li>
</ul>
<li><a href="/contact/">Contact Us</a></li>
</ul>
</div>
<div class="span4">
<h3>Contact</h3>
<ul class="animated">
<div class="footer_text"><li><a href="mailto:support@gitlab.com">Email support@gitlab.com</a></li>
<li><a href="https://twitter.com/gitlabhq">Twitter @gitlabhq</a></li>
<li>&nbsp;</li>
<li>GitLab.com<br />Attn. Sytse Sijbrandij<br />Ondiep 108<br />3552EK Utrecht<br />The Netherlands</li></div>
</ul>
</div>
<div class="span4">
<div class="span3">
<h3>Subscribe</h3>
<p>Subscribe to our newsletter and stay up to date with the latest news</p>
<p>Subscribe to our newsletter and stay up to date with the latest news</p>
<!-- Begin MailChimp Signup Form -->
<div id="mc_embed_signup">
......@@ -41,9 +47,9 @@
</div> <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="btn btn-primary"></div>
</form>
</div>
<!--End mc_embed_signup-->
<!--End mc_embed_signup-->
</div>
</div>
</div>
</div>
</div>
</div>
</div>
......@@ -22,3 +22,16 @@ var google_remarketing_only = true;
<img height="1" width="1" style="border-style:none;" alt="" src="//googleads.g.doubleclick.net/pagead/viewthroughconversion/999150614/?value=0&amp;label=a-CXCPqluQUQlqi33AM&amp;guid=ON&amp;script=0"/>
</div>
</noscript>
<script type="text/javascript">
$(document).ready(function() {
var docHeight = $(window).height();
var footerHeight = $('#footer').height();
var footerTop = $('#footer').position().top + footerHeight;
if (footerTop < docHeight) {
$('#footer').css('margin-top', (docHeight - footerTop) -59 + 'px');
}
});
</script>
......@@ -56,10 +56,9 @@
{% endif %}
<div class="nav-collapse collapse">
<ul class="nav pull-right animated">
<li><a href="/">Home</a></li>
<li><a href="/subscription/">Subscription</a></li>
<li><a href="/consultancy/">Consultancy</a></li>
<li><a href="/cloud/">Cloud</a></li>
<li><a href="/products">Products</a></li>
<li><a href="/services">Services</a></li>
<li><a href="/company">Company</a></li>
<li><a href="https://gitlab.com/users/sign_in">Sign in</a></li>
</ul>
</div>
......
---
layout: default
title: Company
---
<div id="content" class="txt-middle">
<div class="container">
<div class="row">
<div class="span4">
<a href="/blog"><h2>Blog</h2></a>
<p></p>
</div>
<div class="span4">
<a href="/about"><h2>About Us</h2></a>
<p></p>
</div>
<div class="span4">
<a href="/jobs"><h2>Jobs</h2></a>
<p></p>
</div>
<div class="span4">
<a href="/press"><h2>Press</h2></a>
<p></p>
</div> <div class="span4">
<a href="/terms"><h2>Terms</h2></a>
<p></p>
</div>
<div class="span4">
<a href="/contact"><h2>Contact Us</h2></a>
<p></p>
</div>
</div>
</div>
</div>
---
layout: default
title: Contact
---
<div id="content" class="txt-middle">
<div class="container">
<ul class="animated" style="list-style:none">
<div class="footer_text"><li>Contact us at <a href="mailto:support@gitlab.com"> support@gitlab.com</a></li>
<li> Follow us on <a href="https://twitter.com/gitlabhq">Twitter @gitlabhq</a></li>
<li>&nbsp;</li>
<li>GitLab.com<br />Attn. Sytse Sijbrandij<br />Ondiep 108<br />3552EK Utrecht<br />The Netherlands</li></div>
</ul>
</div>
</div>
......@@ -408,29 +408,29 @@ ul.plans {
/* Footer
-------------------------------------------------- */
#footer {
padding: 20px 0;
border-top: 1px solid rgba(0, 0, 0, 0.1);
padding: 20px 0;
border-top: 1px solid rgba(0, 0, 0, 0.1);
}
#footer h3 {
margin-bottom: 5px;
text-transform: uppercase;
margin-bottom: 5px;
text-transform: uppercase;
}
#footer ul {
list-style: none outside none;
margin: 0;
list-style: none outside none;
margin: 0;
}
#footer li {
padding: 0 0 5px;
padding: 0 0 5px;
}
#footer a {
display: inline-block;
display: inline-block;
}
#footer a:hover {
-webkit-animation-name: slide;
-moz-animation-name: slide;
-o-animation-name: slide;
animation-name: slide;
text-decoration: underline;
-webkit-animation-name: slide;
-moz-animation-name: slide;
-o-animation-name: slide;
animation-name: slide;
text-decoration: underline;
}
.footer_text {
font-family: "Open Sans","Helvetica Neue","Helvetica",Arial,Verdana,sans-serif;
......
---
layout: default
title: GitLab Community Edition
---
<div id="content">
<div class="container txt-lefty">
<div class="row-fluid">
<div class="row">
<div class="span12 hero-unit">
<a href="/gitlab-ce"><h2>Community Edition</h2></a>
<p>GitLab is open source software to collaborate on code.
</br>
Create projects and repositories, manage access and do code reviews.
<div class="button-holder">
<a class="btn btn-large btn-success" href="https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md"> Source code</a>
</div><!-- button-holder -->
</div> <!-- span 12 -->
</div><!-- row -->
<div class="row">
<div class="span12">
<div class="entry">
<h3 id='gitlab_allows_you_to'>GitLab allows you to</h3>
<ul>
<li>keep your code secure on your own server</li>
<li>manage repositories, users and access permissions</li>
<li>communicate through issues, line-comments and wiki pages</li>
<li>perform code review with merge requests</li>
</ul>
<h3 id='gitlab_is'>GitLab is</h3>
<ul>
<li>powered by Ruby on Rails</li>
<li>completely free and open source (MIT license)</li>
<li>used by more than 50.000 organizations to keep their code secure</li>
</ul>
<h3 id='requirements'>Requirements</h3>
<ul>
<li>Ubuntu/Debian</li>
<li>ruby 1.9.3+</li>
<li>git 1.7.10+</li>
<li>redis 2.0+</li>
<li>MySQL or PostgreSQL</li>
</ul>
<p>** More details are in the <a href='https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/requirements.md'>requirements doc</a></p>
<h3 id='installation'>Installation</h3>
<p>Installation options are in the <a href='https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md#installation'>readme</a>.</p>
<h3 id='new_versions_and_upgrading'>New versions and upgrading</h3>
<p>Since 2011 GitLab is released on the 22nd of every month. More information can be found in the <a href='https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md#new-versions-and-upgrading'>readme</a>.</p>
<h3 id='more_information'>More information</h3>
<p>The <a href='https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md'>readme</a> contains information about a lot of subjects including interfaces and getting help.</p>
<hr>
<div class='row-fluid screenshots'>
<ul class='nav nav-tabs' id='myTab'>
<li class='active'>
<a href='#home' data-toggle="tab">Dashboard</a>
</li>
<li>
<a href='#s2' data-toggle="tab">Project page</a>
</li>
<li>
<a href='#s3' data-toggle="tab">Commit page</a>
</li>
<li>
<a href='#s4' data-toggle="tab">Browse repository</a>
</li>
<li>
<a href='#s5' data-toggle="tab">Submit Merge Request</a>
</li>
<li>
<a href='#s6' data-toggle="tab">Manage Issues</a>
</li>
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='home'>
<div class='thumbnail'>
<a href='/images/screens/gitlab_dash.png'>
<img src='/images/screens/gitlab_dash.png'>
<div class='caption'>
<p>Application dashboard</p>
</div>
</a>
</div>
</div>
<div class='tab-pane' id='s2'>
<div class='thumbnail'>
<a href='/images/screens/gitlab_project.png'>
<img src='/images/screens/gitlab_project.png'>
<div class='caption'>
<p>Project dashboard</p>
</div>
</a>
</div>
</div>
<div class='tab-pane' id='s3'>
<div class='thumbnail'>
<a href='/images/screens/diff.png'>
<img src='/images/screens/diff.png'>
<div class='caption'>
<p>Commit page with diff</p>
</div>
</a>
</div>
</div>
<div class='tab-pane' id='s4'>
<div class='thumbnail'>
<a href='/images/screens/gitlab_project_tree.png'>
<img src='/images/screens/gitlab_project_tree.png'>
<div class='caption'>
<p>Browse repository</p>
</div>
</a>
</div>
</div>
<div class='tab-pane' id='s5'>
<div class='thumbnail'>
<a href='/images/screens/gitlab_project_mr.png'>
<img src='/images/screens/gitlab_project_mr.png'>
<div class='caption'>
<p>Review code with Merge Requests</p>
</div>
</a>
</div>
</div>
<div class='tab-pane' id='s6'>
<div class='thumbnail'>
<a href='/images/screens/dash_issues.png'>
<img src='/images/screens/dash_issues.png'>
<div class='caption'>
<p>Manage issues</p>
</div>
</a>
</div>
</div>
</div>
</div> <!-- row-fluid screenshots -->
</div><!-- entry -->
</div><!-- span 12 -->
</div><!-- row -->
</div><!-- row-fluid -->
</div><!-- container -->
</div><!-- content -->
---
layout: default
title: GitLab CI
---
<div id="content">
<div class="container txt-lefty">
<div class="row-fluid">
<div class="row">
<div class="span12 hero-unit">
<a href="/gitlab-ci"><h2>GitLab Continuous Integration Server</h2></a>
<p>GitLab CI integrates with your GitLab installation and run tests for your projects..
</br>
Login with GitLab account, add project with one click and enjoy running tests.
<div class="button-holder">
<a class="btn btn-large btn-success" href="https://gitlab.com/gitlab-org/gitlab-ci/blob/master/README.md"> Source code</a>
</div><!-- button-holder -->
</div> <!-- span 12 -->
</div><!-- row -->
<div class="row">
<div class="span12">
<div class="entry">
<h3 id='about'>About</h3>
<p>For more information see: <a href='http://blog.gitlab.org/announcing-gitlab-ci-3.0/'>Announcing GitLab CI 3.0</a> and <a href='http://blog.gitlab.org/integrating-gitlab-ci-with-gitlab/'>Integrating GitLab CI With GitLab to Enable Distributed Builds</a></p>
<h3 id='requirements'>Requirements</h3>
<p>GitLab CI is designed for the Linux operating system.</p>
<p>GitLab CI officially supports (recent versions of) these Linux distributions:</p>
<ul>
<li>Ubuntu Linux</li>
<li>Debian/GNU Linux</li>
</ul>
<p>Additionally GitLab CI requires:</p>
<ul>
<li>ruby 1.9.3+</li>
<li>MySQL or PostgreSQL</li>
</ul>
<h3 id='installation'>Installation</h3>
<ul>
<li><a href='https://gitlab.com/gitlab-org/gitlab-ci/blob/master/doc/install/installation.md'>Installation and setup guide</a></li>
</ul>
<h3 id='getting_help'>Getting help</h3>
<ul>
<li><a href='http://feedback.gitlab.com/forums/176466-general/category/64310-gitlab-ci'>Feedback and suggestions forum</a> is the place to propose and discuss new features for GitLab CI.</li>
</ul>
<hr />
<p><img alt='Screen' src='https://github.com/downloads/gitlabhq/gitlab-ci/gitlab_ci_preview.png' /></p>
</div><!-- entry -->
</div><!-- span 12 -->
</div><!-- row -->
</div><!-- row-fluid -->
</div><!-- container -->
</div><!-- content -->
[Dolphin]
PreviewsShown=true
Timestamp=2013,4,16,17,37,18
Version=3
---
layout: default
title: Products
---
<div id="content" class="txt-middle">
<div class="container">
<div class="row">
<div class="span4">
<a href="/gitlab-ce"><h2>Community Edition</h2></a>
<p>Open source software to collaborate on code.</p>
</div>
<div class="span4">
<a href="/features"><h2>Enterprise Edition</h2></a>
<p>The Enterprise Edition includes all the features of the Community Edition with additional features.</p>
</div>
<div class="span4">
<a href="/gitlab-ci"><h2>GitLab CI</h2></a>
<p>GitLab CI integrates with your GitLab installation and run tests for your projects. </p>
</div>
</div>
</div>
</div>
---
layout: default
title: Services
---
<div id="content" class="txt-middle">
<div class="container">
<div class="row">
<div class="span3">
<a href="/subscription"><h2>Subscription</h2></a>
<p>A subscription includes access to GitLab Enterprise Edition and support.</p>
</div>
<div class="span3">
<a href="/consultancy"><h2>Consultancy</h2></a>
<p>Hire us to help you.</p>
</div>
<div class="span3">
<a href="/training"><h2>Training</h2></a>
<p>Git training workshops.</p>
</div>
<div class="span3">
<a href="/cloud"><h2>Cloud</h2></a>
<p>Use GitLab without installing anything.</p>
</div>
</div>
</div>
</div>
......@@ -35,6 +35,9 @@ title: Terms
<div class="span3">
<div class="entry">
<ul>
<li><a href="/privacy">Privacy Policy</a></li>
<li><a href="/dmca">DMCA Policy</a></li>
<li><a href="/disclosure">Responsible Disclosure Policy</a></li>
<li><a href="#cloud">GitLab Cloud Terms</a></li>
<li><a href="#subscription">GitLab Subscription Terms</a></li>
<li><a href="#consultancy">GitLab Consultancy Terms</a></li>
......
---
layout: default
title: Training
---
<div id="content" class="txt-middle">
<div class="container">
<p> We organize git training workshops for companies</p>
<a href="/contact">Contact us</a> for more details.
</div>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment