diff -u8pdNr 100/chrome/content/calendar-alarm-dialog-overlay.js 110/chrome/content/calendar-alarm-dialog-overlay.js
--- 100/chrome/content/calendar-alarm-dialog-overlay.js	2011-07-14 15:04:19 +0000
+++ 110/chrome/content/calendar-alarm-dialog-overlay.js	2016-08-08 13:20:13 +0000
@@ -1,65 +1,62 @@
-var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                       .getService(Components.interfaces.nsIWindowMediator);
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 var gCheckInterval = 12000;
+var gOpenTime = 6000;
 var gSliderTimeout;
 
 function checkSliderNeed() {
-    let calAlarmWindow = wm.getMostRecentWindow("Calendar:AlarmWindow");
+    let calAlarmWindow = Services.wm.getMostRecentWindow("Calendar:AlarmWindow");
     let alarmRichlist = calAlarmWindow.document.getElementById("alarm-richlist");
     if (calAlarmWindow && alarmRichlist.hasChildNodes) {
         setupSlider();
     }
 }
 
 function setSliderTimeout() {
-    var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                                .getService(Components.interfaces.nsIPrefBranch);
     try {
-        gCheckInterval = prefService.getIntPref("calAlarmSlider.checkInterval");
+        gCheckInterval = Services.prefs.getIntPref("calAlarmSlider.checkInterval");
+        gOpenTime = Services.prefs.getIntPref("calAlarmSlider.totalOpenTime");
     }
     catch (ex) {
     }
-    gSliderTimeout = setInterval(checkSliderNeed, gCheckInterval);
-    prefService.setBoolPref("calAlarmSlider.timeoutSet", true);
+    gSliderTimeout = setInterval(checkSliderNeed, gCheckInterval + gOpenTime);
+    Services.prefs.setBoolPref("calAlarmSlider.timeoutSet", true);
 }
 
 function clearSliderTimeout() {
     if (gSliderTimeout) {
         window.clearInterval(gSliderTimeout);
     }
 }
 
 function setupSlider() {
-    let windowWatcher = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
-                                  .getService(Components.interfaces.nsIWindowWatcher);
-    this.openSlider = windowWatcher.openWindow(
-        this,
+    this.openSlider = Services.ww.openWindow(
+        null,
         "chrome://calalarmslider/content/calendar-alarm-slider.xul",
         "calAlarmSlider",
         "chrome,dialog=yes,titlebar=no,popup=yes",
         null);
 }
 
 function initSlider() {
     setTimeout(setupSlider, 500);
-    var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                                .getService(Components.interfaces.nsIPrefBranch);
-    let showPermanentSlider = prefService.getBoolPref("calAlarmSlider.showPermanentSlider");
+    let showPermanentSlider = Services.prefs.getBoolPref("calAlarmSlider.showPermanentSlider");
     if (showPermanentSlider == false) {
         setSliderTimeout();
     }
 }
 
 function removeSlider() {
-    let calAlarmSliderWindow = wm.getMostRecentWindow("Calendar:AlarmSliderWindow");
-    var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                                .getService(Components.interfaces.nsIPrefBranch);
-    let diehardSlider = prefService.getBoolPref("calAlarmSlider.diehardSlider");
+    let calAlarmSliderWindow = Services.wm.getMostRecentWindow("Calendar:AlarmSliderWindow");
+    let diehardSlider = Services.prefs.getBoolPref("calAlarmSlider.diehardSlider");
     if (!diehardSlider) {
         clearSliderTimeout();
         if (calAlarmSliderWindow) {
-            calAlarmSliderWindow.animateCloseAlert();
+            calAlarmSliderWindow.closeAlert();
         }
     }
 }
diff -u8pdNr 100/chrome/content/calendar-alarm-dialog-overlay.xul 110/chrome/content/calendar-alarm-dialog-overlay.xul
--- 100/chrome/content/calendar-alarm-dialog-overlay.xul	2011-07-14 15:23:35 +0000
+++ 110/chrome/content/calendar-alarm-dialog-overlay.xul	2012-12-26 14:35:11 +0000
@@ -1,46 +1,13 @@
 <?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   - Robert Brand <mozrob@googlemail.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <overlay id="calAlarmSliderOverlay" 
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://calalarmslider/content/calendar-alarm-dialog-overlay.js"/>
   <script type="application/x-javascript" src="chrome://calalarmslider/content/calendar-alarm-slider.js"/>
   <script language="JavaScript">
     initSlider();
   </script>
diff -u8pdNr 100/chrome/content/calendar-alarm-slider.js 110/chrome/content/calendar-alarm-slider.js
--- 100/chrome/content/calendar-alarm-slider.js	2011-07-14 15:17:42 +0000
+++ 110/chrome/content/calendar-alarm-slider.js	2016-08-08 13:20:47 +0000
@@ -1,29 +1,30 @@
-Components.utils.import("resource://gre/modules/PluralForm.jsm");
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                       .getService(Components.interfaces.nsIWindowMediator);
+Components.utils.import("resource://gre/modules/Services.jsm");
+Components.utils.import("resource://gre/modules/PluralForm.jsm");
 
-var gFinalSize;
-var gCurrentSize = 1;
+const NS_ALERT_HORIZONTAL = 1;
+const NS_ALERT_LEFT = 2;
+const NS_ALERT_TOP = 4;
 
-var gSlideIncrement = 1;
-var gSlideTime = 10;
 var gOpenTime = 6000; // total time the alert should stay up once we are done animating.
 var gOrigin = 0; // Default value: alert from bottom right, sliding in vertically.
 
-var gAlertTextClickable = false;
+// var gAlertTextClickable = false;
 
-var bundle = srGetStrBundle("chrome://calalarmslider/locale/overlay.properties");
+var bundle = Services.strings.createBundle("chrome://calalarmslider/locale/overlay.properties");
 var gAlarmSliderTitleLabel = bundle.GetStringFromName( "alarmSliderTitle.label" );
 var gAlarmSliderTextLabel = bundle.GetStringFromName( "alarmSliderText.label" );
 
 function prefillAlertInfo() {
-    let calAlarmWindow = wm.getMostRecentWindow("Calendar:AlarmWindow");
+    let calAlarmWindow = Services.wm.getMostRecentWindow("Calendar:AlarmWindow");
     let alarmRichlist = calAlarmWindow.document.getElementById("alarm-richlist");
     let reminders = alarmRichlist.childNodes.length;
 
     let title = document.getElementById("alertTitleLabel");
     let titleString = PluralForm.get(reminders, gAlarmSliderTitleLabel);
     let finishedTitleString = titleString.replace("#1", reminders);
     title.setAttribute("value", finishedTitleString + "  ");
 
@@ -33,80 +34,69 @@ function prefillAlertInfo() {
     let textString = PluralForm.get(reminders, gAlarmSliderTextLabel);
     let finishedTextString = textString.replace("#1", reminders);
     alertTextLabel.setAttribute("value", finishedTextString + "  ");
 }
 
 function onAlertLoad() {
     // Read out our initial settings from prefs.
     try {
-        var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                                    .getService(Components.interfaces.nsIPrefBranch);
-        gSlideIncrement = prefService.getIntPref("calAlarmSlider.slideIncrement");
-        gSlideTime = prefService.getIntPref("calAlarmSlider.slideIncrementTime");
-        gOpenTime = prefService.getIntPref("calAlarmSlider.totalOpenTime");
+        gOpenTime = Services.prefs.getIntPref("calAlarmSlider.totalOpenTime");
     }
     catch (ex) {
     }
 
+    let alertTextBox = document.getElementById("alertTextBox");
+    let alertImageBox = document.getElementById("alertImageBox");
+    alertImageBox.style.minHeight = alertTextBox.scrollHeight + "px";
+
     sizeToContent();
-    gFinalSize = window.outerHeight;
-    window.outerHeight = 1;
-    window.moveTo((screen.availLeft + screen.availWidth - window.outerWidth) - 10, screen.availHeight - window.outerHeight);
 
-    setTimeout(animateAlert, gSlideTime);
-}
+    // Determine position
+    let x = gOrigin & NS_ALERT_LEFT ? screen.availLeft :
+            screen.availLeft + screen.availWidth - window.outerWidth;
+    let y = gOrigin & NS_ALERT_TOP ? screen.availTop :
+            screen.availTop + screen.availHeight - window.outerHeight;
 
-function animateAlert() {
-    if (window.outerHeight < gFinalSize) {
-        window.screenY -= gSlideIncrement - screen.availTop;
-        window.outerHeight += gSlideIncrement;
-        setTimeout(animateAlert, gSlideTime);
+    // Offset the alert by 10 pixels from the edge of the screen
+    y += gOrigin & NS_ALERT_TOP ? 10 : -10;
+    x += gOrigin & NS_ALERT_LEFT ? 10 : -10;
+
+    window.moveTo(x, y);
+
+    let showPermanentSlider = Services.prefs.getBoolPref("calAlarmSlider.showPermanentSlider");
+    if (showPermanentSlider == true) {
+        return;
     } else {
-        var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                                    .getService(Components.interfaces.nsIPrefBranch);
-        let showPermanentSlider = prefService.getBoolPref("calAlarmSlider.showPermanentSlider");
-        if (showPermanentSlider == true) {
-            return;
-        } else {
-            setTimeout(animateCloseAlert, gOpenTime);
-        }
+        setTimeout(closeAlert, gOpenTime);
     }
 }
 
-function animateCloseAlert() {
-    if (window.outerHeight > 1) {
-        window.screenY += gSlideIncrement + screen.availTop;
-        window.outerHeight -= gSlideIncrement;
-        setTimeout(animateCloseAlert, gSlideTime);
-    } else {
-        window.close();
-    }
+function closeAlert() {
+    window.close();
 }
 
 function onSliderClick() {
-    let calAlarmWindow = wm.getMostRecentWindow("Calendar:AlarmWindow");
-    var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                                .getService(Components.interfaces.nsIPrefBranch);
-    let timeoutSet = prefService.getBoolPref("calAlarmSlider.timeoutSet");
+    let calAlarmWindow = Services.wm.getMostRecentWindow("Calendar:AlarmWindow");
+    let timeoutSet = Services.prefs.getBoolPref("calAlarmSlider.timeoutSet");
     if (timeoutSet == true) {
-        prefService.setBoolPref("calAlarmSlider.timeoutSet", false);
+        Services.prefs.setBoolPref("calAlarmSlider.timeoutSet", false);
         if (calAlarmWindow) {
-            opener.clearSliderTimeout();
+            calAlarmWindow.clearSliderTimeout();
         }
     }
     if (calAlarmWindow) {
         calAlarmWindow.focus();
     }
     window.close();
 }
 
 function updateSliderTexts() {
-    let calAlarmWindow = wm.getMostRecentWindow("Calendar:AlarmWindow");
-    let sliderWindow = wm.getMostRecentWindow("Calendar:AlarmSliderWindow");
+    let calAlarmWindow = Services.wm.getMostRecentWindow("Calendar:AlarmWindow");
+    let sliderWindow = Services.wm.getMostRecentWindow("Calendar:AlarmSliderWindow");
     if (calAlarmWindow && sliderWindow) {
         let alarmRichlist = calAlarmWindow.document.getElementById("alarm-richlist");
         let reminders = alarmRichlist.childNodes.length;
 
         let title = sliderWindow.document.getElementById("alertTitleLabel");
         let titleString = PluralForm.get(reminders, gAlarmSliderTitleLabel);
         let finishedTitleString = titleString.replace("#1", reminders);
         title.setAttribute("value", finishedTitleString);
diff -u8pdNr 100/chrome/content/calendar-alarm-slider.xul 110/chrome/content/calendar-alarm-slider.xul
--- 100/chrome/content/calendar-alarm-slider.xul	2011-04-27 11:55:54 +0000
+++ 110/chrome/content/calendar-alarm-slider.xul	2012-12-26 13:39:01 +0000
@@ -1,46 +1,12 @@
 <?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Communicator client code, released
-   - March 31, 1998.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   - Robert Brand <mozrob@googlemail.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://calalarmslider/skin/calendar-alarm-slider.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="calendar-alarm-slider"
         windowtype="Calendar:AlarmSliderWindow"
         xmlns:xhtml="http://www.w3.org/1999/xhtml"
         xhtml:role="alert"
@@ -49,17 +15,17 @@
         onunload=""
 		onclick="onSliderClick();">
   <script type="application/javascript" src="chrome://global/content/strres.js"/>
   <script type="application/javascript" src="chrome://calalarmslider/content/calendar-alarm-slider.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
 
   <box id="alertBox" class="alertBox">
     
-    <hbox class="alertImageBox" align="center" pack="center">
+    <hbox id="alertImageBox" class="alertImageBox" align="center" pack="center">
       <image id="alertImage"/>
     </hbox>
 
     <vbox id="alertTextBox" class="alertTextBox">
       <label id="alertTitleLabel" class="alertTitle"/>
       <label id="alertTextLabel" class="alertText" clickable="true"/>
     </vbox>
 
diff -u8pdNr 100/chrome/content/prefs.js 110/chrome/content/prefs.js
--- 100/chrome/content/prefs.js	2011-06-12 22:33:30 +0000
+++ 110/chrome/content/prefs.js	2013-12-28 21:24:42 +0000
@@ -1,78 +1,70 @@
-let prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                            .getService(Components.interfaces.nsIPrefBranch);
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 function onPrefPaneLoad() {
     let sliderType = document.getElementById("calAlarmSliderType");
-	let showPermanentSlider = prefService.getBoolPref("calAlarmSlider.showPermanentSlider");
+    let showPermanentSlider = Services.prefs.getBoolPref("calAlarmSlider.showPermanentSlider");
     if (showPermanentSlider == true) {
         disableIntervalUI();
-		sliderType.selectedIndex = 0;
+        sliderType.selectedIndex = 0;
     } else {
-	    enableIntervalUI();
-		sliderType.selectedIndex = 1;
-	}
-	sizeToContent();
+        enableIntervalUI();
+        sliderType.selectedIndex = 1;
+    }
+    sizeToContent();
     var vbox = document.getElementById("cal-pref-wrapper");
     vbox.height = vbox.boxObject.height;
     sizeToContent();
 }
 
 function setPermanentSlider() {
-	disableIntervalUI();
-	prefService.setBoolPref("calAlarmSlider.showPermanentSlider",true);
+    disableIntervalUI();
+    Services.prefs.setBoolPref("calAlarmSlider.showPermanentSlider",true);
 }
 
 function setNonpermanentSlider() {
     enableIntervalUI();
-	prefService.setBoolPref("calAlarmSlider.showPermanentSlider",true);
+    Services.prefs.setBoolPref("calAlarmSlider.showPermanentSlider",true);
 }
 
 function disableIntervalUI() {
-  var intervalOptions = document.getElementById("intervalOptions");
-  var hideableItems = new Array();
-  hideableItems = intervalOptions.getElementsByAttribute("hideable", true);
-  for (var i = 0; i < hideableItems.length; ++i) {
-    var item = hideableItems[i];
-	if (!item.hasAttribute("disabled", true)) {
-  	  item.setAttribute("disabled", true);
-	}
-  }
+    var intervalOptions = document.getElementById("intervalOptions");
+    var hideableItems = new Array();
+    hideableItems = intervalOptions.getElementsByAttribute("hideable", true);
+    for (var i = 0; i < hideableItems.length; ++i) {
+        var item = hideableItems[i];
+        if (!item.hasAttribute("disabled", true)) {
+            item.setAttribute("disabled", true);
+        }
+    }
 }
 
 function enableIntervalUI() {
-  var intervalOptions = document.getElementById("intervalOptions");
-  var hideableItems = new Array();
-  hideableItems = intervalOptions.getElementsByAttribute("hideable", true);
-  for (var i = 0; i < hideableItems.length; ++i) {
-    var item = hideableItems[i];
-	if (item.hasAttribute("disabled", true)) {
-  	  item.removeAttribute("disabled");
-	}
-  }
+    var intervalOptions = document.getElementById("intervalOptions");
+    var hideableItems = new Array();
+    hideableItems = intervalOptions.getElementsByAttribute("hideable", true);
+    for (var i = 0; i < hideableItems.length; ++i) {
+        var item = hideableItems[i];
+        if (item.hasAttribute("disabled", true)) {
+  	        item.removeAttribute("disabled");
+        }
+    }
 }
 
 function onUnload(prefwindow) {
     var radio1 = document.getElementById("permanentSliderRadio");
-	var radio2 = document.getElementById("intervalSliderRadio");
-	if (radio1.selected) {
-      prefService.setBoolPref("calAlarmSlider.showPermanentSlider",true);
+    var radio2 = document.getElementById("intervalSliderRadio");
+    if (radio1.selected) {
+        Services.prefs.setBoolPref("calAlarmSlider.showPermanentSlider",true);
     }
-	if (radio2.selected) {
-	  var totalOpenTime = document.getElementById("calAlarmSlider.totalOpenTime.textbox").value;
-	  var checkInterval = document.getElementById("calAlarmSlider.checkInterval.textbox").value;
-      prefService.setBoolPref("calAlarmSlider.showPermanentSlider",false);
-	  prefService.setIntPref("calAlarmSlider.totalOpenTime",totalOpenTime);
-	  prefService.setIntPref("calAlarmSlider.checkInterval",checkInterval);
+    if (radio2.selected) {
+        var totalOpenTime = document.getElementById("calAlarmSlider.totalOpenTime.textbox").value;
+        var checkInterval = document.getElementById("calAlarmSlider.checkInterval.textbox").value;
+        Services.prefs.setBoolPref("calAlarmSlider.showPermanentSlider",false);
+        Services.prefs.setIntPref("calAlarmSlider.totalOpenTime",totalOpenTime);
+        Services.prefs.setIntPref("calAlarmSlider.checkInterval",checkInterval);
     }
 }
-
-function tinderstatus_resetRefreshTime() {
-  var defaultTime = gPrefDefaultBranch.getIntPref("refreshTime");
-  void gPrefBranch.setIntPref("refreshTime",defaultTime);
-}
-
-function tinderstatus_resetWatchList() {
-  var defaultList = gPrefDefaultBranch.getComplexValue("watchList",
-                                           Ci.nsISupportsString).data;
-  void gPrefBranch.setCharPref("watchList",defaultList);
-}
diff -u8pdNr 100/chrome/content/prefs.xul 110/chrome/content/prefs.xul
--- 100/chrome/content/prefs.xul	2011-12-23 20:14:09 +0000
+++ 110/chrome/content/prefs.xul	2012-12-26 14:36:30 +0000
@@ -1,44 +1,13 @@
 <?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Calendar Alarm Slider.
-   -
-   - The Initial Developer of the Original Code is
-   - Robert Brand <mozrob@googlemail.com>
-   - Portions created by the Initial Developer are Copyright (C) 2011
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE dialog SYSTEM "chrome://calalarmslider/locale/prefs.dtd">
 <?xml-stylesheet href="chrome://calalarmslider/skin/prefs.css" type="text/css"?>
 
 <prefwindow id="calalarmslider-prefs"
             title="&calalarmslider.preferences.title;"
 			width="440"
 			height="350"
diff -u8pdNr 100/chrome/skin/calendar-alarm-slider.css 110/chrome/skin/calendar-alarm-slider.css
--- 100/chrome/skin/calendar-alarm-slider.css	2011-04-27 10:38:20 +0000
+++ 110/chrome/skin/calendar-alarm-slider.css	2012-12-25 17:10:56 +0000
@@ -1,100 +1,70 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Scott MacGregor <mscott@netscape.com>
- *   Robert Brand <mozrob@googlemail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== alert.css =====================================================
   == Styles specific to the alerts dialog.
   ======================================================================= */
 
 @import url("chrome://global/skin/");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .alertBox {
-  border: 2px solid #7B969C;
+  border: 1px solid #7B969C;
+  border-radius: 3px;
   background-color: -moz-Dialog;
-  min-height: 50px;
 }
 
-.alertBox[orient="horizontal"] > .alertImageBox {
-  -moz-margin-start: 4px;
-  -moz-margin-end: 6px;
-  min-height: 46px;
+.alertImageBox {
+  padding: 8px 0;
+  width: 64px;
 }
 
-.alertBox[orient="vertical"] > .alertImageBox {
-  margin-top: 6px;
-  margin-bottom: 4px;
-  min-width: 46px;
+.alertTextBox {
+  padding: 8px;
+  -moz-padding-start: 16px;
+  width: 255px;
 }
 
 .alertTitle {
   font-weight: bold;
+  font-size: 110%;
 }
 
-.alertText {
-  -moz-margin-end: 6px;
+#alertImage {
+  max-width: 48px;
+  max-height: 48px;
 }
 
 #calendar-alarm-slider[clickable="true"] {
   cursor: pointer;
 }
 
 label {
   cursor: inherit;
 }
 
 .alertText[clickable="true"] {
   color: -moz-nativehyperlinktext;
   text-decoration: underline;
 }
 
 .alertText[clickable="true"]:hover:active {
-  color: #424F63;
-}
-
-.alertBox[orient="horizontal"] > .alertTextBox {
-  -moz-padding-end: 10px;
-  padding-top: 5px;
+  color: -moz-activehyperlinktext;
 }
 
-.alertBox[orient="vertical"] > .alertTextBox {
-  -moz-padding-start: 5px;
-  -moz-padding-end: 5px;
-  margin-bottom: 8px;
-  -moz-box-align: center; /* also hard-coded in alert.js, see bug 311557 */
+@keyframes alert-animation {
+  from {
+    opacity: 0;
+  }
+  6.25% {
+    opacity: 1;
+  }
+  93.75% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
 }
diff -u8pdNr 100/chrome/skin/prefs.css 110/chrome/skin/prefs.css
--- 100/chrome/skin/prefs.css	2011-06-12 22:46:08 +0000
+++ 110/chrome/skin/prefs.css	2012-12-26 14:34:22 +0000
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 .calslipref {
   margin-left: 35px;
 }
diff -u8pdNr 100/defaults/preferences/calalarmslider.js 110/defaults/preferences/calalarmslider.js
--- 100/defaults/preferences/calalarmslider.js	2011-07-13 23:47:47 +0000
+++ 110/defaults/preferences/calalarmslider.js	2012-12-26 14:31:52 +0000
@@ -1,7 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 pref("calAlarmSlider.showPermanentSlider",true);
 pref("calAlarmSlider.timeoutSet",false);
 pref("calAlarmSlider.slideIncrement",1);
 pref("calAlarmSlider.slideIncrementTime",10);
 pref("calAlarmSlider.totalOpenTime",6000);
 pref("calAlarmSlider.checkInterval",12000);
 pref("calAlarmSlider.diehardSlider",false);
diff -u8pdNr 100/install.rdf 110/install.rdf
--- 100/install.rdf	2012-03-18 09:09:38 +0000
+++ 110/install.rdf	2016-08-08 16:36:06 +0000
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
   <Description about="urn:mozilla:install-manifest">
     <em:name>Calendar Alarm Slider</em:name>
     <em:id>calalarmslider@nadelundhirn.de</em:id>
-    <em:version>1.0</em:version>
+    <em:version>1.1</em:version>
 
     <em:description>Alarm Slider for Sunbird and Lightning</em:description>
     <em:creator>Robert Brand</em:creator>
-    <em:homepageURL>http://www.nadelundhirn.de/wp/tag/calendar-alarm-slider/</em:homepageURL>
+    <em:homepageURL>https://nadelundhirn.de/erweiterungen/calendar-alarm-slider/</em:homepageURL>
     <em:optionsURL>chrome://calalarmslider/content/prefs.xul</em:optionsURL>
 	<em:updateURL>http://www.nadelundhirn.de/krams/exten/calalarmslider/update.rdf</em:updateURL>
 	<em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9Y2KoRlX8z726uLdVIkMFcDnDru8dR9fj6x63Tlk1PX+lhFtNXa83FZMDz/NdC84x5N9g18fAJinunQTQyfOlZpHdaNIvw1j3GSOKmAqhSndh0ZqnExHgOyEKqRxbx4dJYDPlhf7ZxixCyq5fHhLVmeyRdcIPsoVWneJ0gbSsRwIDAQAB</em:updateKey>
 
     <!-- Sunbird -->
     <em:targetApplication>
       <Description>
         <em:id>{718e30fb-e89b-41dd-9da7-e25a45638b28}</em:id>
@@ -23,34 +23,34 @@
         <em:maxVersion>1.0</em:maxVersion>
       </Description>
     </em:targetApplication>
 	
 	<!-- Thunderbird -->
     <em:targetApplication>
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>3</em:minVersion>
-        <em:maxVersion>11.*</em:maxVersion>
+        <em:minVersion>18</em:minVersion>
+        <em:maxVersion>46.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 
     <!-- SeaMonkey -->
     <em:targetApplication>
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1</em:minVersion>
-        <em:maxVersion>2.8.*</em:maxVersion>
+        <em:maxVersion>2.43.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 
     <em:requires>
       <Description>
         <!-- Lightning (also Sunbird via extension stub) -->
         <em:id>{e2fda1a4-762b-4020-b5ad-a41df1933103}</em:id>
-        <em:minVersion>1.0b1</em:minVersion>
-        <em:maxVersion>1.3</em:maxVersion>
+        <em:minVersion>1.9</em:minVersion>
+        <em:maxVersion>4.9</em:maxVersion>
       </Description>
     </em:requires>
 
   </Description>
 
 </RDF>