This repository has been archived by the owner on Apr 22, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Switch publish-theme to master version * Add ui-bootstrap 4 to bootstrap-migration layout * Make all buttons text uppercase and fix their box-shadow property * Migrate bulk-order-pad, categories dropdown and search-bar * Remove 'x' in inputs with type 'search' * Fix variables overriding * Fix popover font-size * Create separated scripts bundle for bootstrap v4 * Add ui-bootstrap4 to bower dependencies * Start migrate index page. Carusel * VDS-144: Migrate index page to bootstrap 4 * Remove blogs section * Fix row width in navbar * Fix navbar parts for logged user * Use npm package of ui-bootstrap instead of bower * Fix uppercase class for buttons * Replace custom css for popover border-radius * Remove unused font-size assigments * Fix template for searchBar and remove custom css for dropdown * Stretch searchBar in the header * Fix custom popover sizes * Add folders for custom styles, rename 'custom' to 'override' * Fix nav snippets * Fix categories popover font * Remove redundant code * VP-6270: Add status bages (#142) * VP-6270: Add status badges * VP-6270: Update status badges * v1.6.0 Co-authored-by: Maksim Kopnov <[email protected]> Co-authored-by: Ilia <[email protected]> Co-authored-by: trueboroda <[email protected]> Co-authored-by: Maksim Kopnov <[email protected]>
- Loading branch information
5 people
authored
Dec 10, 2020
1 parent
2258485
commit 34d5ca3
Showing
42 changed files
with
506 additions
and
377 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 23 additions & 16 deletions
39
assets/js/bootstrap-migration/common-components/searchBar.tpl.html.liquid
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,35 @@ | ||
| <form method="get" action="{{ '/search' | absolute_url }}" role="search" autocomplete="off"> | ||
| <div class="input-group" uib-dropdown is-open="$ctrl.hasHint" dropdown-append-to-body="true"> | ||
| <input type="search" name="q" class="form-control border-top-0 border-left-0 border-right-0 border-gray-900 navbar-search-bar" ng-model="$ctrl.query" placeholder="{% raw %}{{ $ctrl.placeholder }}{% endraw %}" | ||
| <input type="search" name="q" class="form-control h-auto border-top-0 border-left-0 border-right-0 border-gray-900" ng-model="$ctrl.query" placeholder="{% raw %}{{ $ctrl.placeholder }}{% endraw %}" | ||
| uib-typeahead="suggestion as suggestion.name for suggestion in $ctrl.getSuggestions()" typeahead-is-open="$ctrl.isOpen" typeahead-wait-ms="100" typeahead-loading="$ctrl.isSearching" typeahead-no-results="$ctrl.hasNoResults" | ||
| typeahead-focus-first="false" typeahead-template-url="search-bar-match.tpl" typeahead-popup-template-url="search-bar-popup.tpl" typeahead-append-to-body="true"> | ||
| <ul class="dropdown-menu" uib-dropdown-menu> | ||
| <li class="disabled" ng-show="$ctrl.isSearching"><a href="" ng-bind="$ctrl.searching"></a></li> | ||
| <li class="disabled" ng-show="$ctrl.hasNoResults"><a href="" ng-bind="$ctrl.noResults"></a></li> | ||
| </ul> | ||
| <div class="dropdown-menu" uib-dropdown-menu> | ||
| <a class="dropdown-item disabled" ng-show="$ctrl.isSearching" href="" ng-bind="$ctrl.searching" tabindex="-1" aria-disabled="true"></a> | ||
| <a class="dropdown-item disabled" ng-show="$ctrl.hasNoResults" href="" ng-bind="$ctrl.noResults" tabindex="-1" aria-disabled="true"></a> | ||
| </div> | ||
| <span class="input-group-append"> | ||
| <button type="submit" class="btn btn-primary rounded-0 border-top-0 border-left-0 border-right-0 border-bottom border-gray-900 px-3 py-2" ng-bind="$ctrl.submitLabel"></button> | ||
| <button type="submit" class="btn btn-primary rounded-0 border-top-0 border-left-0 border-right-0 border-bottom border-gray-900 px-3 py-3" ng-bind="$ctrl.submitLabel"></button> | ||
| </span> | ||
| </div> | ||
| <script id="search-bar-match.tpl" type="text/ng-template"> | ||
| <a ng-href="{% raw %}{{ match.model.url }}{% endraw %}" | ||
| tabindex="-1" | ||
| ng-bind-html="match.label | uibTypeaheadHighlight:query" | ||
| ng-attr-title="{{match.label}}"></a> | ||
| <span ng-bind-html="match.label | uibTypeaheadHighlight:query"></span> | ||
| </script> | ||
| <script id="search-bar-popup.tpl" type="text/ng-template"> | ||
| <ul class="dropdown-menu" ng-show="isOpen() && !moveInProgress" ng-style="{top: position().top+'px', left: position().left+'px'}" role="listbox" aria-hidden="{% raw %}{{!isOpen()}}{% endraw %}"> | ||
| <li class="dropdown-header" ng-repeat-start="(group, groupMatches) in matches | groupBy: 'model.within'" ng-bind="$parent.$parent.$ctrl[group + 'Label']"></li> | ||
| <li class="uib-typeahead-match" ng-repeat="match in groupMatches track by $index" ng-repeat-end ng-class="{active: isActive(match.model.index) }" ng-mouseenter="selectActive(match.model.index)" ng-click="selectMatch(match.model.index, $event)" role="option" id="{% raw %}{{::match.id}}{% endraw %}"> | ||
| <div uib-typeahead-match index="match.model.index" match="match" query="query" template-url="templateUrl"></div> | ||
| </li> | ||
| </ul> | ||
| <div class="dropdown-menu" ng-show="isOpen() && !moveInProgress" ng-style="{top: position().top+'px', left: position().left+'px'}" role="listbox" aria-hidden="{% raw %}{{!isOpen()}}{% endraw %}"> | ||
| <h6 class="dropdown-header text-helvetica font-weight-normal" ng-repeat-start="(group, groupMatches) in matches | groupBy: 'model.within'" ng-bind="$parent.$parent.$ctrl[group + 'Label']"></h6> | ||
| <a ng-repeat="match in groupMatches track by $index" | ||
| id="{% raw %}{{::match.id}}{% endraw %}" | ||
| class="uib-typeahead-match dropdown-item font-weight-normal text-wrap" | ||
| ng-class="{active: isActive(match.model.index) }" | ||
| ng-href="{% raw %}{{ match.model.url }}{% endraw %}" | ||
| ng-mouseenter="selectActive(match.model.index)" | ||
| ng-click="selectMatch(match.model.index, $event)" | ||
| role="option" | ||
| tabindex="-1" | ||
| ng-repeat-end | ||
| ng-attr-title="{{match.label}}"> | ||
| <span uib-typeahead-match index="match.model.index" match="match" query="query" template-url="templateUrl"></span> | ||
| </a> | ||
| </div> | ||
| </script> | ||
| </form> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,2 @@ | ||
| @import "custom/variables"; | ||
| @import "custom/utilities/border"; | ||
| @import "custom/popover"; | ||
| @import "custom/navbar"; | ||
| @import "custom/type"; | ||
| @import "custom/scaffolding"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| $theme-colors: (); | ||
|
|
||
| $grid-breakpoints: ( | ||
| xs: 0, | ||
| sm: 576px, | ||
| md: 768px, | ||
| lg: 992px, | ||
| xl: 1200px, | ||
| ); | ||
|
|
||
| $container-max-widths: ( | ||
| sm: 540px, | ||
| md: 720px, | ||
| lg: 960px, | ||
| xl: 1140px, | ||
| ); | ||
|
|
||
| $font-weight-bold: 700; | ||
| $white: #fff; | ||
| $body-bg: $white; | ||
| $black: #000; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,21 @@ | ||
| $theme-colors: ( | ||
| "primary": $primary, | ||
| "secondary": $secondary, | ||
| "success": $success, | ||
| "info": $info, | ||
| "warning": $warning, | ||
| "danger": $danger, | ||
| "gray-900": $gray-900 | ||
| $theme-colors: map-merge( | ||
| $theme-colors, | ||
| ( | ||
| 'gray-900': $gray-900, | ||
| 'gray-200': $gray-200, | ||
| ) | ||
| ); | ||
|
|
||
| $grid-breakpoints: map-merge($grid-breakpoints, (xxl: 1335px)); | ||
| $container-max-widths: map-merge($container-max-widths, (xxl: 1336px)); | ||
| $grid-breakpoints: map-merge( | ||
| $grid-breakpoints, | ||
| ( | ||
| xxl: 1335px, | ||
| ) | ||
| ); | ||
|
|
||
| $container-max-widths: map-merge( | ||
| $container-max-widths, | ||
| ( | ||
| xxl: 1336px, | ||
| ) | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| @import "override/variables"; | ||
| @import "override/utilities/border"; | ||
| @import "override/type"; | ||
| @import "override/scaffolding"; | ||
| @import "override/forms"; | ||
| @import "override/buttons"; | ||
| @import "override/dropdowns"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,10 @@ | ||
| .navbar-search-bar { | ||
| min-height: 3.25rem; | ||
| font-size: $font-size-base; | ||
| .navbar-dark { | ||
| li.active > { | ||
| a, | ||
| a:focus, | ||
| a:hover { | ||
| color: $body-color !important; | ||
| background-color: $gray-200; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| .popover { | ||
| &.hide-arrow { | ||
| .arrow { | ||
| display: none; | ||
| } | ||
| } | ||
|
|
||
| .bulk-order-popover { | ||
| li { | ||
| & > a { | ||
| color: $secondary; | ||
| &:hover, | ||
| &:focus { | ||
| color: $body-color; | ||
| } | ||
| } | ||
|
|
||
| &.active { | ||
| border-bottom: 3px solid $primary; | ||
| & > { | ||
| a, | ||
| a:hover, | ||
| a:focus { | ||
| color: $body-color; | ||
| background: none; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .all-products-popover { | ||
| li > a { | ||
| color: $body-color; | ||
| &:focus, | ||
| &:hover { | ||
| color: $primary; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .popover-category:nth-child(odd):not(:last-child) { | ||
| border-right: 1px solid $gray-300; | ||
| } | ||
| } | ||
|
|
||
| #all-products-popover + .popover { | ||
| max-width: 450px; | ||
| } | ||
|
|
||
| #bulk-order-popover + .popover { | ||
| max-width: 305px; | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| @import "bootstrap/scss/functions"; | ||
| @import "bootstrap/scss/variables"; | ||
| @import "default-variables"; | ||
| @import "variables"; | ||
| @import "maps"; | ||
| @import "bootstrap/scss/bootstrap"; | ||
| @import "override"; | ||
| @import "custom"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .btn:not(.btn-link) { | ||
| text-transform: uppercase; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .dropdown-toggle::after { | ||
| display: none; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| .form-control { | ||
| box-shadow: none; | ||
|
|
||
| &:focus { | ||
| box-shadow: 0 0 0 1px $input-focus-border-color inset; | ||
| } | ||
| } | ||
|
|
||
| // Remove arrows/spinners from input with type="number" | ||
|
|
||
| /* Chrome, Safari, Edge, Opera */ | ||
| input::-webkit-outer-spin-button, | ||
| input::-webkit-inner-spin-button { | ||
| -webkit-appearance: none; | ||
| margin: 0; | ||
| } | ||
|
|
||
| /* Firefox */ | ||
| input[type='number'] { | ||
| -moz-appearance: textfield; | ||
| } | ||
|
|
||
| // Remove the 'X' in input with type="search | ||
|
|
||
| /* Chrome */ | ||
| input[type='search']::-webkit-search-decoration, | ||
| input[type='search']::-webkit-search-cancel-button, | ||
| input[type='search']::-webkit-search-results-button, | ||
| input[type='search']::-webkit-search-results-decoration { | ||
| display: none; | ||
| } | ||
|
|
||
| // Remove button-border from input-group buttons, so they are aligned with inputs | ||
| // (because input height calculation doesn't take into account the width of the button border) | ||
| .input-group-append { | ||
| .btn { | ||
| border-width: 0; | ||
| } | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| .list-inline.list-divider { | ||
| > li:not(:last-child) { | ||
| margin-right: 0; | ||
| } | ||
| > li:not(:first-child)::before { | ||
| content: '\FF5C'; // 1px width full height vertical line | ||
| opacity: (1/3); | ||
| } | ||
| } | ||
|
|
||
| .text-condensed { | ||
| font-family: $font-family-condensed !important; | ||
| } | ||
|
|
||
| .text-helvetica { | ||
| font-family: $font-family-sans-serif !important; | ||
| } | ||
|
|
||
| .h2, | ||
| .h3, | ||
| .h4, | ||
| h2, | ||
| h3, | ||
| h4 { | ||
| text-transform: uppercase; | ||
| } |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.