Skip to content

Commit

Permalink
Fix for issues #115 and #159 - Navbar search box and progress ring/bar (
Browse files Browse the repository at this point in the history
#162)

* Added inline-flex for parent of search bar, fix issues in mobile

* Issue # 115 - Progress Bar and Progress Ring
Fixed the progress bar and ring issues, added the center alignment option.
Documentation was updated

* Fixed the documentation of NavBar, Hamburguer icon is not displayed.
Container is not centering the content

* Fixed the documentation of NavBar, changed the overrides to correct file.

* Removed override from incorrect file

* Recompiled optional css

* Fixed documentation of NavBar, chevron icons in blue bar.
  • Loading branch information
codefactorymx authored and mlijanto committed Mar 27, 2018
1 parent 718845a commit 1e96629
Show file tree
Hide file tree
Showing 15 changed files with 50 additions and 18 deletions.
10 changes: 8 additions & 2 deletions dist/css/winstrap-optional.css

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/winstrap-optional.min.css

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions dist/css/winstrap.css

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/winstrap.min.css

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions src/doc/partials/loader.hbs
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
@@ -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
@@ -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
@@ -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
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
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
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
@@ -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
Expand Up @@ -2,6 +2,8 @@
position: relative;
width: 20px;
height: 20px;
text-align: left;
display: inline-block;

.progress-circle {
position: absolute;
Expand Down

0 comments on commit 1e96629

Please sign in to comment.