Browse Source

Fix header font inheritance again.

1.0
jlukic 10 years ago
parent
commit
c3bc2c4c6c
6 changed files with 56 additions and 22 deletions
  1. 67
      src/definitions/elements/header.less
  2. 2
      src/themes/bookish/elements/header.overrides
  3. 2
      src/themes/bookish/elements/header.variables
  4. 2
      src/themes/chubby/elements/header.variables
  5. 2
      src/themes/classic/elements/header.variables
  6. 3
      src/themes/default/elements/header.variables

67
src/definitions/elements/header.less

@ -27,6 +27,7 @@
border: none;
margin: @margin;
padding: @verticalPadding @horizontalPadding;
font-family: @fontFamily;
font-weight: @fontWeight;
line-height: @lineHeight;
text-transform: @textTransform;
@ -43,7 +44,17 @@
color: @subHeaderColor;
}
/* Icon and Content Together */
.ui.header:first-child {
margin-top: @firstMargin;
}
.ui.header:last-child {
margin-bottom: @lastMargin;
}
/*--------------
Icon
---------------*/
.ui.header > .icon {
display: table-cell;
opacity: @iconOpacity;
@ -53,10 +64,6 @@
vertical-align: @iconAlignment;
padding-right: (@iconMargin / 2);
}
.ui.header > .icon + .content {
padding-left: (@iconMargin / 2);
display: table-cell;
}
/* Only One */
.ui.header .icon:only-child {
@ -65,26 +72,22 @@
margin-right: (@iconMargin / 2);
vertical-align: baseline;
}
/*--------------
Content
---------------*/
.ui.header .content {
display: inline-block;
vertical-align: @contentAlignment;
}
.ui.header .icon + .content {
vertical-align: @contentIconAlignment;
}
/* Positioning */
.ui.header:first-child {
margin-top: @firstMargin;
}
.ui.header:last-child {
margin-bottom: @lastMargin;
}
.ui.header + p {
margin-top: @nextParagraphTopMargin;
.ui.header > .icon + .content {
padding-left: (@iconMargin / 2);
display: table-cell;
vertical-align: @contentIconAlignment;
}
/*--------------
Content Heading
---------------*/
@ -116,11 +119,39 @@
vertical-align: @labelVerticalAlign;
}
/* Positioning */
.ui.header + p {
margin-top: @nextParagraphDistance;
}
/*******************************
Types
*******************************/
/*--------------
Page
---------------*/
h1.ui.header {
font-size: @h1;
}
h2.ui.header {
font-size: @h2;
}
h3.ui.header {
font-size: @h3;
}
h4.ui.header {
font-size: @h4;
}
h5.ui.header {
font-size: @h5;
}
/*-------------------
Icon
--------------------*/

2
src/themes/bookish/elements/header.overrides

@ -2,7 +2,7 @@
Overrides
*******************************/
@import url(http://fonts.googleapis.com/css?family=Libre+Baskerville);
@import url(http://fonts.googleapis.com/css?family=Karma);
h1.ui.header,
.ui.huge.header {

2
src/themes/bookish/elements/header.variables

@ -2,7 +2,7 @@
Header
--------------------*/
@pageFont : 'Libre Baskerville', serif;
@headerFont : 'Karma', 'Times New Roman', serif;
@fontWeight: normal;
@iconSize: 1.5em;

2
src/themes/chubby/elements/header.variables

@ -2,7 +2,7 @@
Header
--------------------*/
@pageFont : Source Sans Pro, Helvetica Neue, Helvetica, Arial, sans-serif;
@headerFont : 'Source Sans Pro', Helvetica Neue, Helvetica, Arial, sans-serif;
@fontWeight: bold;
@textTransform: none;

2
src/themes/classic/elements/header.variables

@ -6,5 +6,7 @@
Element
--------------------*/
@headerFont: 'Open Sans', Arial, sans-serif;
@blockBackground: @offWhite @subtleGradient;
@blockBoxShadow: @subtleShadow;

3
src/themes/default/elements/header.variables

@ -7,6 +7,7 @@
--------------------*/
@textTransform: none;
@fontFamily: @headerFont;
@fontWeight: @headerFontWeight;
@lineHeight: @headerLineHeight;
@lineHeightOffset: @headerLineHeightOffset;
@ -48,7 +49,7 @@
@contentIconAlignment: middle;
/* Paragraph after Header */
@nextParagraphTopMargin: 0em;
@nextParagraphDistance: 0em;
/*-------------------
Variations

Loading…
Cancel
Save