From bca3ecf6f144a6bb1b6a748591ddb2b92dc8464b Mon Sep 17 00:00:00 2001 From: Varunram Date: Thu, 15 Mar 2018 11:00:55 +0530 Subject: [PATCH 1/4] Fix #25706: Update vertical pills example --- docs/4.0/components/navs.md | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/docs/4.0/components/navs.md b/docs/4.0/components/navs.md index ed6e0a178c6c..201b4ff5cb09 100644 --- a/docs/4.0/components/navs.md +++ b/docs/4.0/components/navs.md @@ -479,17 +479,25 @@ And with vertical pills. {% highlight html %} - -
-
...
-
...
-
...
-
...
+
+
+
+ +
+
+
+
...
+
...
+
...
+
...
+
+
+
{% endhighlight %} From 52051fc97b51afe00b3b29e7c2ba4777118aa502 Mon Sep 17 00:00:00 2001 From: Varunram Date: Fri, 16 Mar 2018 08:32:06 +0530 Subject: [PATCH 2/4] Remove outer div --- docs/4.0/components/navs.md | 44 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/docs/4.0/components/navs.md b/docs/4.0/components/navs.md index 201b4ff5cb09..5b0442de7366 100644 --- a/docs/4.0/components/navs.md +++ b/docs/4.0/components/navs.md @@ -449,30 +449,28 @@ The tabs plugin also works with pills. And with vertical pills. -
-
-
- +
+
+ -
-
-
-

Cillum ad ut irure tempor velit nostrud occaecat ullamco aliqua anim Lorem sint. Veniam sint duis incididunt do esse magna mollit excepteur laborum qui. Id id reprehenderit sit est eu aliqua occaecat quis et velit excepteur laborum mollit dolore eiusmod. Ipsum dolor in occaecat commodo et voluptate minim reprehenderit mollit pariatur. Deserunt non laborum enim et cillum eu deserunt excepteur ea incididunt minim occaecat.

-
-
-

Culpa dolor voluptate do laboris laboris irure reprehenderit id incididunt duis pariatur mollit aute magna pariatur consectetur. Eu veniam duis non ut dolor deserunt commodo et minim in quis laboris ipsum velit id veniam. Quis ut consectetur adipisicing officia excepteur non sit. Ut et elit aliquip labore Lorem enim eu. Ullamco mollit occaecat dolore ipsum id officia mollit qui esse anim eiusmod do sint minim consectetur qui.

-
-
-

Fugiat id quis dolor culpa eiusmod anim velit excepteur proident dolor aute qui magna. Ad proident laboris ullamco esse anim Lorem Lorem veniam quis Lorem irure occaecat velit nostrud magna nulla. Velit et et proident Lorem do ea tempor officia dolor. Reprehenderit Lorem aliquip labore est magna commodo est ea veniam consectetur.

-
-
-

Eu dolore ea ullamco dolore Lorem id cupidatat excepteur reprehenderit consectetur elit id dolor proident in cupidatat officia. Voluptate excepteur commodo labore nisi cillum duis aliqua do. Aliqua amet qui mollit consectetur nulla mollit velit aliqua veniam nisi id do Lorem deserunt amet. Culpa ullamco sit adipisicing labore officia magna elit nisi in aute tempor commodo eiusmod.

-
+
+
+
+
+

Cillum ad ut irure tempor velit nostrud occaecat ullamco aliqua anim Lorem sint. Veniam sint duis incididunt do esse magna mollit excepteur laborum qui. Id id reprehenderit sit est eu aliqua occaecat quis et velit excepteur laborum mollit dolore eiusmod. Ipsum dolor in occaecat commodo et voluptate minim reprehenderit mollit pariatur. Deserunt non laborum enim et cillum eu deserunt excepteur ea incididunt minim occaecat.

+
+
+

Culpa dolor voluptate do laboris laboris irure reprehenderit id incididunt duis pariatur mollit aute magna pariatur consectetur. Eu veniam duis non ut dolor deserunt commodo et minim in quis laboris ipsum velit id veniam. Quis ut consectetur adipisicing officia excepteur non sit. Ut et elit aliquip labore Lorem enim eu. Ullamco mollit occaecat dolore ipsum id officia mollit qui esse anim eiusmod do sint minim consectetur qui.

+
+
+

Fugiat id quis dolor culpa eiusmod anim velit excepteur proident dolor aute qui magna. Ad proident laboris ullamco esse anim Lorem Lorem veniam quis Lorem irure occaecat velit nostrud magna nulla. Velit et et proident Lorem do ea tempor officia dolor. Reprehenderit Lorem aliquip labore est magna commodo est ea veniam consectetur.

+
+
+

Eu dolore ea ullamco dolore Lorem id cupidatat excepteur reprehenderit consectetur elit id dolor proident in cupidatat officia. Voluptate excepteur commodo labore nisi cillum duis aliqua do. Aliqua amet qui mollit consectetur nulla mollit velit aliqua veniam nisi id do Lorem deserunt amet. Culpa ullamco sit adipisicing labore officia magna elit nisi in aute tempor commodo eiusmod.

From 216b0ec4f1ffb0ca546e15b68fb0ef12a164f36a Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Fri, 16 Mar 2018 10:36:39 +0000 Subject: [PATCH 3/4] Put the `
` on live code, remove from highlighted code sample --- docs/4.0/components/navs.md | 64 ++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/docs/4.0/components/navs.md b/docs/4.0/components/navs.md index 5b0442de7366..00368bda3c79 100644 --- a/docs/4.0/components/navs.md +++ b/docs/4.0/components/navs.md @@ -448,35 +448,6 @@ The tabs plugin also works with pills. {% endhighlight %} And with vertical pills. - -
-
- -
-
-
-
-

Cillum ad ut irure tempor velit nostrud occaecat ullamco aliqua anim Lorem sint. Veniam sint duis incididunt do esse magna mollit excepteur laborum qui. Id id reprehenderit sit est eu aliqua occaecat quis et velit excepteur laborum mollit dolore eiusmod. Ipsum dolor in occaecat commodo et voluptate minim reprehenderit mollit pariatur. Deserunt non laborum enim et cillum eu deserunt excepteur ea incididunt minim occaecat.

-
-
-

Culpa dolor voluptate do laboris laboris irure reprehenderit id incididunt duis pariatur mollit aute magna pariatur consectetur. Eu veniam duis non ut dolor deserunt commodo et minim in quis laboris ipsum velit id veniam. Quis ut consectetur adipisicing officia excepteur non sit. Ut et elit aliquip labore Lorem enim eu. Ullamco mollit occaecat dolore ipsum id officia mollit qui esse anim eiusmod do sint minim consectetur qui.

-
-
-

Fugiat id quis dolor culpa eiusmod anim velit excepteur proident dolor aute qui magna. Ad proident laboris ullamco esse anim Lorem Lorem veniam quis Lorem irure occaecat velit nostrud magna nulla. Velit et et proident Lorem do ea tempor officia dolor. Reprehenderit Lorem aliquip labore est magna commodo est ea veniam consectetur.

-
-
-

Eu dolore ea ullamco dolore Lorem id cupidatat excepteur reprehenderit consectetur elit id dolor proident in cupidatat officia. Voluptate excepteur commodo labore nisi cillum duis aliqua do. Aliqua amet qui mollit consectetur nulla mollit velit aliqua veniam nisi id do Lorem deserunt amet. Culpa ullamco sit adipisicing labore officia magna elit nisi in aute tempor commodo eiusmod.

-
-
-
-
- -{% highlight html %}
@@ -489,14 +460,41 @@ And with vertical pills.
-
...
-
...
-
...
-
...
+
+

Cillum ad ut irure tempor velit nostrud occaecat ullamco aliqua anim Lorem sint. Veniam sint duis incididunt do esse magna mollit excepteur laborum qui. Id id reprehenderit sit est eu aliqua occaecat quis et velit excepteur laborum mollit dolore eiusmod. Ipsum dolor in occaecat commodo et voluptate minim reprehenderit mollit pariatur. Deserunt non laborum enim et cillum eu deserunt excepteur ea incididunt minim occaecat.

+
+
+

Culpa dolor voluptate do laboris laboris irure reprehenderit id incididunt duis pariatur mollit aute magna pariatur consectetur. Eu veniam duis non ut dolor deserunt commodo et minim in quis laboris ipsum velit id veniam. Quis ut consectetur adipisicing officia excepteur non sit. Ut et elit aliquip labore Lorem enim eu. Ullamco mollit occaecat dolore ipsum id officia mollit qui esse anim eiusmod do sint minim consectetur qui.

+
+
+

Fugiat id quis dolor culpa eiusmod anim velit excepteur proident dolor aute qui magna. Ad proident laboris ullamco esse anim Lorem Lorem veniam quis Lorem irure occaecat velit nostrud magna nulla. Velit et et proident Lorem do ea tempor officia dolor. Reprehenderit Lorem aliquip labore est magna commodo est ea veniam consectetur.

+
+
+

Eu dolore ea ullamco dolore Lorem id cupidatat excepteur reprehenderit consectetur elit id dolor proident in cupidatat officia. Voluptate excepteur commodo labore nisi cillum duis aliqua do. Aliqua amet qui mollit consectetur nulla mollit velit aliqua veniam nisi id do Lorem deserunt amet. Culpa ullamco sit adipisicing labore officia magna elit nisi in aute tempor commodo eiusmod.

+
+{% highlight html %} +
+
+ +
+
+
+
...
+
...
+
...
+
...
+
+
+
{% endhighlight %} ### Using data attributes From 5e39101f8ca6e69c61db319b3d41860c0e67c511 Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Fri, 16 Mar 2018 10:37:16 +0000 Subject: [PATCH 4/4] Oops...line breaks --- docs/4.0/components/navs.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/4.0/components/navs.md b/docs/4.0/components/navs.md index 00368bda3c79..86173e9a232a 100644 --- a/docs/4.0/components/navs.md +++ b/docs/4.0/components/navs.md @@ -448,6 +448,7 @@ The tabs plugin also works with pills. {% endhighlight %} And with vertical pills. +
@@ -476,6 +477,7 @@ And with vertical pills.
+ {% highlight html %}