Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

design tweaks for Try Git promo #199

Merged
merged 1 commit into from Nov 7, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/assets/stylesheets/layout.css.scss
Expand Up @@ -80,11 +80,11 @@ aside {
margin-bottom: 1.2em; margin-bottom: 1.2em;
} }
.promo { .promo {
background: #d8d7cf; font-weight: bold;
display: inline-block; img {
margin-top: -.5em; position: relative;
padding: 4px 8px 4px 4px; top: -6px;
width: auto; }
} }
img.illustration { img.illustration {
position: absolute; position: absolute;
Expand Down
14 changes: 7 additions & 7 deletions app/views/layouts/layout.html.haml
Expand Up @@ -5,17 +5,17 @@
%title= @page_title %title= @page_title
- else - else
%title Git %title Git
%meta{:charset => "utf-8"} %meta{:charset => "utf-8"}
%meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"} %meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}
%link{:rel => "shortcut icon", "href" => "/favicon.ico", :type => "image/x-icon"} %link{:rel => "shortcut icon", "href" => "/favicon.ico", :type => "image/x-icon"}
= stylesheet_link_tag "git-scm.css" = stylesheet_link_tag "git-scm.css"
= javascript_include_tag "modernizr.js", "modernizr-tests.js" = javascript_include_tag "modernizr.js", "modernizr-tests.js"
/[if (gte IE 6)&(lte IE 8)] /[if (gte IE 6)&(lte IE 8)]
%script{:src => "/javascripts/selectivizr-min.js", :type => "text/javascript"} %script{:src => "/javascripts/selectivizr-min.js", :type => "text/javascript"}
= javascript_include_tag "http://use.typekit.com/jsq2fql.js" = javascript_include_tag "http://use.typekit.com/jsq2fql.js"
:javascript :javascript
try{Typekit.load();}catch(e){} try{Typekit.load();}catch(e){}

%body{:id => @section} %body{:id => @section}
%div.inner %div.inner
= partial 'shared/header' = partial 'shared/header'
Expand All @@ -30,12 +30,12 @@
Git is <a href="/documentation">easy to learn</a> and has a <a href="/about/small-and-fast">tiny footprint with lightning fast performance</a>. It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with features like <a href="/about/branching-and-merging">cheap local branching</a>, convenient <a href="/about/staging-area">staging areas</a>, and <a href="/about/distributed">multiple workflows</a>. Git is <a href="/documentation">easy to learn</a> and has a <a href="/about/small-and-fast">tiny footprint with lightning fast performance</a>. It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with features like <a href="/about/branching-and-merging">cheap local branching</a>, convenient <a href="/about/staging-area">staging areas</a>, and <a href="/about/distributed">multiple workflows</a>.


%p.promo %p.promo
<img src="https://d1ffx7ull4987f.cloudfront.net/images/achievements/large_badge/121/completed-try-git-1d5111823aae2bb9d14fbcb663998353.png" height="31px" width="31px" style="float: left; margin: -2px 4px 0 0;"/> Learn Git in your browser for free with <a href="http://try.github.com">Try Git</a>. <img src="https://d1ffx7ull4987f.cloudfront.net/images/achievements/large_badge/121/completed-try-git-1d5111823aae2bb9d14fbcb663998353.png" height="42" width="42" style="float: left; margin: -2px 4px 0 0;"/> Learn Git in your browser for free with <a href="http://try.github.com">Try Git</a>.


<img class="illustration" src="images/branching-illustration.png" /> <img class="illustration" src="images/branching-illustration.png" />


%div#conent-wrapper %div#conent-wrapper
%div.inner %div.inner
=yield =yield
= partial 'shared/footer' = partial 'shared/footer'


Expand All @@ -48,14 +48,14 @@
%li= link_to "About", "/about", {:class => (@section == 'about') ? 'active' : ''} %li= link_to "About", "/about", {:class => (@section == 'about') ? 'active' : ''}
%li %li
=link_to "Documentation", "/doc", {:class => (@section == 'documentation') ? 'active' : ''} =link_to "Documentation", "/doc", {:class => (@section == 'documentation') ? 'active' : ''}
%ul{:class => (@section == 'documentation') ? 'expanded' : ''} %ul{:class => (@section == 'documentation') ? 'expanded' : ''}
%li= link_to "Reference", "/docs", {:class => (@subsection == 'reference') ? 'active' : ''} %li= link_to "Reference", "/docs", {:class => (@subsection == 'reference') ? 'active' : ''}
%li= link_to "Book", "/book", {:class => (@subsection == 'book') ? 'active' : ''} %li= link_to "Book", "/book", {:class => (@subsection == 'book') ? 'active' : ''}
%li= link_to "Videos", "/videos", {:class => (@subsection == 'videos') ? 'active' : ''} %li= link_to "Videos", "/videos", {:class => (@subsection == 'videos') ? 'active' : ''}
%li= link_to "External Links", "/doc/ext", {:class => (@subsection == 'external-links') ? 'active' : ''} %li= link_to "External Links", "/doc/ext", {:class => (@subsection == 'external-links') ? 'active' : ''}
%li %li
= link_to "Downloads", "/downloads", {:class => (@section == 'downloads') ? 'active' : ''} = link_to "Downloads", "/downloads", {:class => (@section == 'downloads') ? 'active' : ''}
%ul{:class => (@section == 'downloads') ? 'expanded' : ''} %ul{:class => (@section == 'downloads') ? 'expanded' : ''}
%li= link_to "GUI Clients", "/downloads/guis", {:class => (@subsection == 'guis') ? 'active' : ''} %li= link_to "GUI Clients", "/downloads/guis", {:class => (@subsection == 'guis') ? 'active' : ''}
%li= link_to "Logos", "/downloads/logos", {:class => (@subsection == 'logos') ? 'active' : ''} %li= link_to "Logos", "/downloads/logos", {:class => (@subsection == 'logos') ? 'active' : ''}
%li= link_to "Community", "/community", {:class => (@section == 'community') ? 'active' : ''} %li= link_to "Community", "/community", {:class => (@section == 'community') ? 'active' : ''}
Expand Down