From aa46e9a73e2d558f85f95b3a5089693d251fd0d8 Mon Sep 17 00:00:00 2001 From: connors Date: Sun, 16 Feb 2014 17:34:01 -0800 Subject: [PATCH] add correct padding to content with bars --- dist/ratchet.css | 12 ++++++++---- docs/dist/ratchet.css | 12 ++++++++---- sass/base.scss | 15 +++++++++++---- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dist/ratchet.css b/dist/ratchet.css index 6fd667d..27619a8 100644 --- a/dist/ratchet.css +++ b/dist/ratchet.css @@ -280,10 +280,6 @@ strong { padding-top: 44px; } -.bar-tab ~ .content { - padding-bottom: 50px; -} - .bar-header-secondary ~ .content { padding-top: 88px; } @@ -296,6 +292,14 @@ strong { padding-bottom: 88px; } +.bar-tab ~ .content { + padding-bottom: 50px; +} + +.bar-footer-secondary-tab ~ .content { + padding-bottom: 94px; +} + .container { padding-right: 15px; padding-left: 15px; diff --git a/docs/dist/ratchet.css b/docs/dist/ratchet.css index 6fd667d..27619a8 100644 --- a/docs/dist/ratchet.css +++ b/docs/dist/ratchet.css @@ -280,10 +280,6 @@ strong { padding-top: 44px; } -.bar-tab ~ .content { - padding-bottom: 50px; -} - .bar-header-secondary ~ .content { padding-top: 88px; } @@ -296,6 +292,14 @@ strong { padding-bottom: 88px; } +.bar-tab ~ .content { + padding-bottom: 50px; +} + +.bar-footer-secondary-tab ~ .content { + padding-bottom: 94px; +} + .container { padding-right: 15px; padding-left: 15px; diff --git a/sass/base.scss b/sass/base.scss index 3070ba5..22cf319 100644 --- a/sass/base.scss +++ b/sass/base.scss @@ -51,17 +51,16 @@ strong { transform: translateZ(0px); } -// Pad top/bottom of content so it doesn't hide behind .bar-title and .bar-tab. +// Pad top/bottom of content so it doesn't hide behind bars. // Note: For these to work, content must come after both bars in the markup .bar-nav ~ .content { padding-top: $bar-base-height; } -.bar-tab ~ .content { - padding-bottom: $bar-tab-height; -} .bar-header-secondary ~ .content { padding-top: $bar-base-height*2; } + +// Footer bar padding .bar-footer ~ .content { padding-bottom: $bar-base-height; } @@ -69,6 +68,14 @@ strong { padding-bottom: $bar-base-height*2; } +// Tab bar padding +.bar-tab ~ .content { + padding-bottom: $bar-tab-height; +} +.bar-footer-secondary-tab ~ .content { + padding-bottom: $bar-tab-height+$bar-base-height; +} + // Utility classes .container { padding-right: 15px;