Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
5d310db4
Commit
5d310db4
authored
4 years ago
by
Martijn Cuppens
Committed by
Mark Otto
4 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Fix mobile menu jump & double border
parent
61b5efba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
site/_includes/docs-sidebar.html
+33
-31
site/_includes/docs-sidebar.html
site/docs/4.5/assets/scss/_sidebar.scss
+2
-8
site/docs/4.5/assets/scss/_sidebar.scss
with
35 additions
and
39 deletions
+35
-39
site/_includes/docs-sidebar.html
+
33
-
31
View file @
5d310db4
...
@@ -5,39 +5,41 @@
...
@@ -5,39 +5,41 @@
</button>
</button>
</form>
</form>
<nav
class=
"collapse bd-links"
id=
"bd-docs-nav"
aria-label=
"Main navigation"
>
<div
class=
"collapse d-md-block row"
id=
"bd-docs-nav"
>
{%- assign page_slug = page.url | split: '/' | last -%}
<nav
class=
"bd-links"
aria-label=
"Main navigation"
>
{%- for group in site.data.nav -%}
{%- assign page_slug = page.url | split: '/' | last -%}
{%- assign link = group.pages | first -%}
{%- for group in site.data.nav -%}
{%- assign link_slug = link.title | slugify -%}
{%- assign link = group.pages | first -%}
{%- assign group_slug = group.title | slugify -%}
{%- assign link_slug = link.title | slugify -%}
{%- assign active = nil -%}
{%- assign group_slug = group.title | slugify -%}
{%- assign active = nil -%}
{%- if page.group == group_slug -%}
{%- if page.group == group_slug -%}
{%- assign active = 'active' -%}
{%- assign active = 'active' -%}
{%- endif -%}
{%- endif -%}
<div
class=
"bd-toc-item{% unless active == nil %} {{ active }}{% endunless %}"
>
<div
class=
"bd-toc-item{% unless active == nil %} {{ active }}{% endunless %}"
>
<a
class=
"bd-toc-link"
href=
"{{ site.baseurl }}/docs/{{ site.docs_version }}/{{ group_slug }}/{{ link_slug }}{% if link_slug %}/{% endif %}"
>
<a
class=
"bd-toc-link"
href=
"{{ site.baseurl }}/docs/{{ site.docs_version }}/{{ group_slug }}/{{ link_slug }}{% if link_slug %}/{% endif %}"
>
{{ group.title }}
{{ group.title }}
</a>
</a>
<ul
class=
"nav bd-sidenav"
>
<ul
class=
"nav bd-sidenav"
>
{%- for doc in group.pages -%}
{%- for doc in group.pages -%}
{%- assign doc_slug = doc.title | slugify -%}
{%- assign doc_slug = doc.title | slugify -%}
{%- assign active = nil -%}
{%- assign active = nil -%}
{%- if page.group == group_slug and page_slug == doc_slug -%}
{%- if page.group == group_slug and page_slug == doc_slug -%}
{%- assign active = 'active bd-sidenav-active' -%}
{%- assign active = 'active bd-sidenav-active' -%}
{%- endif -%}
{%- endif -%}
<li
{%
unless
active =
=
nil
%}
class=
"{{ active }}"
{%
endunless
%}
>
<li
{%
unless
active =
=
nil
%}
class=
"{{ active }}"
{%
endunless
%}
>
<a
href=
"{{ site.baseurl }}/docs/{{ site.docs_version }}/{{ group_slug }}/{{ doc_slug }}/"
>
<a
href=
"{{ site.baseurl }}/docs/{{ site.docs_version }}/{{ group_slug }}/{{ doc_slug }}/"
>
{{ doc.title }}
{{ doc.title }}
</a>
</a>
</li>
</li>
{%- endfor -%}
{%- endfor -%}
</ul>
</ul>
</div>
</div>
{%- endfor -%}
{%- endfor -%}
</nav>
</nav>
</div>
This diff is collapsed.
Click to expand it.
site/docs/4.5/assets/scss/_sidebar.scss
+
2
-
8
View file @
5d310db4
...
@@ -66,10 +66,10 @@
...
@@ -66,10 +66,10 @@
}
}
.bd-links
{
.bd-links
{
width
:
100%
;
padding-top
:
1rem
;
padding-top
:
1rem
;
padding-bottom
:
1rem
;
padding-bottom
:
1rem
;
margin-right
:
-15px
;
border-top
:
1px
solid
rgba
(
0
,
0
,
0
,
.05
);
margin-left
:
-15px
;
@include
media-breakpoint-up
(
md
)
{
@include
media-breakpoint-up
(
md
)
{
@supports
(
position
:
sticky
)
{
@supports
(
position
:
sticky
)
{
...
@@ -77,11 +77,6 @@
...
@@ -77,11 +77,6 @@
overflow-y
:
auto
;
overflow-y
:
auto
;
}
}
}
}
// Override collapse behaviors
@include
media-breakpoint-up
(
md
)
{
display
:
block
!
important
;
}
}
}
.bd-search
{
.bd-search
{
...
@@ -89,7 +84,6 @@
...
@@ -89,7 +84,6 @@
padding
:
1rem
15px
;
padding
:
1rem
15px
;
margin-right
:
-15px
;
margin-right
:
-15px
;
margin-left
:
-15px
;
margin-left
:
-15px
;
border-bottom
:
1px
solid
rgba
(
0
,
0
,
0
,
.05
);
.form-control
:focus
{
.form-control
:focus
{
border-color
:
$bd-purple-bright
;
border-color
:
$bd-purple-bright
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment