am 291232ae: am 8f301ff1: Merge "Docs: Rename content-footer-text plus remove whitespace."

* commit '291232aea7130c96a87ca52df0eb1e0e742b1826':
  Docs: Rename content-footer-text plus remove whitespace.
This commit is contained in:
Gina Dimino 2015-08-12 03:21:10 +00:00 committed by Android Git Automerger
commit 505186cb7a
2 changed files with 11 additions and 16 deletions

View File

@ -408,7 +408,7 @@ video.with-shadow {
.content-header.just-links { .content-header.just-links {
margin-bottom:0; margin-bottom:0;
padding-bottom:0;} padding-bottom:0;}
.content-header h1 { .content-header h1 {
color:#000; color:#000;
margin:0; margin:0;
@ -423,7 +423,7 @@ video.with-shadow {
height: 30px; height: 30px;
} }
.content-footer-test { .content-footer-sac {
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
} }
.content-footer .col-9 { .content-footer .col-9 {

View File

@ -34,7 +34,7 @@
ru-lang="Предыдущий" ru-lang="Предыдущий"
ko-lang="이전" ko-lang="이전"
ja-lang="前へ" ja-lang="前へ"
es-lang="Anterior" es-lang="Anterior"
>Previous</a> >Previous</a>
<a href="#" class="next-page-link hide" <a href="#" class="next-page-link hide"
zh-TW-lang="下一堂課" zh-TW-lang="下一堂課"
@ -42,7 +42,7 @@
ru-lang="Следующий" ru-lang="Следующий"
ko-lang="다음" ko-lang="다음"
ja-lang="次へ" ja-lang="次へ"
es-lang="Siguiente" es-lang="Siguiente"
>Next</a> >Next</a>
<a href="#" class="start-class-link hide" <a href="#" class="start-class-link hide"
zh-TW-lang="開始上課" zh-TW-lang="開始上課"
@ -50,7 +50,7 @@
ru-lang="Начало работы" ru-lang="Начало работы"
ko-lang="시작하기" ko-lang="시작하기"
ja-lang="開始する" ja-lang="開始する"
es-lang="Empezar" es-lang="Empezar"
>Get started</a> >Get started</a>
</div> </div>
<?cs elif:!page.trainingcourse ?> <?cs elif:!page.trainingcourse ?>
@ -61,7 +61,7 @@
ru-lang="Предыдущий" ru-lang="Предыдущий"
ko-lang="이전" ko-lang="이전"
ja-lang="前へ" ja-lang="前へ"
es-lang="Anterior" es-lang="Anterior"
>Previous</a> >Previous</a>
<a href="#" class="next-page-link hide" <a href="#" class="next-page-link hide"
zh-TW-lang="下一堂課" zh-TW-lang="下一堂課"
@ -69,7 +69,7 @@
ru-lang="Следующий" ru-lang="Следующий"
ko-lang="다음" ko-lang="다음"
ja-lang="次へ" ja-lang="次へ"
es-lang="Siguiente" es-lang="Siguiente"
>Next</a> >Next</a>
</div> </div>
<?cs /if ?><?cs # end if training ?> <?cs /if ?><?cs # end if training ?>
@ -87,7 +87,6 @@
<?cs /if ?> <?cs /if ?>
<h1 itemprop="name" style="margin-bottom:0;"><?cs var:page.title ?></h1> <h1 itemprop="name" style="margin-bottom:0;"><?cs var:page.title ?></h1>
<p itemprop="description"><?cs var:page.landing.intro ?></p> <p itemprop="description"><?cs var:page.landing.intro ?></p>
<p><a class="next-page-link topic-start-link"></a></p> <p><a class="next-page-link topic-start-link"></a></p>
<?cs if:page.landing.image ?> <?cs if:page.landing.image ?>
</div> </div>
@ -112,12 +111,11 @@
<?cs # THIS IS THE MAIN DOC CONTENT ?> <?cs # THIS IS THE MAIN DOC CONTENT ?>
<div id="jd-content"> <div id="jd-content">
<div class="jd-descr" itemprop="articleBody"> <div class="jd-descr" itemprop="articleBody">
<?cs call:tag_list(root.descr) ?> <?cs call:tag_list(root.descr) ?>
</div> </div>
<div class="content-footer-test" <div class="content-footer-sac"
itemscope itemtype="http://schema.org/SiteNavigationElement"> itemscope itemtype="http://schema.org/SiteNavigationElement">
<div class="layout-content-col <?cs <div class="layout-content-col <?cs
if:fullpage ?>col-16<?cs if:fullpage ?>col-16<?cs
@ -141,23 +139,20 @@
ru-lang="Следующий" ru-lang="Следующий"
ko-lang="다음" ko-lang="다음"
ja-lang="次へ" ja-lang="次へ"
es-lang="Siguiente" es-lang="Siguiente"
>Next</a> >Next</a>
<?cs /if ?> <?cs /if ?>
</div> </div>
<?cs /if ?> <?cs /if ?>
</div> </div>
<?cs # for training classes, provide a different kind of link when the next page is a different class ?> <?cs # for training classes, provide a different kind of link when the next page is a different class ?>
<?cs if:training && !page.article ?> <?cs if:training && !page.article ?>
<div class="layout-content-row content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement"> <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> <a href="#" class="next-class-link hide">Next class: </a>
</div> </div>
<?cs /if ?> <?cs /if ?>
</div> <!-- end jd-content -->
</div> <!-- end jd-content --> <?cs include:"footer.cs" ?>
<?cs include:"footer.cs" ?>
</div><!-- end doc-content --> </div><!-- end doc-content -->
<?cs include:"trailer.cs" ?> <?cs include:"trailer.cs" ?>