Skip to content

Commit

Permalink
Brand colors.
Browse files Browse the repository at this point in the history
  • Loading branch information
polarblau committed Jun 29, 2012
1 parent 2cb8350 commit 3bb4ea7
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 27 deletions.
4 changes: 2 additions & 2 deletions source/stylesheets/pages/_index.sass
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ body.index
+clearfix

h2, h3
+brand-stripe(-2deg, $pink, false)
+brand-stripe(-2deg, $brand-2, false)

h2
+shadowed
Expand All @@ -29,7 +29,7 @@ body.index
margin-top: 0
width: 82%
margin-left: 20%
background: transparentize($pink, 0.10)
background: transparentize($brand-2, 0.10)
+transform(rotate(1deg))
z-index: 400

Expand Down
2 changes: 1 addition & 1 deletion source/stylesheets/pages/_schedule.sass
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,6 @@ body.schedule
background: transparentize($grey, 0.15)

&.talk
background: transparentize($green, 0.15)
background: transparentize($brand-1, 0.15)
color: $white
+shadowed
2 changes: 1 addition & 1 deletion source/stylesheets/pages/index/_attendees.sass
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ article
+padded

h3
+brand-stripe(-2deg, $blue)
+brand-stripe(-2deg, $brand-3)
+custom-sans(black)
position: absolute
top: 2em
Expand Down
4 changes: 2 additions & 2 deletions source/stylesheets/pages/index/_speakers.sass
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ article
border-bottom: 1px dotted $grey

h3
+brand-stripe(-1deg, $blue)
+brand-stripe(-1deg, $brand-3)
+custom-sans(black)
top: -0.5em
left: -1em
Expand Down Expand Up @@ -62,7 +62,7 @@ article
bottom: -0.5em

a
color: $blue
color: $brand-3


+respond-to(mid-range)
Expand Down
4 changes: 2 additions & 2 deletions source/stylesheets/pages/index/_sponsors.sass
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
article
section.sponsors
padding: 2em 0
background: $blue
background: $brand-3

header
h3
Expand Down Expand Up @@ -31,7 +31,7 @@ article
width: 100%

&:hover
border-color: $pink
border-color: $brand-2
+transition(border-color, 0.25s)


Expand Down
2 changes: 1 addition & 1 deletion source/stylesheets/pages/index/_twitter_feed.sass
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ article
+clearfix

h3
+brand-stripe(2deg, $blue)
+brand-stripe(2deg, $brand-3)
+custom-sans(black)
position: absolute
bottom: 0.75em
Expand Down
14 changes: 7 additions & 7 deletions source/stylesheets/partials/_colors.sass
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$green: #73ad43
$pink: #ff00a2
$blue: #00d4ff
$black: #191818
$white: #fafbe9
$grey: #e0e0e0
$dark-grey: lighten($black, 25%)
$green: #73ad43
$pink: #ff00a2
$blue: #00d4ff
$black: #191818
$white: #fafbe9
$grey: #e0e0e0
$dark-grey: lighten($black, 25%)
$medium-grey: lighten($black, 50%)
12 changes: 6 additions & 6 deletions source/stylesheets/partials/_footer.sass
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ body
+transition(color 0.5s, background-color 0.5s)

&:hover
background-color: $pink
background-color: $brand-2
color: $white
+transition(color 0.5s, background-color 0.5s)

Expand All @@ -41,7 +41,7 @@ body
+transition(color 0.5s)

&:hover
color: $pink
color: $brand-2
+transition(color 0.5s)


Expand All @@ -68,12 +68,12 @@ body
margin: 1em 0 0 0
display: none
padding: 1em 0
border-top: 1px dotted $pink
border-top: 1px dotted $brand-2
+transition(background-color 0.5s)

&:hover
border: none
background-color: $pink
background-color: $brand-2
+transition(background-color 0.5s)


Expand Down Expand Up @@ -102,7 +102,7 @@ body
bottom: 0
width: 2em
border: none
border-left: 1px dotted $pink
border-left: 1px dotted $brand-2
margin: 0
+transition(width 0.25s, background-color 0.25s)

Expand All @@ -112,7 +112,7 @@ body

&:hover
width: 100px
background-color: $pink
background-color: $brand-2
+box-shadow(-3px 0 0 0 transparentize($grey, 0.2))
+transition(width 0.25s, background-color 0.25s)

Expand Down
4 changes: 2 additions & 2 deletions source/stylesheets/partials/_header.sass
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ body
+transition(color 0.5s)

&:hover
color: $pink
color: $brand-2
+transition(color 0.5s)

&.active
border-bottom: 3px solid $pink
border-bottom: 3px solid $brand-2



Expand Down
2 changes: 1 addition & 1 deletion source/stylesheets/partials/_helpers.sass
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
padding: 0
margin: 0

=brand-stripe($rotation: -3deg, $color: $pink, $shadowed: true)
=brand-stripe($rotation: -3deg, $color: $brand-2, $shadowed: true)
padding: 0.15em 1em 0.35em
margin: -2.75em -1em 0 -1em
font-weight: light
Expand Down
4 changes: 2 additions & 2 deletions source/stylesheets/partials/_typography.sass
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
font-weight: 400

a
color: $green
color: $brand-1
text-decoration: none

&:hover
color: $pink
color: $brand-1
+transition(color 1.0s)
5 changes: 5 additions & 0 deletions source/stylesheets/screen.css.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
@import "lib/bourbon/bourbon"

@import "partials/colors"

$brand-1: $green
$brand-2: $pink
$brand-3: $blue

This comment has been minimized.

Copy link
@polarblau

polarblau Jun 29, 2012

Author Member

This will allow us to swap them out for the jRuby site.

This comment has been minimized.

Copy link
@myabc

myabc Jun 29, 2012

Member

OK cool – I see now.

This comment has been minimized.

Copy link
@polarblau

polarblau Jun 29, 2012

Author Member

Yep, I figured we just have two screen.css.sass files — one for each site. These would also include overrides and/or additional includes, if necessary.


@import "partials/helpers"
@import "partials/typography"

Expand Down

0 comments on commit 3bb4ea7

Please sign in to comment.