From 11ffc7346b9a26735fe857e9b0794a5c609c1b7b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 31 Mar 2014 01:24:54 -0700 Subject: explicitly doc that icon classes should only be used on empty elements; closes #13240 --- docs/_includes/components/glyphicons.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html index 6900e0dfa..0f932f45c 100644 --- a/docs/_includes/components/glyphicons.html +++ b/docs/_includes/components/glyphicons.html @@ -21,6 +21,10 @@

Don't mix with other components

Icon classes cannot be directly combined with other components. They should not be used along with other classes on the same element. Instead, add a nested <span> and apply the icon classes to the <span>.

+
+

Only for use on empty elements

+

Icon classes should only be used on elements that contain no text content and have no child elements.

+
{% highlight html %} {% endhighlight %} -- cgit v1.2.3 From 1c19284a38ffc60c3a89bbda0f2f0355cf687417 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 28 Mar 2014 16:54:16 -0700 Subject: doc how to change the collapsed mobile navbar breakpoint; fixes #13126 --- docs/_includes/components/navbar.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/navbar.html b/docs/_includes/components/navbar.html index ab78e5853..8f85b73d1 100644 --- a/docs/_includes/components/navbar.html +++ b/docs/_includes/components/navbar.html @@ -17,6 +17,10 @@

Requires JavaScript

If JavaScript is disabled and the viewport is narrow enough that the navbar collapses, it will be impossible to expand the navbar and view the content within the .navbar-collapse.

+
+

Changing the collapsed mobile navbar breakpoint

+

The navbar collapses into its vertical mobile view when the viewport is narrower than @grid-float-breakpoint, and expands into its horizontal non-mobile view when the viewport is at least @grid-float-breakpoint in width. Adjust this variable in the Less source to control when the navbar collapses/expands. The default value is 768px (the smallest "small" or "tablet" screen).

+