Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixed conflict
  • Loading branch information
zurbchris committed Nov 15, 2012
2 parents 2992fef + f74e24b commit e3890c6
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions Gemfile.lock
Expand Up @@ -26,6 +26,7 @@ GEM

PLATFORMS
ruby
x86-mingw32

DEPENDENCIES
zurb-foundation!
2 changes: 1 addition & 1 deletion scss/foundation/components/modules/_mqueries.scss
Expand Up @@ -363,7 +363,7 @@
&>li { float: none;
&.active, &:hover { background: darken($topBarDropBgColor, 5%); }
/* Branding and name */
&.name { background: darken($topBarBgColor, 20%); height: $topBarHeightMobile;
&.name { height: $topBarHeightMobile;
h1 { line-height: 1;
a { color: $topBarLinkColor; display: block; line-height: $topBarHeightMobile !important; padding-left: $topBarHeightMobile / 3; height: $topBarHeightMobile; }
}
Expand Down
2 changes: 1 addition & 1 deletion scss/foundation/components/modules/_orbit.scss
Expand Up @@ -76,7 +76,7 @@

/* Correct timer in IE */
.lt-ie9 .timer { display: none !important; }
.lt-ie9 div.caption { background: $orbitCaptionBgColorOldBrowser; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000,endColorstr=#99000000);zoom: 1; }
.lt-ie9 div.orbit-caption { background: $orbitCaptionBgColorOldBrowser; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000,endColorstr=#99000000);zoom: 1; }

// Allow slides to be stacked on mobile devices
@media only screen and (max-width: $screenSmall - 1) {
Expand Down
2 changes: 1 addition & 1 deletion test/topbar.html
Expand Up @@ -73,7 +73,7 @@ <h1>
<li><a href="#">Subdropdown Option</a></li>
</ul>
</li>
<li class="has-dropdown">
<li class="has-dropdown">
<a href="#" class="">Dropdown Level 1b</a>
<ul class="dropdown">
<li><a href="#">Subdropdown Option</a></li>
Expand Down
Expand Up @@ -59,10 +59,10 @@
});

// Positioning the Flyout List
var normalButtonHeight = $('.button.dropdown:not(.large):not(.small):not(.tiny)', this).outerHeight() - 1,
largeButtonHeight = $('.button.large.dropdown', this).outerHeight() - 1,
smallButtonHeight = $('.button.small.dropdown', this).outerHeight() - 1,
tinyButtonHeight = $('.button.tiny.dropdown', this).outerHeight() - 1;
var normalButtonHeight = $('.button.dropdown:not(.large):not(.small):not(.tiny):visible', this).outerHeight() - 1,
largeButtonHeight = $('.button.large.dropdown:visible', this).outerHeight() - 1,
smallButtonHeight = $('.button.small.dropdown:visible', this).outerHeight() - 1,
tinyButtonHeight = $('.button.tiny.dropdown:visible', this).outerHeight() - 1;

$('.button.dropdown:not(.large):not(.small):not(.tiny) > ul', this).css('top', normalButtonHeight);
$('.button.dropdown.large > ul', this).css('top', largeButtonHeight);
Expand Down

0 comments on commit e3890c6

Please sign in to comment.