Skip to content

Commit

Permalink
pulled in jasons changes, moving to using his haml directly
Browse files Browse the repository at this point in the history
  • Loading branch information
schacon committed Mar 29, 2012
1 parent 44a5f24 commit b4fc467
Show file tree
Hide file tree
Showing 55 changed files with 499 additions and 65 deletions.
1 change: 1 addition & 0 deletions Gemfile
Expand Up @@ -11,6 +11,7 @@ gem 'faraday'
gem 'yajl-ruby', '~> 1.1.0'
gem 'excon', '~> 0.9.4'
gem 'heroku'
gem 'haml'

# Gems used only for assets and not required
# in production environments by default.
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Expand Up @@ -58,6 +58,7 @@ GEM
multipart-post (~> 1.1)
rack (~> 1.1)
fssm (0.2.8.1)
haml (3.1.4)
heroku (2.22.0)
launchy (>= 0.3.2)
netrc (~> 0.7.1)
Expand Down Expand Up @@ -158,6 +159,7 @@ DEPENDENCIES
compass-rails
excon (~> 0.9.4)
faraday
haml
heroku
jquery-rails
json
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion app/assets/stylesheets/forms.css.scss
Expand Up @@ -53,7 +53,7 @@ form#search {
top: 2px;
right: -8px;
width: 384px;
background: transparent url(/images/bg/search-header.jpg) 0 1px repeat-x;
background: #398a94 url(/images/bg/search-header.jpg) 0 1px repeat-x;
@include border-radius(3px);
@include box-shadow(0 0 7px rgba(0, 0, 0, 0.25));
border-bottom: solid 1px $base-border-color;
Expand Down
271 changes: 271 additions & 0 deletions app/assets/stylesheets/front-page.css.scss
@@ -0,0 +1,271 @@
#front-content {
@include clearfix;
overflow: visible;
// height: 400px;

#front-navigation {
width: 618px;
float: left;
border-right: solid 1px $base-border-color;
margin-bottom: 24px;
}
}

#front-nav {
@include clearfix;
ul {
@extend .unstyled;
padding-top: 24px;
li {
display: block;
width: 280px;
float: left;
margin-bottom: 20px;
&#nav-about, &#nav-downloads {
margin-right: 30px;
}
&#nav-about, &#nav-documentation {
margin-bottom: 40px;
}
}
}
a {
height: 86px;
display: block;
color: $font-color;
padding-left: 90px;
background-position: 0 0;
background-repeat: no-repeat;
@include transition-property(color);
@include transition-duration(.30s);
img {
margin-left: -90px;
margin-right: -90px;
float: left;
opacity: 0.9;
@include transition-property(opacity);
@include transition-duration(.30s);
}
h3 {
font-size: 18px;
font-weight: bold;
color: $orange;
}
p {
font-size: 13px;
line-height: $base-line-height * 0.8;
}
}
a:hover {
img {
opacity: 1;
}
h3 {
color: darken($orange, 5%);
}
}
}

#front-book {
padding-top: 20px;
float: left;
width: 590px;
border-top: solid 1px $base-border-color;
img {
float: left;
margin-right: 20px;
}
p {
margin-top: 16px;
}
}

$monitor-width: 313px;
$monitor-height: 271px;

#front-downloads {
width: 313px;
float: right;
position: relative;
.monitor {
position: absolute;
top: 0;
right: -12px;
width: 313px;
height: 271px;
color: #fff;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
h4 {
font-weight: normal;
color: #fff;
font-size: 16px;
}
span.version {
display: block;
font-weight: bold;
font-size: 28px;
margin-bottom: 6px;
}
a {
color: #59d6de;
font-size: 12px;
}
span.release-date {
font-size: 12px;
}
a.button {
display: block;
margin-top: 10px;
border-top: solid 1px #085e64;
border-left: solid 1px #1f6367;
border-right: solid 1px #1f6367;
border-bottom: solid 1px #134143;
text-align: center;
color: #fff;
font-size: 16px;
width: 224px;
padding: 5px 0;
@include border-radius(2px);
@include background-image(linear-gradient(#1c868c, #186368));
@include box-shadow(0 1px 0 #148a92);
@include transition-property(background-image);
@include transition-duration(.30s);
&:hover {
@include background-image(linear-gradient(darken(#1c868c, 2%), darken(#186368, 2%)));
}
}
&.mac {
background: transparent url(/images/monitor-mac.png) top right no-repeat;
padding-top: 36px;
padding-left: 40px;
height: $monitor-height - 36;
width: $monitor-width - 40;
}
&.windows {
background: transparent url(/images/monitor-windows.png) top right no-repeat;
padding-top: 45px;
padding-left: 40px;
height: $monitor-height - 45;
width: $monitor-width - 40;
}
&.linux {
background: transparent url(/images/monitor-linux.png) top right no-repeat;
padding-top: 45px;
padding-left: 40px;
height: $monitor-height - 45;
width: $monitor-width - 40;
}
}

table {
position: absolute;
top: $monitor-height;
left: 24px;
td {
padding: 8px 20px 6px 0;
}
a {
font-weight: bold;
}
}
}

#companies-projects {
clear: both;
border-top: solid 1px $base-border-color;
padding-top: 20px;
ul {
@extend .unstyled;
li {
display: block;
float: left;
width: 108px;
height: 65px;
margin: 0 4px 25px 5px;
}
a {
display: block;
width: 108px;
height: 65px;
opacity: 0.85;
@include transition-property(opacity);
@include transition-duration(.30s);
background-position: 0 0;
background-repeat: no-repeat;
text-indent: -9999px;
&:hover {
opacity: 1;
}
&.facebook {
background-image: url(/images/company-project-logos/facebook.png);
}
&.google {
background-image: url(/images/company-project-logos/google.png);
}
&.twitter {
background-image: url(/images/company-project-logos/twitter.png);
}
&.microsoft {
background-image: url(/images/company-project-logos/microsoft.png);
}
&.linked-in {
background-image: url(/images/company-project-logos/linked-in.png);
}
&.linux {
background-image: url(/images/company-project-logos/linux.png);
}
&.perl {
background-image: url(/images/company-project-logos/perl.png);
}
&.postgresql {
background-image: url(/images/company-project-logos/postgresql.png);
}
&.facebook {
background-image: url(/images/company-project-logos/facebook.png);
}
&.android {
background-image: url(/images/company-project-logos/android.png);
}
&.debian {
background-image: url(/images/company-project-logos/debian.png);
}
&.rails {
background-image: url(/images/company-project-logos/rails.png);
}
&.qt {
background-image: url(/images/company-project-logos/qt.png);
}
&.gnome {
background-image: url(/images/company-project-logos/gnome.png);
}
&.eclipse {
background-image: url(/images/company-project-logos/eclipse.png);
}
&.kde {
background-image: url(/images/company-project-logos/kde.png);
}
&.x {
background-image: url(/images/company-project-logos/x.png);
}
}
}
}

a.icon {
padding-left: 30px;
height: 30px;
line-height: 36px;
@include inline-block;
&.gui {
background: transparent url(/images/icons/gui.png) 6px 0 no-repeat;
}
&.older-releases {
background: transparent url(/images/icons/box.png) 0 4px no-repeat;
}
&.windows {
background: transparent url(/images/icons/windows.png) 0 3px no-repeat;
}
&.source {
background: transparent url(/images/icons/source-code.png) 0 4px no-repeat;
}
}
1 change: 1 addition & 0 deletions app/assets/stylesheets/git-scm.css.scss
Expand Up @@ -4,6 +4,7 @@
@import "variables.css.scss";
@import "typography.css.scss";
@import "layout.css.scss";
@import "front-page.css.scss";
@import "sidebar.css.scss";
@import "reference.css.scss";
@import "forms.css.scss";
Expand Down
13 changes: 12 additions & 1 deletion app/assets/stylesheets/layout.css.scss
Expand Up @@ -82,7 +82,17 @@ aside {
header {
margin-top: 14px;
position: relative;
padding-bottom: 30px;
padding-bottom: 26px;
#tagline {
display: block;
position: absolute;
top: 11px;
left: 120px;
margin-top: 1px;
color: $light-font-color;
font-size: 24px;
line-height: 24px;
}
}

// Navigation
Expand Down Expand Up @@ -149,6 +159,7 @@ a.dropdown-trigger {

// Footer
footer {
clear: both;
@include clearfix;
margin-top: 35px;
border-top: solid 1px $base-border-color;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/variables.css.scss
@@ -1,5 +1,5 @@
// Palette
$orange: #f24e32;
$orange: #f14e32;
$blue: #009099;

$page-width: 940px;
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/doc_controller.rb
@@ -1,8 +1,7 @@
class DocController < ApplicationController
layout "sidebar"
layout "layout"

def index
p Gitscm::CATEGORIES
@docs = DocFile.all
end

Expand Down
2 changes: 2 additions & 0 deletions app/controllers/site_controller.rb
@@ -1,4 +1,6 @@
class SiteController < ApplicationController
layout "layout"

def index
end
end
5 changes: 5 additions & 0 deletions app/helpers/application_helper.rb
@@ -1,2 +1,7 @@
module ApplicationHelper

def partial(part)
render part
end

end

0 comments on commit b4fc467

Please sign in to comment.