From 701c977563e327c65e872916e7202cdd17dcc527 Mon Sep 17 00:00:00 2001 From: Andy Joslin Date: Fri, 2 May 2014 13:18:09 -0600 Subject: [PATCH] css(tabs): add test page for nested tabs --- scss/_tabs.scss | 15 +++++++--- test/css/tabs-and-cards.html | 53 ++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 test/css/tabs-and-cards.html diff --git a/scss/_tabs.scss b/scss/_tabs.scss index 6d9d16852c..91a6649785 100644 --- a/scss/_tabs.scss +++ b/scss/_tabs.scss @@ -130,7 +130,9 @@ } .tabs-icon-top > .tabs .tab-item, -.tabs-icon-bottom > .tabs .tab-item { +.tabs-icon-top.tabs .tab-item, +.tabs-icon-bottom > .tabs .tab-item, +.tabs-icon-bottom.tabs .tab-item { font-size: $tabs-text-font-size-side-icon; line-height: $tabs-text-font-size; } @@ -142,7 +144,9 @@ font-size: $tabs-icon-size; } +.tabs-icon-left.tabs .tab-item, .tabs-icon-left > .tabs .tab-item, +.tabs-icon-right.tabs .tab-item, .tabs-icon-right > .tabs .tab-item { font-size: $tabs-text-font-size-side-icon; @@ -157,15 +161,18 @@ } } -.tabs-icon-left > .tabs .tab-item .icon { +.tabs-icon-left > .tabs .tab-item .icon, +.tabs-icon-left.tabs .tab-item .icon { padding-right: 3px; } -.tabs-icon-right > .tabs .tab-item .icon { +.tabs-icon-right > .tabs .tab-item .icon, +.tabs-icon-right.tabs .tab-item .icon { padding-left: 3px; } -.tabs-icon-only > .tabs .icon { +.tabs-icon-only > .tabs .icon, +.tabs-icon-only.tabs .icon { line-height: inherit; } diff --git a/test/css/tabs-and-cards.html b/test/css/tabs-and-cards.html new file mode 100644 index 0000000000..f406381b54 --- /dev/null +++ b/test/css/tabs-and-cards.html @@ -0,0 +1,53 @@ + + + + Tabs: Top Icons + + + + + + +
+

Tab Bars & Cards

+
+ +
+
+
+ + + {{iconTypeMain}} + +
+
+
+ Main Icon Type + + +
+ Card Icon Type + + +
+
+ + + {{iconTypeSecondary}} + +
+
+
+
+ +
+ + + +