diff --git a/src/app/pages/typography/_typography.scss b/src/app/pages/typography/_typography.scss index 3eb2d76..94db7aa 100644 --- a/src/app/pages/typography/_typography.scss +++ b/src/app/pages/typography/_typography.scss @@ -18,44 +18,276 @@ a { } h1 { - font-size: 36px; - line-height: 38px; + font-size: 32px; + line-height: 40px; margin-bottom: 14px; font-weight: 100; } h2 { - font-size: 26px; - line-height: 38px; + font-size: 24px; + line-height: 40px; margin-bottom: 10px; font-weight: 200; } h3 { - font-size: 22px; - line-height: 42px; + font-size: 20px; + line-height: 40px; margin-bottom: 6px; font-weight: 300; } h4 { - font-size: 19px; - line-height: 43px; + font-size: 18px; + line-height: 38px; margin-bottom: 5px; } h5 { - font-size: 16px; - line-height: 45px; + font-size: 15px; + line-height: 35px; margin-bottom: 3px; } +.typography-document-samples { + + + .typography-document{ + } + + p { + margin: 0; + } + + .typography-widget { + + div.panel{ + height: 620px; + } + height: 100%; + .panel-body { + padding: 15px 30px 0 30px; + } + + .typography-widget-header { + text-align: center; + margin: 0; + width: 100%; + font-weight: 100; + } + + .heading-widget { + text-align: center; + + h1, h2, h3, h4, h5, h6 { + width: 100%; + font-weight: 100; + } + + p { + line-height: 16px; + font-weight: 100; + } + } + + .more-text-widget { + text-align: center; + font-size: 14px; + + p { + line-height: 17px; + } + + .gray { + color: #767676; + } + + .black { + color: #585858; + } + + .light-text { + font-weight: 100; + } + + .regular-text { + font-weight: 600; + } + + .upper-text { + text-transform: uppercase; + } + + .bold-text { + font-weight: 900; + } + + .small-text { + padding: 5px 0 24px 0; + p { + font-size: 9px; + font-weight: 100; + line-height: 10px; + } + } + } + + + + .color-widget { + text-align: center; + font-size: 14px; + font-weight: 300; + p { + line-height: 17px; + } + + .section-block{ + margin: 14px 0; + } + + .red-text p{ + color: $dribble-color; + } + + .blue-text p{ + color: $primary; + } + + .links { + h3 { + margin-bottom: 10px; + } + p { + margin-bottom: 0; + &.hovered { + a { + color: $danger; + } + } + } + } + + } + + .lists-widget{ + + + font-weight: 100; + .list-header{ + width: 100%; + font-weight: 100; + text-align: center; + } + + .accent { + margin-top: 44px; + color: $dribble-color; + line-height: 14px; + font-size: 14px; + margin-bottom: 36px; + padding-left: 11px; + border-left: 4px solid $dribble-color; + margin-left: 13px; + } + + ul.blur, ol.blur { + padding-left: 13px; + margin-bottom: 19px; + list-style: none; + padding-top: 1px; + li { + margin-top: 5px; + color: $default-text; + font-size: 14px; + ul, ol { + padding-left: 20px; + margin-bottom: 0; + list-style: none; + } + } + } + + ul.blur { + li { + &:before { + content: "• "; + color: $dribble-color; + width: 10px; + display: inline-block; + } + } + } + + ol.blur { + counter-reset: section; + li { + color: $dribble-color; + padding-left: 0; + line-height: 14px; + position: relative; + span { + color: $default-text; + display: block; + } + ol { + padding-left: 0; + margin-left: 12px; + } + &:before { + content: counters(section, ".") "."; + counter-increment: section; + width: 19px; + position: absolute; + left: 0; + top: 0; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + & > li { + span { + padding-left: 14px; + } + } + ol { + counter-reset: section; + & > li { + &:before { + width: 30px; + } + span { + padding-left: 27px + } + } + ol { + & > li { + &:before { + width: 40px; + } + span { + padding-left: 40px; + } + } + } + } + } + } + } + +} + +.columns-section{ + background-color: white; +} + p { margin-bottom: 12px; color: $default-text; font-family: $font-family; font-size: 14px; - line-height: 24px; } p.small-text { @@ -65,16 +297,7 @@ p.small-text { margin-bottom: 8px; } -.accent { - margin-top: 5px; - color: $danger; - line-height: 24px; - font-size: 16px; - margin-bottom: 36px; - padding-left: 24px; - border-left: 6px solid $danger; - margin-left: 36px; -} + .cols-two { margin-bottom: 50px; @@ -121,114 +344,30 @@ a.learn-more { margin-bottom: 10px; } -ul.blur, ol.blur { - padding-left: 32px; - margin-bottom: 19px; - list-style: none; - padding-top: 1px; - li { - line-height: 22px; - color: $default-text; - font-size: 14px; - margin-bottom: 8px; - ul, ol { - padding-left: 20px; - margin-bottom: 0; - margin-top: 8px; - list-style: none; - } - } -} -ul.blur { - li { - &:before { - content: "• "; - color: $danger; - width: 15px; - display: inline-block; - } - } -} - -ol.blur { - counter-reset: section; - li { - color: $danger; - font-weight: bold; - padding-left: 0; - position: relative; - span { - color: $default-text; - font-weight: normal; - display: block; - } - ol { - padding-left: 0; - margin-left: 34px; - } - &:before { - content: counters(section, ".") "."; - counter-increment: section; - width: 19px; - position: absolute; - left: 0; - top: 0; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - } - & > li { - span { - padding-left: 19px; - } - } - ol { - counter-reset: section; - & > li { - &:before { - width: 30px; - } - span { - padding-left: 30px - } - } - ol { - & > li { - &:before { - width: 40px; - } - span { - padding-left: 40px; - } - } - } - } -} .banner { position: relative; - padding-top: 17px; - margin-bottom: 27px; + margin-bottom: 20px; } .large-banner-wrapper { overflow: hidden; - height: 252px; + height: 400px; img { + height: 100%; display: block } } .banner-text-wrapper { - margin-top: -261px; - height: 261px; + margin-top: -400px; + height: 400px; text-align: center; } .banner-text { - padding: 30px 20px; + padding: 85px 90px 60px; display: inline-block; margin: 67px auto; background: #fff; @@ -237,19 +376,32 @@ ol.blur { background: rgba(0, 0, 0, 0.75); color: #ffffff; - h3 { + h1 { + font-weight: bold; width: 100%; color: #ffffff; + margin-bottom: 10px; } p { - color: $warning; + font-size: 24px; + line-height: 30px; + font-weight: 300; + color: $primary; margin-bottom: 0px; } } @media (max-width: 600px) { .banner-text { - min-width: 0px; + padding: 55px 60px 30px; + min-width: 0; + h1{ + font-size: 24px; + } + + p{ + font-size: 16px; + } } } @@ -274,19 +426,7 @@ ol.blur { } } -.links { - h2 { - margin-bottom: 10px; - } - p { - margin-bottom: 0; - &.hovered { - a { - color: $danger; - } - } - } -} + .section-block { padding-bottom: 12px; @@ -301,7 +441,11 @@ ol.blur { } .section { - padding-top: 7px; - padding-bottom: 12px; + padding: 0 20px 50px 20px; +} + +div.banner-column-panel{ + padding: 0; + margin-bottom: 50px; } diff --git a/src/app/pages/typography/typography.html b/src/app/pages/typography/typography.html index 8d0d389..ea52e66 100644 --- a/src/app/pages/typography/typography.html +++ b/src/app/pages/typography/typography.html @@ -1,180 +1,272 @@
-
-