Merge branch 'master' of github.com:zurb/foundation

foundation · Jun 29, 2012 · db950bd · db950bd
2 parents 6d4f7f5 + d19e156
commit db950bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/marketing/sass/docs/presentation.scss b/marketing/sass/docs/presentation.scss
@@ -50,7 +50,7 @@ header .subheader { position: relative; top: -18px; }
 .top-bar .attached > .name:hover { color: #fff !important; }
 .top-bar .attached { padding: 0 15px; width: 100%; max-width: 100%; }
 .top-bar li { margin-bottom: 0; line-height: 46px; }
-.top-bar .attached > ul.right { overflow: hidden; }
+.top-bar .attached > ul.right { overflow: hidden; float: right; }
 .top-bar .attached > ul.right > li.download { border-right: 0; }
 .top-bar .attached > ul.right > li.download a { padding: 6px 13px 6px; }
 .top-bar .attached > ul.right > li > a:hover { color: $white; }

diff --git a/marketing/sass/presentation.scss b/marketing/sass/presentation.scss
@@ -109,7 +109,7 @@ header#homepage .button:hover { background: #006582; }
 .top-bar .attached { padding: 0 15px; width: 1000px; max-width: 100%; }
 .top-bar .attached > .name:hover { color: #fff !important; }
 .top-bar li { margin-bottom: 0; line-height: 46px; }
-.top-bar .attached > ul.right { overflow: hidden; }
+.top-bar .attached > ul.right { overflow: hidden; float: right; }
 .top-bar .attached > ul.right > li.download { border-right: 0; }
 .top-bar .attached > ul.right > li.download a { padding: 6px 13px 6px; }
 .top-bar .small.button { height: auto; top: 10px; }