diff --git a/server/documents/elements/header.html.eco b/server/documents/elements/header.html.eco index 3c8ef94ea..d7b04d5d3 100755 --- a/server/documents/elements/header.html.eco +++ b/server/documents/elements/header.html.eco @@ -7,7 +7,7 @@ type : 'UI Element' element : 'header' elementType : 'element' -themes : ['default', 'bookish'] +themes : ['default', 'bookish', 'chubby'] --- <%- @partial('header') %> diff --git a/server/layouts/default.html.eco b/server/layouts/default.html.eco index 811b665f2..4517d6c64 100755 --- a/server/layouts/default.html.eco +++ b/server/layouts/default.html.eco @@ -28,7 +28,7 @@ - + diff --git a/src/elements/header.less b/src/elements/header.less index b62f63134..aa84ff07a 100755 --- a/src/elements/header.less +++ b/src/elements/header.less @@ -30,6 +30,7 @@ padding: @verticalPadding @horizontalPadding; font-weight: @fontWeight; line-height: @lineHeight; + text-transform: @textTransform; } .ui.header .sub.header { @@ -42,6 +43,7 @@ color: @subHeaderColor; } +/* Icon and Content Together */ .ui.header .icon { display: table-cell; font-size: @iconSize; @@ -50,19 +52,20 @@ 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 { display: inline-block; vertical-align: baseline; } - .ui.header .content { display: inline-block; vertical-align: @contentAlignment; } -.ui.header .icon + .content { - padding-left: (@iconMargin / 2); - display: table-cell; -} /* Positioning */ .ui.header:first-child { @@ -334,7 +337,7 @@ h5.ui.header { --------------------*/ .ui.attached.header { - background: @attachedColor; + background: @attachedBackground; margin: 0em; padding: @attachedVerticalPadding @attachedVerticalPadding; box-shadow: @attachedBoxShadow; diff --git a/src/themes/bookish/elements/header.overrides b/src/themes/bookish/elements/header.overrides index f30c4f55c..ddaf44265 100755 --- a/src/themes/bookish/elements/header.overrides +++ b/src/themes/bookish/elements/header.overrides @@ -2,4 +2,14 @@ Overrides *******************************/ -@import url(http://fonts.googleapis.com/css?family=Libre+Baskerville); \ No newline at end of file +@import url(http://fonts.googleapis.com/css?family=Libre+Baskerville); + +h1.ui.header, +.ui.huge.header { + font-weight: bold; +} + +h2.ui.header, +.ui.large.header { + font-weight: bold; +} \ No newline at end of file diff --git a/src/themes/bookish/elements/header.variables b/src/themes/bookish/elements/header.variables index 928f2f269..b69e411ef 100755 --- a/src/themes/bookish/elements/header.variables +++ b/src/themes/bookish/elements/header.variables @@ -14,11 +14,16 @@ @dividedBorder: 1px dotted rgba(0, 0, 0, 0.2); /* Block Header */ -@blockVerticalPadding: 1.25em; +@blockVerticalPadding: 1.3em; @blockHorizontalPadding: 1em; +/* Attached */ +@attachedBackground: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.03)) repeat scroll 0 0 #F8F8F8; +@attachedVerticalPadding: 1.3; +@attachedHorizontalPadding: 1em; + /* HTML Headings */ -@h1: 1.5rem; +@h1: 1.75rem; @h2: 1.33rem; @h3: 1.33rem; @h4: 1rem; diff --git a/src/themes/chubby/elements/header.overrides b/src/themes/chubby/elements/header.overrides new file mode 100755 index 000000000..51c147b47 --- /dev/null +++ b/src/themes/chubby/elements/header.overrides @@ -0,0 +1,5 @@ +/******************************* + Overrides +*******************************/ + +@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro); diff --git a/src/themes/chubby/elements/header.variables b/src/themes/chubby/elements/header.variables new file mode 100755 index 000000000..9c6e51053 --- /dev/null +++ b/src/themes/chubby/elements/header.variables @@ -0,0 +1,21 @@ +/*------------------- + Header +--------------------*/ + +@fontFamily : Source Sans Pro, Helvetica Neue, Helvetica, Arial, sans-serif; +@fontWeight: bold; +@textTransform: none; + +/* HTML Headings */ +@h1: 1.33rem; +@h2: 1.2rem; +@h3: 1rem; +@h4: 0.9rem; +@h5: 0.8rem; + +/* Sizing */ +@tiny: 1.33em; +@small: 1.2em; +@medium: 1em; +@large: 0.9em; +@huge: 0.8em; \ No newline at end of file diff --git a/src/themes/default/elements/header.overrides b/src/themes/default/elements/header.overrides index c5c53367f..51c147b47 100755 --- a/src/themes/default/elements/header.overrides +++ b/src/themes/default/elements/header.overrides @@ -1,3 +1,5 @@ /******************************* Overrides *******************************/ + +@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro); diff --git a/src/themes/default/elements/header.variables b/src/themes/default/elements/header.variables index 23b04371f..05063fc62 100755 --- a/src/themes/default/elements/header.variables +++ b/src/themes/default/elements/header.variables @@ -20,6 +20,7 @@ @fontFamily : Source Sans Pro, Helvetica Neue, Helvetica, Arial, sans-serif; @fontWeight: bold; +@textTransform: none; @topMargin: 1em; @bottomMargin: 1rem; @@ -87,7 +88,7 @@ @blockVerticalPadding: 0.5em; /* Attached */ -@attachedColor: #F0F0F0; +@attachedBackground: #F0F0F0; @attachedVerticalPadding: 0.75rem; @attachedHorizontalPadding: 1rem; @attachedBoxShadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1);