Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve color theme selection for navbars #797

Merged
merged 5 commits into from
Apr 1, 2019
Merged

Improve color theme selection for navbars #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e24e014
Update vue-strap.min.js
luyangkenneth Mar 31, 2019
e453213
Remove redundant .navbar-* classes
luyangkenneth Mar 31, 2019
2dadbdd
docs: Update navbar type and add more examples
luyangkenneth Mar 31, 2019
293043c
tests: Update navbar type
luyangkenneth Mar 31, 2019
0ded524
tests: Remove deprecated placement attribute
luyangkenneth Mar 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions asset/css/markbind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,6 @@ footer {
white-space: normal;
}

.navbar-default .navbar-nav .open .dropdown-menu > li > a,
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
color: #333;
}

.navbar-default .navbar-nav .open .dropdown-menu > .active > a,
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a {
background-color: #337ab7;
}

.navbar-nav .open .dropdown-menu {
background-color: #fff;
}
Expand Down
6 changes: 3 additions & 3 deletions asset/js/vue-strap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/_markbind/headers/header.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<header>
<link rel="stylesheet" href="../css/main.css">
<navbar type="inverse">
<navbar type="dark">
<a slot="brand" href="../index.html" title="Home" class="navbar-brand"><img src="../images/logo-darkbackground.png" height="20" /></a>
<li><a href="../index.html" class="nav-link">HOME</a></li>
<li><a href="../userGuide/index.html" class="nav-link">USER GUIDE</a></li>
Expand Down
111 changes: 99 additions & 12 deletions docs/userGuide/syntax/navBars.mbdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,33 @@ Note: **Navbars** should be placed within a [header file]({{ baseUrl }}/userguid
<span id="code">

```html
<navbar type="inverse">
<navbar type="primary">
<!-- Brand as slot -->
<a slot="brand" href="/" title="Home" class="navbar-brand">MarkBind</a>
<!-- You can use dropdown component -->
<dropdown text="Dropdown" class="nav-link">
<li><a href="#navbar" class="dropdown-item">Option</a></li>
</dropdown>
<!-- For right positioning use slot -->
<li slot="right">
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">Fork...</a>
</li>
</navbar>

<navbar type="dark">
<!-- Brand as slot -->
<a slot="brand" href="/" title="Home" class="navbar-brand">MarkBind</a>
<!-- You can use dropdown component -->
<dropdown text="Dropdown" class="nav-link">
<li><a href="#navbar" class="dropdown-item">Option</a></li>
</dropdown>
<!-- For right positioning use slot -->
<li slot="right">
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">Fork...</a>
</li>
</navbar>

<navbar type="light">
<!-- Brand as slot -->
<a slot="brand" href="/" title="Home" class="navbar-brand">MarkBind</a>
<!-- You can use dropdown component -->
Expand All @@ -25,10 +51,38 @@ Note: **Navbars** should be placed within a [header file]({{ baseUrl }}/userguid
</li>
</navbar>
```

</span>

<span id="output">

<navbar type="inverse">
<navbar type="primary">
<!-- Brand as slot -->
<a slot="brand" href="/" title="Home" class="navbar-brand">MarkBind</a>
<!-- You can use dropdown component -->
<dropdown text="Dropdown" class="nav-link">
<li><a href="#navbar" class="dropdown-item">Option</a></li>
</dropdown>
<!-- For right positioning use slot -->
<li slot="right">
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">Fork...</a>
</li>
</navbar>

<navbar type="dark">
<!-- Brand as slot -->
<a slot="brand" href="/" title="Home" class="navbar-brand">MarkBind</a>
<!-- You can use dropdown component -->
<dropdown text="Dropdown" class="nav-link">
<li><a href="#navbar" class="dropdown-item">Option</a></li>
</dropdown>
<!-- For right positioning use slot -->
<li slot="right">
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">Fork...</a>
</li>
</navbar>

<navbar type="light">
<!-- Brand as slot -->
<a slot="brand" href="/" title="Home" class="navbar-brand">MarkBind</a>
<!-- You can use dropdown component -->
Expand All @@ -37,23 +91,30 @@ Note: **Navbars** should be placed within a [header file]({{ baseUrl }}/userguid
</dropdown>
<!-- For right positioning use slot -->
<li slot="right">
<a href="https://github.com/MarkBind/markbind" class="nav-link" target="_blank">Fork...</a>
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">Fork...</a>
</li>
</navbar>

</span>
</include>

****Options****

Name | Type | Default | Description
Name | Type | Default | Description
--- | --- | --- | ---
type | `String` | `default` | Supports: `inverse`, `default`.
type | `String` | `primary` | Supports: `primary`, `dark`, `light`, `none`.

<box type="tip">

If you wish to further customize your navbar beyond the primary, dark, and light theme colors, specify the `type="none"` attribute and [insert your own custom styles](#inserting-custom-classes-into-components) via the `add-class` attribute.

</box>


<span id="short" class="d-none">

```html
<navbar type="inverse">
<navbar type="primary">
<!-- Brand as slot -->
<a slot="brand" href="/" title="Home" class="navbar-brand">MarkBind</a>
<!-- You can use dropdown component -->
Expand All @@ -62,15 +123,16 @@ type | `String` | `default` | Supports: `inverse`, `default`.
</dropdown>
<!-- For right positioning use slot -->
<li slot="right">
<a href="https://github.com/x/y" target="_blank" class="nav-link">Fork...</a>
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">Fork...</a>
</li>
</navbar>
```

</span>

<span id="examples" class="d-none">

<navbar type="inverse">
<navbar type="primary">
<!-- Brand as slot -->
<a slot="brand" href="/" title="Home" class="navbar-brand">MarkBind</a>
<!-- You can use dropdown component -->
Expand All @@ -79,9 +141,34 @@ type | `String` | `default` | Supports: `inverse`, `default`.
</dropdown>
<!-- For right positioning use slot -->
<li slot="right">
<a href="https://github.com/x/y" class="nav-link" target="_blank">Fork...</a>
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">Fork...</a>
</li>
</navbar><p/>
</navbar>

<navbar type="dark">
<!-- Brand as slot -->
<a slot="brand" href="/" title="Home" class="navbar-brand">MarkBind</a>
<!-- You can use dropdown component -->
<dropdown text="Dropdown" class="nav-link">
<li><a href="#navbar" class="dropdown-item">Option</a></li>
</dropdown>
<!-- For right positioning use slot -->
<li slot="right">
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">Fork...</a>
</li>
</navbar>

<navbar type="light">
<!-- Brand as slot -->
<a slot="brand" href="/" title="Home" class="navbar-brand">MarkBind</a>
<!-- You can use dropdown component -->
<dropdown text="Dropdown" class="nav-link">
<li><a href="#navbar" class="dropdown-item">Option</a></li>
</dropdown>
<!-- For right positioning use slot -->
<li slot="right">
<a href="https://github.com/MarkBind/markbind" target="_blank" class="nav-link">Fork...</a>
</li>
</navbar>

</span>
</include>
</span>
2 changes: 1 addition & 1 deletion test/functional/test_site/_markbind/headers/header.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<header>
<navbar type="inverse">
<navbar type="dark">
<a slot="brand" href="/" title="Home" class="navbar-brand">Markbind Test Site</a>
<li><a class="nav-link" href="{{baseUrl}}/bugs/index.html">Open Bugs</a></li>
</navbar>
Expand Down
4 changes: 2 additions & 2 deletions test/functional/test_site/expected/bugs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<body>
<div id="app">
<header>
<navbar type="inverse">
<navbar type="dark">
<a slot="brand" href="/" title="Home" class="navbar-brand">Markbind Test Site</a>
<li><a class="nav-link" href="/test_site/bugs/index.html">Open Bugs</a></li>
</navbar>
Expand Down Expand Up @@ -109,4 +109,4 @@ <h2 id="remove-extra-space-in-links">Remove extra space in links<a class="fa fa-
</script>
<script src="../markbind/layouts/default/scripts.js"></script>

</html>
</html>
4 changes: 2 additions & 2 deletions test/functional/test_site/expected/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<body data-spy="scroll" data-target="#page-nav" data-offset="100">
<div id="app">
<header>
<navbar type="inverse">
<navbar type="dark">
<a slot="brand" href="/" title="Home" class="navbar-brand">Markbind Test Site</a>
<li><a class="nav-link" href="/test_site/bugs/index.html">Open Bugs</a></li>
</navbar>
Expand Down Expand Up @@ -597,4 +597,4 @@ <h1 id="heading-in-footer-should-not-be-indexed">Heading in footer should not be
</script>
<script src="markbind/layouts/default/scripts.js"></script>

</html>
</html>
10 changes: 0 additions & 10 deletions test/functional/test_site/expected/markbind/css/markbind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,6 @@ footer {
white-space: normal;
}

.navbar-default .navbar-nav .open .dropdown-menu > li > a,
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
color: #333;
}

.navbar-default .navbar-nav .open .dropdown-menu > .active > a,
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a {
background-color: #337ab7;
}

.navbar-nav .open .dropdown-menu {
background-color: #fff;
}
Expand Down
4 changes: 2 additions & 2 deletions test/functional/test_site/expected/testAntiFOUCStyles.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<div id="flex-body">
<div id="content-wrapper">

<navbar placement="top" type="inverse" class="temp-navbar">
<navbar type="dark" class="temp-navbar">
<li><a href="/" class="nav-link">One</a></li>
<li><a href="/" class="nav-link">Two</a></li>
<div class="nav-link temp-dropdown-placeholder">Dropdown</div>
Expand Down Expand Up @@ -82,4 +82,4 @@ <h1 id="filler-text">Filler text<a class="fa fa-anchor" href="#filler-text"></a>
</script>
<script src="markbind/layouts/default/scripts.js"></script>

</html>
</html>
2 changes: 1 addition & 1 deletion test/functional/test_site/testAntiFOUCStyles.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Anti-FOUC styles should be applied to navbar and dropdown in navbar. -->

<navbar placement="top" type="inverse">
<navbar type="dark">
<li><a href="/" class="nav-link">One</a></li>
<li><a href="/" class="nav-link">Two</a></li>
<dropdown text="Dropdown" class="nav-link">
Expand Down
10 changes: 0 additions & 10 deletions test/functional/test_site_algolia_plugin/expected/markbind/css/markbind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,6 @@ footer {
white-space: normal;
}

.navbar-default .navbar-nav .open .dropdown-menu > li > a,
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
color: #333;
}

.navbar-default .navbar-nav .open .dropdown-menu > .active > a,
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a {
background-color: #337ab7;
}

.navbar-nav .open .dropdown-menu {
background-color: #fff;
}
Expand Down