update the wear device frame style. rename and make frame part of css.

also update some logic with next/prev links to make navigation prev
possible while in design docs (or others that allow cross-boundary nav)
and simply remove the 'next' link in the footer when at the end of a set.

Change-Id: I83008e313fb07c9bc028e27c06e0e8478fa525f0
This commit is contained in:
smain@google.com 2014-06-23 10:22:23 -07:00
parent ebed3b8595
commit c91ecb7093
4 changed files with 32 additions and 38 deletions

View File

@ -624,18 +624,6 @@ video.with-shadow {
display:none !important;
}
.content-footer.next-class {
display:block;
border:0;
margin-top:0;
padding-top:0;
}
.content-footer.next-class a.next-class-link {
display:block;
text-transform:uppercase;
}
/* inner-doc tabs w/ title */
@ -930,6 +918,30 @@ scroll top left;
height: 384px;
}
/* wear device frames */
.framed-wear-square {
background: transparent url(../images/styles/device_wear_square.png) no-repeat scroll top left;
background-size: 302px 302px;
height:222px;
width:222px;
padding:40px;
overflow:hidden;
}
#jd-content
.framed-wear-square img {
height:222px;
width: 222px;
padding:0;
margin:0;
}
/* landing page disclosures */
.landing-page-link {
text-decoration: none;
@ -6839,22 +6851,6 @@ a.landing-button:visited {
padding: 0 23px;
}
.landing-inset-video-container {
position: relative;
}
.landing-inset-video-container img.gif {
max-width: 222px;
position: absolute;
top: 40px;
left: 40px;
}
img.landing-bezel-only {
height:302px;
width:302px;
}
.landing-breakout.landing-partners img {
margin-bottom: 20px;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -255,7 +255,7 @@ $(document).ready(function() {
var crossBoundaries = ($("body.design").length > 0) || ($("body.guide").length > 0) ? true :
false; // navigate across topic boundaries only in design docs
if ($prevListItem.length) {
if ($prevListItem.hasClass('nav-section')) {
if ($prevListItem.hasClass('nav-section') || crossBoundaries) {
// jump to last topic of previous section
$prevLink = $prevListItem.find('a:last');
} else if (!$selListItem.hasClass('nav-section')) {
@ -312,6 +312,8 @@ false; // navigate across topic boundaries only in design docs
// if that doesn't work, we're at the end of the list, so disable NEXT link
$('.next-page-link').attr('href','').addClass("disabled")
.click(function() { return false; });
// and completely hide the one in the footer
$('.content-footer .next-page-link').hide();
}
}
}
@ -330,6 +332,8 @@ false; // navigate across topic boundaries only in design docs
$('.next-page-link').attr('href','')
.removeClass("hide").addClass("disabled")
.click(function() { return false; });
// and completely hide the one in the footer
$('.content-footer .next-page-link').hide();
if ($nextLink.length) {
$('.next-class-link').attr('href',$nextLink.attr('href'))
.removeClass("hide")
@ -4018,7 +4022,7 @@ function showSamples() {
var $this = $(this);
var remainingHeight = $this.parent().parent().height();
$this.parent().siblings().each(function ()
{
{
if ($(this).is(":visible")) {
var h = $(this).height();
remainingHeight = remainingHeight - h;

View File

@ -2,7 +2,7 @@
<?cs include:"macros.cs" ?>
<html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?>
<body class="gc-documentation
<body class="gc-documentation
<?cs
if:(google || reference.gms || reference.gcm) ?>google<?cs /if ?><?cs
@ -176,6 +176,7 @@ include:"header.cs" ?>
ja-lang="開始する"
es-lang="Empezar"
>Get started</a>
<a href="#" class="next-class-link hide">Next class</a>
<?cs /if ?>
</div>
<div class="layout-content-col plus-container col-2" >
@ -186,13 +187,6 @@ include:"header.cs" ?>
<?cs /if ?>
</div>
<?cs # for training classes, provide a different kind of link when the next page is a different class ?>
<?cs if:training && !page.article ?>
<div class="layout-content-row content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement">
<a href="#" class="next-class-link hide">Next class</a>
</div>
<?cs /if ?>
</div> <!-- end jd-content -->
<?cs include:"footer.cs" ?>