Skip to content

Commit

Permalink
geophystech#313 Исправлен баг с установкой фильтра по магнитуде.
Browse files Browse the repository at this point in the history
  • Loading branch information
Arman Badalyan committed Jan 17, 2019
1 parent 80db090 commit b6f8bb5
Show file tree
Hide file tree
Showing 8 changed files with 421 additions and 269 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ module.exports = {
'func-call-spacing': 0,
'keyword-spacing': 0,
'spaced-comment': 0,
'no-extra-bind': 0
'no-extra-bind': 0,
"no-new": 0
}
}
3 changes: 3 additions & 0 deletions src/assets/scss/_mixins.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "mixins/keyframes";
@import "mixins/animation";
@import "mixins/calc";
37 changes: 37 additions & 0 deletions src/assets/scss/main.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@

@import "~bootstrap/scss/mixins";
@import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables";
@import "variables";
@import "mixins";

@import "~bootstrap/scss/utilities/text";



@include keyframes(fadeOut) {
0% { opacity: 1 }
100% { opacity: 0; display: none }
}


@mixin fadeOut()
{
@include animation(fadeOut 250ms linear);
animation-fill-mode: both;
}


body {
font-family: 'Open Sans', sans-serif !important;
Expand All @@ -17,6 +38,22 @@ a {
color: $color-blue;
}

.fade:not(.hidden) {
transition: none;
opacity: 1;
}

.hidden
{
&:not(.fade) {
display: none !important;
}

&.fade {
@include fadeOut();
}
}

.static-page-content
{
/* Static page */
Expand Down
6 changes: 6 additions & 0 deletions src/assets/scss/mixins/_animation.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@mixin animation($props...)
{
@each $prefix in -webkit-, -moz-, -ms-, -o-, '' {
#{$prefix}animation: $props;
}
}
6 changes: 3 additions & 3 deletions src/assets/scss/mixins/_calc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
#{$prop}: $default;

@each $pre in -webkit-, -moz-, -o-, '' {
#{$prop}: #{$pre}calc(#{$val});
@each $prefix in -webkit-, -moz-, -o-, '' {
#{$prop}: #{$prefix}calc(#{$val});
}
}
}
8 changes: 8 additions & 0 deletions src/assets/scss/mixins/_keyframes.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@mixin keyframes($name)
{
@-webkit-keyframes #{$name} { @content; }
@-moz-keyframes #{$name} { @content; }
@-ms-keyframes #{$name} { @content; }
@-o-keyframes #{$name} { @content; }
@keyframes #{$name} { @content; }
}
8 changes: 5 additions & 3 deletions src/components/Events.vue
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ export default {
this.$http.get(this.$root.$options.settings.api.endpointEvents, { params: params })
.then(response => {
this.spinners.loadMoreEvents = false
this.disabledFilters = false
if (typeof filtersData === 'object') {
this.events = response.data.data
Expand All @@ -140,11 +142,11 @@ export default {
this.endDate = this.$moment(this.events[0].locValues.data.event_datetime).format('L')
})
.catch(error => {
console.log(error)
this.$refs.filters.setErrors(error.response.data.errors.data)
this.spinners.loadMoreEvents = false
this.disabledFilters = false
})
this.disabledFilters = false
}
if (this._getEventsTimeout) clearTimeout(this._getEventsTimeout)
Expand Down
Loading

0 comments on commit b6f8bb5

Please sign in to comment.