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/bugs #53, #68 #628

Merged
merged 14 commits into from
Aug 2, 2019
Merged

Fix/bugs #53, #68 #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a2ad316
fix: bug №8, bug №10, bug №16, bug №28, bug №36
AlexanderBoriskin Jul 31, 2019
96b5003
update with latest release
AlexanderBoriskin Jul 31, 2019
a33949a
revert google map changes
AlexanderBoriskin Jul 31, 2019
001fad5
fix: bug №34
AlexanderBoriskin Aug 1, 2019
0cd700b
update with latest release
AlexanderBoriskin Aug 1, 2019
c132661
fix: bug №37 (maps) + popover fix
AlexanderBoriskin Aug 1, 2019
98f4b30
fix: bug №92
AlexanderBoriskin Aug 2, 2019
d1e5ac8
update with latest release
AlexanderBoriskin Aug 2, 2019
352fb32
fix: bug №54, 55, 59, 77, 78
AlexanderBoriskin Aug 2, 2019
1e5dc9e
update with latest release
AlexanderBoriskin Aug 2, 2019
6cefa90
fix: bug №65, 66, 72, 74, 82, 83
AlexanderBoriskin Aug 2, 2019
b895a88
update with latest release
AlexanderBoriskin Aug 2, 2019
9b64494
fix: bug №53, 68
AlexanderBoriskin Aug 2, 2019
762506f
update with latest release
AlexanderBoriskin Aug 2, 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
28 changes: 18 additions & 10 deletions src/components/ui/color-pickers/ColorPickers.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,15 @@
<div class="row">
<div class="flex md12 xs12">
<va-card :title="$t('menu.colorPickers')">
<div class="row">
<div class="flex xs12">
<span
class="title"
:style="{color: this.$themes.primary}"
>
Simple, Slider, Advanced
</span>
</div>
</div>
<div class="row">
<div class="flex xs4 md2">
<div class="vuestic-color-picker-page__top-square">
<span
class="title"
:style="{color: this.$themes.primary}"
>
{{ $t('colorPickers.simple') }}
</span>
<va-color-picker-input
mode="palette"
v-model="topSimpleSquareColor"
Expand All @@ -27,6 +23,12 @@
</div>
<div class="flex xs4 md2">
<div class="vuestic-color-picker-page__top-square">
<span
class="title"
:style="{color: this.$themes.primary}"
>
{{ $t('colorPickers.slider') }}
</span>
<va-color-picker-input
mode="slider"
v-model="topSliderSquareColor"
Expand All @@ -37,6 +39,12 @@
</div>
<div class="flex xs4 md2">
<div class="vuestic-color-picker-page__top-square">
<span
class="title"
:style="{color: this.$themes.primary}"
>
{{ $t('colorPickers.advanced') }}
</span>
<va-color-picker-input
mode="advanced"
v-model="topAdvancedSquareColor"
Expand Down
5 changes: 5 additions & 0 deletions src/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
"primary": "Primary text styles",
"secondary": "Secondary text styles"
},
"colorPickers": {
"simple": "Simple",
"slider": "Slider",
"advanced": "Advanced"
},
"buttons": {
"advanced": "Buttons With Icons",
"size": "Button Sizes",
Expand Down
3 changes: 2 additions & 1 deletion src/vuestic-theme/vuestic-components/va-radio-button/VaRadioButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ export default {
flex-direction: row;

&__icon {
display: flex;
align-items: center;
width: 1.4rem;
height: 1.4rem;
border-radius: 1.8rem;
Expand All @@ -121,7 +123,6 @@ export default {
height: 0.625rem;
border-radius: 1rem;
border: solid 0.35rem;
margin-top: 0.1875rem;
margin-left: 0.1875rem;
}
}
Expand Down