From 4a1c2018bdbbca68e7c838b9439d6268cb8a2579 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Mon, 26 May 2014 19:59:39 +0400
Subject: [PATCH] Firefox fixes
---
app/css/app.css | 15 ++++++++++++---
app/js/controllers.js | 4 +++-
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/app/css/app.css b/app/css/app.css
index 36d81933..a32e6dbf 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -2535,7 +2535,8 @@ img.chat_modal_participant_photo {
.tg_range_wrap {
line-height: 18px;
}
-input.tg_range {
+input.tg_range,
+input.tg_range::-moz-range-track {
cursor: pointer;
outline: none !important;
-webkit-appearance: none;
@@ -2543,15 +2544,14 @@ input.tg_range {
max-width: 362px;
display: inline-block;
background: #c7c7c7;
- margin: 0;
height: 3px;
line-height: 18px;
vertical-align: top;
margin: 8px 0;
border-radius: 2px;
}
-
input.tg_range::-webkit-slider-thumb {
+ border: 0;
-webkit-appearance: none;
background: #568cb5;
width: 12px;
@@ -2560,6 +2560,15 @@ input.tg_range::-webkit-slider-thumb {
overflow: hidden;
}
+input.tg_range::-moz-range-thumb {
+ border: 0;
+ background: #568cb5;
+ width: 12px;
+ height: 12px;
+ border-radius: 6px;
+ overflow: hidden;
+}
+
.icon-volume-outer {
display: inline-block;
background: #c7c7c7;
diff --git a/app/js/controllers.js b/app/js/controllers.js
index 152a37df..ad99b07e 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -1491,8 +1491,10 @@ angular.module('myApp.controllers', [])
if (settings[1]) {
$scope.notify.volume = 0;
- } else {
+ } else if (settings[3] !== false) {
$scope.notify.volume = settings[3] > 0 && Math.ceil(settings[3] * 10) || 0;
+ } else {
+ $scope.notify.volume = 5;
}
$scope.notify.volumeOf4 = function () {