]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoRephrase text 10338/head
Julian Thilo [Tue, 10 Sep 2013 21:31:57 +0000 (23:31 +0200)] 
Rephrase text

11 years agoFix #10324: Add opt-in note to tooltip docs
Julian Thilo [Sat, 31 Aug 2013 18:43:57 +0000 (20:43 +0200)] 
Fix #10324: Add opt-in note to tooltip docs

* Re-added a note (now callout) about need to opt in to tooltip docs
* Converted same note in popover section to callout

11 years agoMerge pull request #10265 from twbs/fix-10252
Mark Otto [Sat, 31 Aug 2013 06:31:30 +0000 (23:31 -0700)] 
Merge pull request #10265 from twbs/fix-10252

fix #10252 by restricting Android Firefox reset to only .form-control & .btn

11 years agoMerge pull request #10315 from mokkabonna/phantom-cleanup
Chris Rebert [Fri, 30 Aug 2013 19:58:24 +0000 (12:58 -0700)] 
Merge pull request #10315 from mokkabonna/phantom-cleanup

deleted files not used anymore after transition to grunt-contrib-qunit

11 years agodeleted files not used anymore after transition to grunt-contrib-qunit 10315/head
Martin Hansen [Fri, 30 Aug 2013 19:39:48 +0000 (21:39 +0200)] 
deleted files not used anymore after transition to grunt-contrib-qunit

11 years agoMerge pull request #10312 from jleight/master
Chris Rebert [Fri, 30 Aug 2013 19:26:11 +0000 (12:26 -0700)] 
Merge pull request #10312 from jleight/master

Fix broken link to alerts section of JS page.

11 years agoFix broken link to alerts section of JS page. 10312/head
Jonathon Leight [Fri, 30 Aug 2013 19:01:07 +0000 (15:01 -0400)] 
Fix broken link to alerts section of JS page.

Link was pointing to #js-alerts, but that section of the page does not exist. Changed to #alerts instead.

11 years agofix #10292
Chris Rebert [Thu, 29 Aug 2013 23:12:39 +0000 (16:12 -0700)] 
fix #10292

11 years agoMerge pull request #10276 from javiereguiluz/patch-3
Julian Thilo [Thu, 29 Aug 2013 15:30:17 +0000 (08:30 -0700)] 
Merge pull request #10276 from javiereguiluz/patch-3

Correct comment in grid mixin example

11 years ago[doc] minor fix in the LESS mixins example 10276/head
Javier Eguiluz [Thu, 29 Aug 2013 09:51:39 +0000 (11:51 +0200)] 
[doc] minor fix in the LESS mixins example

11 years agofix #10252 by restricting Android Firefox reset to only .form-control & .btn 10265/head
Chris Rebert [Wed, 28 Aug 2013 22:37:34 +0000 (15:37 -0700)] 
fix #10252 by restricting Android Firefox reset to only .form-control & .btn

11 years agoRevert "fix styling of alert-dismissable example"
Chris Rebert [Wed, 28 Aug 2013 21:57:41 +0000 (14:57 -0700)] 
Revert "fix styling of alert-dismissable example"

This reverts commit b3a23fa33a261295ed69adc9fbc75b70bf354962.

11 years agocomponents.html: fix grammar
Chris Rebert [Tue, 27 Aug 2013 18:18:10 +0000 (11:18 -0700)] 
components.html: fix grammar

11 years agofix styling of alert-dismissable example
Chris Rebert [Tue, 27 Aug 2013 18:15:14 +0000 (11:15 -0700)] 
fix styling of alert-dismissable example

11 years agoMerge pull request #10222 from jodytate/upstream
Mark Otto [Tue, 27 Aug 2013 16:15:30 +0000 (09:15 -0700)] 
Merge pull request #10222 from jodytate/upstream

a few wording tweaks

11 years agoa few wording tweaks 10222/head
jody tate [Tue, 27 Aug 2013 16:05:18 +0000 (09:05 -0700)] 
a few wording tweaks

- Changed some existential constructions (yes, they're really called
existential http://en.wikipedia.org/wiki/Existential_clause). These
aren't innately evil, but rewordings of existential clauses often sound
more direct.
- Changed a "which" to a "that."

11 years agoFixes #9928 and #9932: carousel example in IE10
Mark Otto [Tue, 27 Aug 2013 16:10:06 +0000 (09:10 -0700)] 
Fixes #9928 and #9932: carousel example in IE10

* Use absolute positioning instead to remove navbar from flow of
document
* No more negative margin fu
* Flip around padding between container and navbar for proper display
in xs and sm viewports

11 years agofixes #9901
Mark Otto [Tue, 27 Aug 2013 15:53:48 +0000 (08:53 -0700)] 
fixes #9901

11 years agoFixes #10082: document `.navbar-form`
Mark Otto [Tue, 27 Aug 2013 15:34:17 +0000 (08:34 -0700)] 
Fixes #10082: document `.navbar-form`

* Adds new section to navbar docs with example
* Updates example classes for all collapsing navbars so their numbers
increment as you scroll

11 years agoMerge pull request #10131 from andyen/master
Mark Otto [Tue, 27 Aug 2013 15:23:40 +0000 (08:23 -0700)] 
Merge pull request #10131 from andyen/master

correct enable selector for button usage in docs

11 years agoFixes #10088: Simpler nested headings section in accessibility docs
Mark Otto [Tue, 27 Aug 2013 15:19:51 +0000 (08:19 -0700)] 
Fixes #10088: Simpler nested headings section in accessibility docs

* Headings, not headers
* Simplifies content compared to #10088 which adds quite a lot
* Uses proper heading elements (`h1` - `h6`) and not `header`
* Collects links at bottom instead of mid-paragraph

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 27 Aug 2013 15:05:54 +0000 (08:05 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #9991: Better docs for tabbable tabs and fade classes
Mark Otto [Tue, 27 Aug 2013 15:05:26 +0000 (08:05 -0700)] 
Fixes #9991: Better docs for tabbable tabs and fade classes

* Adds full code snippets
* Adds snippet for `.fade`
* Adds callout for `.in` requirement on first fade-able tab

11 years agoMerge pull request #10215 from XhmikosR/master
Mark Otto [Tue, 27 Aug 2013 14:58:49 +0000 (07:58 -0700)] 
Merge pull request #10215 from XhmikosR/master

Various

11 years agoMerge pull request #10208 from javiereguiluz/patch-2
Mark Otto [Tue, 27 Aug 2013 14:50:23 +0000 (07:50 -0700)] 
Merge pull request #10208 from javiereguiluz/patch-2

[doc] tweaked the appearance of the last item of the file listings

11 years agoMerge pull request #10209 from clbn/master
Mark Otto [Tue, 27 Aug 2013 14:43:17 +0000 (07:43 -0700)] 
Merge pull request #10209 from clbn/master

Fixes #10207: alert-dismissable example requires contextual class

11 years agoMerge pull request #10210 from acmetech/master
Julian Thilo [Tue, 27 Aug 2013 14:40:45 +0000 (07:40 -0700)] 
Merge pull request #10210 from acmetech/master

Update the example for components/#btn-groups-justified to match the "Element-specific usage" callout

11 years agoAdd bugs property to package.json. 10215/head
XhmikosR [Tue, 27 Aug 2013 14:21:15 +0000 (17:21 +0300)] 
Add bugs property to package.json.

11 years agoUpdate html5shiv.js to v3.6.2.
XhmikosR [Tue, 27 Aug 2013 14:05:41 +0000 (17:05 +0300)] 
Update html5shiv.js to v3.6.2.

11 years agoUpdate Respond.js to v1.3.0.
XhmikosR [Tue, 27 Aug 2013 13:54:27 +0000 (16:54 +0300)] 
Update Respond.js to v1.3.0.

11 years agoCompress PNG files losslessly.
XhmikosR [Sat, 24 Aug 2013 07:19:29 +0000 (10:19 +0300)] 
Compress PNG files losslessly.

Use zopfli with 1000 iterations, pngout /r with various blocksizes and deflopt.

assets/ico/apple-touch-icon-114-precomposed.png | Bin 2939 -> 2931 bytes
assets/ico/apple-touch-icon-144-precomposed.png | Bin 3614 -> 3549 bytes
assets/ico/apple-touch-icon-57-precomposed.png  | Bin 1577 -> 1573 bytes
assets/ico/favicon.png                          | Bin 889 -> 887 bytes

Total difference: -79 bytes.

11 years agoadd role="button" 10210/head
Tom Pietschker [Tue, 27 Aug 2013 13:46:10 +0000 (09:46 -0400)] 
add  role="button"

11 years agoper the docs - use <a> instead of <button>
Tom Pietschker [Tue, 27 Aug 2013 13:45:38 +0000 (09:45 -0400)] 
per the docs - use <a> instead of <button>

11 years agoFixes #10207: alert-dismissable example requires contextual class 10209/head
Alex Olshansky [Tue, 27 Aug 2013 12:20:14 +0000 (05:20 -0700)] 
Fixes #10207: alert-dismissable example requires contextual class

11 years ago[doc] tweaked the appearance of the last item of the file listings 10208/head
Javier Eguiluz [Tue, 27 Aug 2013 11:24:46 +0000 (13:24 +0200)] 
[doc] tweaked the appearance of the last item of the file listings

11 years agoMerge pull request #10204 from premist/master
Chris Rebert [Tue, 27 Aug 2013 07:17:40 +0000 (00:17 -0700)] 
Merge pull request #10204 from premist/master

Add missing period on customize page.

11 years agoAdd missing period on customize page. 10204/head
Minku Lee [Tue, 27 Aug 2013 06:41:50 +0000 (15:41 +0900)] 
Add missing period on customize page.

11 years agoFixes #10016 and updates that rather badly formatted callout
Mark Otto [Tue, 27 Aug 2013 01:19:31 +0000 (18:19 -0700)] 
Fixes #10016 and updates that rather badly formatted callout

11 years agoImprove upon #9937: Link and put reset column stuff to action in the grid example
Mark Otto [Tue, 27 Aug 2013 00:58:15 +0000 (17:58 -0700)] 
Improve upon #9937: Link and put reset column stuff to action in the grid example

11 years agoAdd margin to thumbnails for proper spacing
Mark Otto [Tue, 27 Aug 2013 00:48:32 +0000 (17:48 -0700)] 
Add margin to thumbnails for proper spacing

Hadn't thought about this until fixes #10137, but it makes sense I
think to have margin on the bottom of thumbnails for spacing when
stacking (or using different grid tiers).

11 years agoFixes #10137: correct classes on thumbnails
Mark Otto [Tue, 27 Aug 2013 00:47:56 +0000 (17:47 -0700)] 
Fixes #10137: correct classes on thumbnails

11 years agoAddress #9873 and fix #9774
Mark Otto [Tue, 27 Aug 2013 00:37:52 +0000 (17:37 -0700)] 
Address #9873 and fix #9774

* Update styling of justified nav links to be more mobile friendly
(with all four rounded corners and some margin between items)
* Add note to docs to callout bogus WebKit rendering on component and
example

11 years agorm inverted navbar search styles
Julian Thilo [Mon, 26 Aug 2013 16:42:03 +0000 (18:42 +0200)] 
rm inverted navbar search styles

11 years agoMerge pull request #10146 from unwiredben/master
Chris Rebert [Mon, 26 Aug 2013 04:36:31 +0000 (21:36 -0700)] 
Merge pull request #10146 from unwiredben/master

javascript.html: add data-ride note

11 years agojavascript.html: add data-ride note 10146/head
Ben Combee [Sun, 25 Aug 2013 19:49:15 +0000 (14:49 -0500)] 
javascript.html: add data-ride note

carousel docs were missing mention of the data-ride attribute
used to automatically start the carousel at load time

11 years agoMerge pull request #10148 from originell/patch-1
Chris Rebert [Sun, 25 Aug 2013 22:01:26 +0000 (15:01 -0700)] 
Merge pull request #10148 from originell/patch-1

Correct Typo

11 years agoCorrect Typo 10148/head
Luis Nell [Sun, 25 Aug 2013 21:58:01 +0000 (23:58 +0200)] 
Correct Typo

11 years agocorrect enable selector for button usage 10131/head
Andreas Jendrzey [Sun, 25 Aug 2013 08:36:53 +0000 (10:36 +0200)] 
correct enable selector for button usage

following the given examples the correct selector to enable the buttons with javascript is ".btn-group".

11 years agoMerge pull request #10129 from pixelchutes/fix-3.0-migration-changes
Mark Otto [Sun, 25 Aug 2013 07:36:03 +0000 (00:36 -0700)] 
Merge pull request #10129 from pixelchutes/fix-3.0-migration-changes

Corrected 3.0 responsive utility class reference mapping when migrating ...

11 years agoCorrected 3.0 responsive utility class reference mapping when migrating from 2.x... 10129/head
Mike Reid [Sun, 25 Aug 2013 06:05:20 +0000 (00:05 -0600)] 
Corrected 3.0 responsive utility class reference mapping when migrating from 2.x (now accounting for new Large device support.) Also synchronized breakpoint values from Grid options > Media queries, for clarity.

11 years agoMerge pull request #10128 from leoj3n/alert-block-remove
Mark Otto [Sun, 25 Aug 2013 04:23:38 +0000 (21:23 -0700)] 
Merge pull request #10128 from leoj3n/alert-block-remove

Fixes #9008: remove `alert-block` class from example

11 years agoFixes #9008: remove `alert-block` class from example 10128/head
Joel Kuzmarski [Sun, 25 Aug 2013 04:01:08 +0000 (23:01 -0500)] 
Fixes #9008: remove `alert-block` class from example

11 years agoupdate raw files (should fix builds)
Mark Otto [Sat, 24 Aug 2013 21:47:58 +0000 (14:47 -0700)] 
update raw files (should fix builds)

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 24 Aug 2013 21:40:36 +0000 (14:40 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #9887: documents show and hide classes
Mark Otto [Sat, 24 Aug 2013 21:40:24 +0000 (14:40 -0700)] 
fixes #9887: documents show and hide classes

11 years agoMerge pull request #10112 from kevinSuttle/button-roles
Mark Otto [Sat, 24 Aug 2013 21:31:33 +0000 (14:31 -0700)] 
Merge pull request #10112 from kevinSuttle/button-roles

Add role="button" to <a> buttons

11 years agogrunt dist on glyphicons width change
Mark Otto [Sat, 24 Aug 2013 20:59:03 +0000 (13:59 -0700)] 
grunt dist on glyphicons width change

11 years agoMerge pull request #9996 from jodytate/master
Mark Otto [Sat, 24 Aug 2013 20:41:24 +0000 (13:41 -0700)] 
Merge pull request #9996 from jodytate/master

changed description of default button

11 years agoAdd even more role="button" attributes 10112/head
Kevin Suttle [Sat, 24 Aug 2013 15:32:23 +0000 (11:32 -0400)] 
Add even more  role="button" attributes

Missed the <a class="btw" in my regex search

11 years agoAdd role="button" to <a> buttons
Kevin Suttle [Sat, 24 Aug 2013 15:16:08 +0000 (11:16 -0400)] 
Add role="button" to <a> buttons

These should really be <button> elements, but until that gets squared away, this will suffice.

11 years agoforgot a pair of buttons
Mark Otto [Sat, 24 Aug 2013 19:30:46 +0000 (12:30 -0700)] 
forgot a pair of buttons

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 24 Aug 2013 19:29:45 +0000 (12:29 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoturn some buttons into <button> elements where possible
Mark Otto [Sat, 24 Aug 2013 18:46:24 +0000 (11:46 -0700)] 
turn some buttons into <button> elements where possible

11 years agoMerge pull request #10103 from hero-m/patch-1
Mark Otto [Sat, 24 Aug 2013 08:33:04 +0000 (01:33 -0700)] 
Merge pull request #10103 from hero-m/patch-1

Another case for Issue #10099

11 years agoAnother case for Issue #10099 10103/head
hero-m [Sat, 24 Aug 2013 07:41:12 +0000 (12:11 +0430)] 
Another case for Issue #10099

Another case for Issue #10099

11 years agoMerge pull request #10059 from felixhirschfeld/patch-1
Mark Otto [Sat, 24 Aug 2013 07:19:37 +0000 (00:19 -0700)] 
Merge pull request #10059 from felixhirschfeld/patch-1

Add mixin for transition-property

11 years agoMerge pull request #10022 from thomaswelton/proposal-glyphicon-block
Mark Otto [Sat, 24 Aug 2013 07:15:34 +0000 (00:15 -0700)] 
Merge pull request #10022 from thomaswelton/proposal-glyphicon-block

Proposal - Fixed width for glypicons

11 years agofixes #9969: add support for output element
Mark Otto [Sat, 24 Aug 2013 07:14:09 +0000 (00:14 -0700)] 
fixes #9969: add support for output element

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 24 Aug 2013 06:59:11 +0000 (23:59 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoRemove footnote links and inline them; link to contributing guidelines in readme
Mark Otto [Sat, 24 Aug 2013 06:58:38 +0000 (23:58 -0700)] 
Remove footnote links and inline them; link to contributing guidelines in readme

11 years agoMerge pull request #9964 from thomaswelton/patch-1
Mark Otto [Sat, 24 Aug 2013 06:52:24 +0000 (23:52 -0700)] 
Merge pull request #9964 from thomaswelton/patch-1

Bower - Added fonts to "main" files

11 years agoMerge branch 'master' of https://github.com/charnog/bootstrap into charnog-master
Mark Otto [Sat, 24 Aug 2013 06:40:12 +0000 (23:40 -0700)] 
Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master

Conflicts:
dist/css/bootstrap.min.css

11 years agofixes #9876: avoid dropdowns in navbar examples to prevent overlap
Mark Otto [Sat, 24 Aug 2013 06:39:11 +0000 (23:39 -0700)] 
fixes #9876: avoid dropdowns in navbar examples to prevent overlap

11 years agofollow up to #9963 and #10005: update docs to use .screen-*-min vars, update customiz...
Mark Otto [Sat, 24 Aug 2013 06:33:16 +0000 (23:33 -0700)] 
follow up to #9963 and #10005: update docs to use .screen-*-min vars, update customizer as well; run grunt to adjust raw files

11 years agogrunt on previous ms scroll fix
Mark Otto [Sat, 24 Aug 2013 06:32:06 +0000 (23:32 -0700)] 
grunt on previous ms scroll fix

11 years agoMerge pull request #10057 from sambowler/patch-1
Mark Otto [Sat, 24 Aug 2013 06:19:05 +0000 (23:19 -0700)] 
Merge pull request #10057 from sambowler/patch-1

Fix responsive table scrolling on Windows Phone 8.

11 years agoMerge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master
Mark Otto [Sat, 24 Aug 2013 06:16:37 +0000 (23:16 -0700)] 
Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master

Conflicts:
dist/css/bootstrap.min.css

11 years agoMerge pull request #10005 from twbs/deprecate-screen-device-vars
Mark Otto [Sat, 24 Aug 2013 06:14:13 +0000 (23:14 -0700)] 
Merge pull request #10005 from twbs/deprecate-screen-device-vars

deprecate @screen-{phone,tablet,desktop} vars

11 years agoMerge branch 'master' into deprecate-screen-device-vars 10005/head
Mark Otto [Sat, 24 Aug 2013 05:56:23 +0000 (22:56 -0700)] 
Merge branch 'master' into deprecate-screen-device-vars

Conflicts:
less/variables.less

11 years agomore specific deprecation comment
Mark Otto [Sat, 24 Aug 2013 05:51:39 +0000 (22:51 -0700)] 
more specific deprecation comment

11 years agoMerge pull request #9963 from twbs/min-breakpoint-naming
Mark Otto [Sat, 24 Aug 2013 05:50:41 +0000 (22:50 -0700)] 
Merge pull request #9963 from twbs/min-breakpoint-naming

rename @screen-XX to @screen-XX-min for clarity+unambiguity

11 years agoMerge pull request #10100 from twbs/document_hide_text
Chris Rebert [Sat, 24 Aug 2013 05:39:26 +0000 (22:39 -0700)] 
Merge pull request #10100 from twbs/document_hide_text

Fixes #10076: Document hide text

11 years agoUse jekyll var for current version in docs; update banner in gruntfile to match ...
Mark Otto [Sat, 24 Aug 2013 05:38:51 +0000 (22:38 -0700)] 
Use jekyll var for current version in docs; update banner in gruntfile to match .less banner

11 years agosplit mixin and grunt dist to be sure 10100/head
Mark Otto [Sat, 24 Aug 2013 05:19:58 +0000 (22:19 -0700)] 
split mixin and grunt dist to be sure

11 years agoDeprecate .hide-text mixin for .text-hide as mixin and class
Mark Otto [Sat, 24 Aug 2013 05:11:41 +0000 (22:11 -0700)] 
Deprecate .hide-text mixin for .text-hide as mixin and class

11 years agoDocument .hide-text and .text-hide
Mark Otto [Sat, 24 Aug 2013 05:01:42 +0000 (22:01 -0700)] 
Document .hide-text and .text-hide

11 years agoRearrange helper classes docs section; add subnav list items to docs side nav
Mark Otto [Sat, 24 Aug 2013 05:00:54 +0000 (22:00 -0700)] 
Rearrange helper classes docs section; add subnav list items to docs side nav

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 24 Aug 2013 04:45:58 +0000 (21:45 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #10095: note about backwards incompatibility
Mark Otto [Sat, 24 Aug 2013 04:45:46 +0000 (21:45 -0700)] 
fixes #10095: note about backwards incompatibility

11 years agoMerge pull request #10098 from wangsai/fix-form
Mark Otto [Sat, 24 Aug 2013 04:34:44 +0000 (21:34 -0700)] 
Merge pull request #10098 from wangsai/fix-form

fix form

11 years agoMerge pull request #10097 from wangsai/complete-td
Mark Otto [Sat, 24 Aug 2013 04:34:25 +0000 (21:34 -0700)] 
Merge pull request #10097 from wangsai/complete-td

complete missed </td>

11 years agofix form 10098/head
wangsai [Sat, 24 Aug 2013 03:39:34 +0000 (11:39 +0800)] 
fix form

11 years agocomplete missed </td> 10097/head
wangsai [Sat, 24 Aug 2013 03:09:33 +0000 (11:09 +0800)] 
complete missed </td>

11 years agoMerge pull request #9931 from realityking/toolbar
Chris Rebert [Fri, 23 Aug 2013 23:19:30 +0000 (16:19 -0700)] 
Merge pull request #9931 from realityking/toolbar

Add role="toolbar" to elements with .btn-toolbar.

11 years agofix #10054; mention .muted -> .text-muted in migration docs
Chris Rebert [Fri, 23 Aug 2013 23:12:24 +0000 (16:12 -0700)] 
fix #10054; mention .muted -> .text-muted in migration docs

11 years agoMerge pull request #9966 from twbs/header-font-size-vars
Mark Otto [Fri, 23 Aug 2013 21:26:40 +0000 (14:26 -0700)] 
Merge pull request #9966 from twbs/header-font-size-vars

add variables for heading font sizes; fixes #9921

11 years agorun grunt 9966/head
Mark Otto [Fri, 23 Aug 2013 21:26:16 +0000 (14:26 -0700)] 
run grunt

11 years agoRun grunt dist on theme for some reason
Mark Otto [Fri, 23 Aug 2013 21:23:13 +0000 (14:23 -0700)] 
Run grunt dist on theme for some reason

11 years agoUpdate and document use of `small` in headings
Mark Otto [Fri, 23 Aug 2013 21:22:51 +0000 (14:22 -0700)] 
Update and document use of `small` in headings

11 years agoMerge branch 'master' into header-font-size-vars
Mark Otto [Fri, 23 Aug 2013 21:00:28 +0000 (14:00 -0700)] 
Merge branch 'master' into header-font-size-vars