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

Jump to bottom

Fix for issues #115 and #159 - Navbar search box and progress ring/ba… #1

Merged
merged 1 commit into from
May 4, 2018
Merged

Fix for issues #115 and #159 - Navbar search box and progress ring/ba… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 2 deletions dist/css/winstrap-optional.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/css/winstrap-optional.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/winstrap-optional.min.css
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions dist/css/winstrap.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/css/winstrap.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/winstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions src/doc/partials/loader.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,14 @@
```
{{/markdown}}

<div class="col-md-24 m-b-sm">
<div class="guidance guidance-usage m-t-xs">
{{#markdown}}
{{> progress-bar-guidance.md}}
{{/markdown}}
</div>
</div>

</div>

</section>
10 changes: 5 additions & 5 deletions src/doc/partials/navbar/navbar-example.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<nav class="navbar navbar-default">
<div class="navbar-global theme-default">
<div class="container-fluid">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
Expand Down Expand Up @@ -68,11 +68,11 @@
</div>

<div class="navbar-local color-accent theme-dark">
<div class="container-fluid">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-2">
<span class="sr-only">Toggle navigation</span>
<i class="icon-hamburger"></i>
<i class="glyph glyph-hamburger"></i>
</button>
<a class="navbar-brand" href="#">Brand</a>
</div>
Expand All @@ -82,7 +82,7 @@
<li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
<li><a href="#">Link</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <i class="icon-flipviewdown"></i></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <i class="glyph glyph-chevron-down-2"></i></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
Expand All @@ -98,7 +98,7 @@
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Link</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <i class="icon-flipviewdown"></i></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <i class="glyph glyph-chevron-down-2"></i></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
Expand Down
1 change: 1 addition & 0 deletions src/doc/partials/progress-bar-guidance.md.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* To center the progress bar, the parent control should have `text-align` to `center`. E.g. `<div style="text-align: center">`.
3 changes: 3 additions & 0 deletions src/doc/partials/progress-ring-guidance.md.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
* The default size is shown in the first example above. Add the `.progress-medium` class to the outer `<div class="progress-ring">` in order to get the medium-sized ring. Add the `.progress-large` class for the large-sized ring.
{{#markdown}}
{{> progress-bar-guidance.md}}
{{/markdown}}
2 changes: 1 addition & 1 deletion src/scss/override/_bootstrap-optional.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@
// @import "bootstrap-sass/assets/stylesheets/bootstrap/carousel";
// Utility classes
@import "bootstrap-sass/assets/stylesheets/bootstrap/utilities";
@import "bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
@import "bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
2 changes: 1 addition & 1 deletion src/scss/override/_bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@
@import "bootstrap-sass/assets/stylesheets/bootstrap/carousel";
// Utility classes
@import "bootstrap-sass/assets/stylesheets/bootstrap/utilities";
@import "bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
@import "bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
5 changes: 5 additions & 0 deletions src/scss/override/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,3 +412,8 @@ $navbar-transition-out: .5s;
}
}
}

// Bootsrap Overrides
.navbar-right > div:first-child {
display: inline-flex
}
3 changes: 2 additions & 1 deletion src/scss/win/_progress-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.progress-bar {
position: relative;
width: 180px;
height: 4px;
float: inherit;
display: inline-block;

.progress-circle {
position: absolute;
Expand Down
2 changes: 2 additions & 0 deletions src/scss/win/_progress-ring.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
position: relative;
width: 20px;
height: 20px;
text-align: left;
display: inline-block;

.progress-circle {
position: absolute;
Expand Down