From 2a6f7029805596e56373213cf3c4139cc7d7d70c Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 17 Apr 2014 22:40:01 -0500 Subject: [PATCH] fix(tabs): Tab icon align within nested tabs, closes #1093 --- scss/_tabs.scss | 8 +++---- test/css/tab-bars-icons-bottom.html | 36 +++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/scss/_tabs.scss b/scss/_tabs.scss index c54a1fb2b93..a4542116629 100644 --- a/scss/_tabs.scss +++ b/scss/_tabs.scss @@ -129,8 +129,8 @@ display: none; } -.tabs-icon-top .tab-item, -.tabs-icon-bottom .tab-item { +.tabs-icon-top > .tabs .tab-item, +.tabs-icon-bottom > .tabs .tab-item { font-size: $tabs-text-font-size-side-icon; line-height: $tabs-text-font-size; } @@ -142,8 +142,8 @@ font-size: $tabs-icon-size; } -.tabs-icon-left .tab-item, -.tabs-icon-right .tab-item { +.tabs-icon-left > .tabs .tab-item, +.tabs-icon-right > .tabs .tab-item { font-size: $tabs-text-font-size-side-icon; .icon { diff --git a/test/css/tab-bars-icons-bottom.html b/test/css/tab-bars-icons-bottom.html index 3db974548d8..1ddb0837eb3 100644 --- a/test/css/tab-bars-icons-bottom.html +++ b/test/css/tab-bars-icons-bottom.html @@ -5,7 +5,7 @@ - +

Tab Bars

@@ -24,8 +24,40 @@

Icons On Bottom Of Text

  • Homepage
    • +
    + +
    + +

    Marty McFly

    +

    November 05, 1955

    +
    + +
    +

    + This is a crude example of the parent tabs having .tabs-icon-bottom set, + while a nested tabs has .tabs-icon-left set. +

    +
    + +
    + + + Like + + + + Comment + + + + Share + +
    + +
    + - +