Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daa9e205 authored by smain@google.com's avatar smain@google.com Committed by Android (Google) Code Review
Browse files

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

Merge "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." into klp-modular-dev
parents 69a08861 c91ecb70

tools/droiddoc/templates-sdk/assets/css/default.css

+24 −28
Original line number Diff line number Diff line
@@ -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;

}

tools/droiddoc/templates-sdk/assets/images/styles/device_wear_square.png

0 → 100644
+12.7 KiB
Loading image diff...

tools/droiddoc/templates-sdk/assets/js/docs.js

+6 −2
Original line number Diff line number Diff line
@@ -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")

tools/droiddoc/templates-sdk/docpage.cs

+2 −8
Original line number Diff line number Diff line
@@ -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" ?>