Browse Source

Improved toastr styles.

pull/156/head
Simon Eisenmann 11 years ago
parent
commit
238712ca97
  1. 49
      src/styles/_shame.scss
  2. 2
      static/css/main.min.css
  3. 4
      static/js/controllers/mediastreamcontroller.js
  4. 3
      static/js/services/toastr.js

49
src/styles/_shame.scss

@ -22,4 +22,53 @@ @@ -22,4 +22,53 @@
// Remove boostrap 3 modal scroll bar.
.modal {
overflow-y: auto;
}
// Toastr fontawesome support.
#toast-container > .toast {
background-image: none !important;
}
#toast-container > .toast:before {
position: fixed;
font-family: FontAwesome;
font-size: 20px;
line-height: 20px;
float: left;
color: #fff;
padding-right: 0.5em;
margin: auto 0.5em auto -1.5em;
}
#toast-container > .toast-warning:before {
content: "\f05a";
}
#toast-container > .toast-error:before {
content: "\f05a";
}
#toast-container > .toast-info:before {
content: "\f05a";
}
#toast-container > .toast-success:before {
content: "\f05a";
}
// No shadows for toastr.
#toast-container > :hover, #toast-container > div {
box-shadow: none !important;
}
// Update colors for toaster.
.toast-info {
background-color: #5bc0de;
}
// Update position of toastr close icon.
.toast-close-button {
top: -0.6em;
font-size: 1em;
}
// No opacity for toastr.
#toast-container > div {
opacity: 1;
filter: alpha(opacity=100);
}

2
static/css/main.min.css vendored

File diff suppressed because one or more lines are too long

4
static/js/controllers/mediastreamcontroller.js

@ -731,12 +731,12 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder @@ -731,12 +731,12 @@ define(['jquery', 'underscore', 'angular', 'bigscreen', 'moment', 'sjcl', 'moder
message = displayName(details.from) + translation._(" does not pick up.");
break;
case "incomingbusy":
toastr.info(moment().format("llll"), displayName(details.from) + translation._(" tried to call you."));
toastr.info(moment().format("lll"), displayName(details.from) + translation._(" tried to call you."));
break;
case "abortbeforepickup":
// Fall through
case "incomingpickuptimeout":
toastr.info(moment().format("llll"), displayName(details.from) + translation._(" called you."));
toastr.info(moment().format("lll"), displayName(details.from) + translation._(" called you."));
break;
}
if (message) {

3
static/js/services/toastr.js

@ -33,7 +33,8 @@ define(['toastr'], function(toastr) { @@ -33,7 +33,8 @@ define(['toastr'], function(toastr) {
"showMethod": "show",
"hideMethod": "hide",
"timeOut": 0,
"extendedTimeOut": 0
"extendedTimeOut": 0,
"closeButton": true
}
return toastr;

Loading…
Cancel
Save