javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 23:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update heading margins

Browse Source
This commit is contained in:
Adam Bradley
2013-11-16 09:38:58 -06:00
parent 1dd3816918
commit 54eaf7990a
2 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
dist/css/ionic.css vendored
View File

@ -2373,15 +2373,41 @@ h1, h2, h3, h4, h5, h6,
font-weight: normal; font-weight: normal;
line-height: 1; } line-height: 1; }
h1, h1, .h1,
h2, h2, .h2,
h3 { h3, .h3 {
margin-top: 20px; margin-top: 20px;
margin-bottom: 10px; } margin-bottom: 10px; }
h1:first-child, .h1:first-child,
h2:first-child, .h2:first-child,
h3:first-child, .h3:first-child {
margin-top: 0; }
h1 + h1, h1 + .h1,
h1 + h2, h1 + .h2,
h1 + h3, h1 + .h3, .h1 + h1, .h1 + .h1,
.h1 + h2, .h1 + .h2,
.h1 + h3, .h1 + .h3,
h2 + h1,
h2 + .h1,
h2 + h2,
h2 + .h2,
h2 + h3,
h2 + .h3, .h2 + h1, .h2 + .h1,
.h2 + h2, .h2 + .h2,
.h2 + h3, .h2 + .h3,
h3 + h1,
h3 + .h1,
h3 + h2,
h3 + .h2,
h3 + h3,
h3 + .h3, .h3 + h1, .h3 + .h1,
.h3 + h2, .h3 + .h2,
.h3 + h3, .h3 + .h3 {
margin-top: 10px; }
h4, h4, .h4,
h5, h5, .h5,
h6 { h6, .h6 {
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; } margin-bottom: 10px; }

22
scss/_type.scss
View File

@ -44,15 +44,25 @@ h1, h2, h3, h4, h5, h6,
} }
} }
h1, h1, .h1,
h2, h2, .h2,
h3 { h3, .h3 {
margin-top: $line-height-computed; margin-top: $line-height-computed;
margin-bottom: ($line-height-computed / 2); margin-bottom: ($line-height-computed / 2);
&:first-child {
margin-top: 0;
}
+ h1, + .h1,
+ h2, + .h2,
+ h3, + .h3 {
margin-top: ($line-height-computed / 2);
}
} }
h4, h4, .h4,
h5, h5, .h5,
h6 { h6, .h6 {
margin-top: ($line-height-computed / 2); margin-top: ($line-height-computed / 2);
margin-bottom: ($line-height-computed / 2); margin-bottom: ($line-height-computed / 2);
} }