Skip to content

fix(docs): fixing dropdown trigger icon #301

Merged
merged 2 commits into from
Oct 14, 2019
Merged

fix(docs): fixing dropdown trigger icon #301

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6929055
fix(docs): fixing dropdown trigger icon
Oct 14, 2019
3bcd760
fix(docs): removing classes docs-navbar-version__trigger and docs-nav…
Oct 14, 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
20 changes: 9 additions & 11 deletions packages/docs/src/app/components/navbar/navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,20 @@ $doc-navbar-padding: 10px;
.docs-navbar-dropdown {
min-width: 140px;

&__trigger {
padding: {
left: $doc-navbar-padding;
right: $doc-navbar-padding;
};
}

&_hidden {
visibility: hidden;
}

&__icon { color: inherit; }
}

.docs-navbar-version__trigger,
.docs-navbar-dropdown__trigger {
padding: {
left: $doc-navbar-padding;
right: $doc-navbar-padding;
};
}
}

.color-picker {
Expand Down Expand Up @@ -95,8 +96,5 @@ $doc-navbar-padding: 10px;
}

.color-picker .mc.mc-icon {
margin: {
left: 0;
right: 0;
}
margin-right: 0;
}
7 changes: 3 additions & 4 deletions packages/docs/src/app/components/navbar/navbar.template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<div class="docs-navbar-version">
<button mc-button color="second" class="mc-button mc-button_transparent docs-navbar-version__trigger"
[mcDropdownTriggerFor]="versionDropdown">
<span>Версия</span>
<span class="docs-navbar-version__number" id="versionNumber">{{versionSwitch.currentValue.number}}</span>
Версия {{versionSwitch.currentValue.number}}
<i mc-icon="mc-angle-down-L_16" class="docs-navbar-version__icon"></i>
</button>
<mc-dropdown #versionDropdown="mcDropdown" xPosition="after" class="docs-navbar-version__dropdown">
Expand All @@ -28,7 +27,7 @@
<div class="docs-navbar-dropdown docs-navbar-dropdown_hidden">
<button mc-button color="second" class="mc-button mc-button_transparent docs-navbar-dropdown__trigger"
[mcDropdownTriggerFor]="languageDropdown">
<span>{{languageSwitch.currentValue}}</span>
{{languageSwitch.currentValue}}
<i mc-icon="mc-angle-down-M_16" class="docs-navbar-dropdown__icon"></i>
</button>

Expand All @@ -42,7 +41,7 @@
<div class="docs-navbar-dropdown">
<button mc-button color="second" class="mc-button mc-button_transparent docs-navbar-dropdown__trigger"
[mcDropdownTriggerFor]="themeDropdown">
<span >{{themeSwitch.currentValue.name}}</span>
{{themeSwitch.currentValue.name}}
<i mc-icon="mc-angle-down-M_16" class="docs-navbar-dropdown__icon"></i>
</button>

Expand Down