jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(typography): fix fonts weight, banner padding, column headers

pull/3/head
alex 2016-01-21 17:51:32 +03:00
parent 872145bff4
commit b19ad119e6
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/pages/ui/typography/typography.html
View File

@ -212,22 +212,13 @@
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-4">
<h4>Column heading example</h4> <h4>Column heading example</h4>
</div>
<div class="col-sm-4">
<h4>Yet another column heading example</h4>
</div>
<div class="col-sm-4">
<h4>Third column heading example</h4>
</div>
</div>
<div class="row">
<div class="col-sm-4">
<div class="img-wrapper"><img ng-src="{{::( 'app/typography/typo04.png' | appImage )}}" alt=""/></div> <div class="img-wrapper"><img ng-src="{{::( 'app/typography/typo04.png' | appImage )}}" alt=""/></div>
<p>Eget augue, lacus erat ante egestas scelerisque aliquam, metus molestie leo in habitasse magna <p>Eget augue, lacus erat ante egestas scelerisque aliquam, metus molestie leo in habitasse magna
maecenas</p> maecenas</p>
<a href class="learn-more">Lean more</a> <a href class="learn-more">Lean more</a>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<h4>Yet another column heading example</h4>
<div class="img-wrapper"><img ng-src="{{::( 'app/typography/typo05.png' | appImage )}}" alt=""/></div> <div class="img-wrapper"><img ng-src="{{::( 'app/typography/typo05.png' | appImage )}}" alt=""/></div>
<p>Augue massa et parturient, suspendisse orci nec scelerisque sit, integer nam mauris pede consequat <p>Augue massa et parturient, suspendisse orci nec scelerisque sit, integer nam mauris pede consequat
in in
@ -235,6 +226,7 @@
<a href class="learn-more">Lean more</a> <a href class="learn-more">Lean more</a>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<h4>Third column heading example</h4>
<div class="img-wrapper"><img ng-src="{{::( 'app/typography/typo06.png' | appImage )}}" alt=""/></div> <div class="img-wrapper"><img ng-src="{{::( 'app/typography/typo06.png' | appImage )}}" alt=""/></div>
<p>Eget turpis, tortor lobortis porttitor, vestibulum nullam vehicula aliquam</p> <p>Eget turpis, tortor lobortis porttitor, vestibulum nullam vehicula aliquam</p>
<a href class="learn-more">Lean more</a> <a href class="learn-more">Lean more</a>

14
src/sass/app/_typography.scss
View File

@ -69,7 +69,7 @@ h5 {
text-align: center; text-align: center;
margin: 0; margin: 0;
width: 100%; width: 100%;
font-weight: 100; font-weight: 300;
} }
.heading-widget { .heading-widget {
@ -77,12 +77,12 @@ h5 {
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
width: 100%; width: 100%;
font-weight: 100; font-weight: 300;
} }
p { p {
line-height: 16px; line-height: 16px;
font-weight: 100; font-weight: 300;
} }
} }
@ -107,7 +107,7 @@ h5 {
} }
.regular-text { .regular-text {
font-weight: 600; font-weight: 400;
} }
.upper-text { .upper-text {
@ -166,10 +166,10 @@ h5 {
.lists-widget { .lists-widget {
font-weight: 100; font-weight: 300;
.list-header { .list-header {
width: 100%; width: 100%;
font-weight: 100; font-weight: 300;
text-align: center; text-align: center;
} }
@ -429,7 +429,7 @@ a.learn-more {
padding: 0; padding: 0;
margin-bottom: 50px; margin-bottom: 50px;
.panel-content{ .panel-body{
padding: 0; padding: 0;
} }
} }