diff --git a/.meteor/versions b/.meteor/versions index 0f5574a..d7079c6 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -41,7 +41,7 @@ mobile-status-bar@1.0.14 modern-browsers@0.1.4 modules@0.13.0 modules-runtime@0.10.3 -mongo@1.6.2 +mongo@1.6.3 mongo-decimal@0.1.1 mongo-dev-server@1.1.0 mongo-id@1.0.7 diff --git a/client/imports/app/radio/radio-control/radio-control.component.html b/client/imports/app/radio/radio-control/radio-control.component.html index 62c784e..52b2bff 100644 --- a/client/imports/app/radio/radio-control/radio-control.component.html +++ b/client/imports/app/radio/radio-control/radio-control.component.html @@ -24,6 +24,7 @@ +
diff --git a/client/imports/app/radio/radio-display/radio-display.component.ts b/client/imports/app/radio/radio-display/radio-display.component.ts index a6619ed..3408eb5 100644 --- a/client/imports/app/radio/radio-display/radio-display.component.ts +++ b/client/imports/app/radio/radio-display/radio-display.component.ts @@ -67,10 +67,10 @@ export class AppRadioDisplayComponent implements OnDestroy, OnInit { private _handleRadioTimeEvent(event: RadioEvent): void { if ('time' in event) { const currentFreq = this.currentCall.freqList - .reduce((cur: RadioCallFreq, freq: RadioCallFreq) => freq.pos <= event.time ? freq : cur, null); + .reduce((cur: RadioCallFreq, freq: RadioCallFreq) => freq.pos < event.time ? freq : cur, null); const currentSrc = this.currentCall.srcList - .reduce((cur: RadioCallSrc, src: RadioCallSrc) => src.pos <= event.time ? src : cur, null); + .reduce((cur: RadioCallSrc, src: RadioCallSrc) => src.pos < event.time ? src : cur, null); const currentError = currentFreq && currentFreq.errorCount; const currentFrequency = (currentFreq && currentFreq.freq); diff --git a/client/imports/app/radio/radio-led/radio-led.component.scss b/client/imports/app/radio/radio-led/radio-led.component.scss index 8c6001a..7f84773 100644 --- a/client/imports/app/radio/radio-led/radio-led.component.scss +++ b/client/imports/app/radio/radio-led/radio-led.component.scss @@ -11,6 +11,7 @@ $color-on: rgb(100, 230, 50); background: $color-off; border-radius: 2px; height: 12px; + margin: 6px; width: 24px; &:not(:last-child) { diff --git a/client/imports/app/radio/radio-select/radio-select.component.scss b/client/imports/app/radio/radio-select/radio-select.component.scss index 0dc446a..0cd85e9 100644 --- a/client/imports/app/radio/radio-select/radio-select.component.scss +++ b/client/imports/app/radio/radio-select/radio-select.component.scss @@ -45,4 +45,30 @@ opacity: .8; padding: 0 12px; } +} + +@media (min-width: 720px) { + .radio-button-group { + .radio-button, + .radio-button-none { + width: calc(20% - 8px); + } + + .radio-button-mini { + width: calc(10% - 8px); + } + } +} + +@media (min-width: 1200px) { + .radio-button-group { + .radio-button, + .radio-button-none { + width: calc(10% - 8px); + } + + .radio-button-mini { + width: calc(5% - 8px); + } + } } \ No newline at end of file diff --git a/client/imports/app/radio/radio.component.html b/client/imports/app/radio/radio.component.html index 8210852..1956f93 100644 --- a/client/imports/app/radio/radio.component.html +++ b/client/imports/app/radio/radio.component.html @@ -8,7 +8,7 @@