fix merge conflicts

5 files changed, 14 insertions, 7 deletions

diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index 2e436f8d84e..a6433b1964a 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -26,7 +26,7 @@ require_once('../../lib/base.php');
 
 $app = $_POST["app"];
 
-$l = new OC_L10N( $app );
+$l = OC_L10N::get( $app );
 
 OC_JSON::success(array('data' => $l->getTranslations()));
 ?>
diff --git a/core/css/styles.css b/core/css/styles.css
index 5cc15f4b5b6..5e3bbfcf182 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -49,7 +49,7 @@ input[type="checkbox"] { width:auto; }
 #body-login input[type="text"], #body-login input[type="password"] { width: 13em; }
 #body-login input.login { width: auto; float: right; }
 #remember_login { margin:.8em .2em 0 1em; }
-.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.4em; right:3em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; opacity:.3; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
+.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.4em; right:3em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
 input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
 input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; }
 
@@ -106,8 +106,9 @@ label.infield { cursor: text !important; }
 
 #notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 
-.action, .selectedActions a, #logout { opacity:.5; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
+.action, .selectedActions a { opacity:.5; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
 .action { width: 16px; height: 16px; }
+#logout { opacity:.8; }
 .action:hover, .selectedActions a:hover, #logout:hover { opacity:1; }
 
 table:not(.nostyle) tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
diff --git a/core/js/js.js b/core/js/js.js
index 7e8ca6164c6..e3941fba6d5 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -297,7 +297,10 @@ function object(o) {
  * Fills height of window. (more precise than height: 100%;)
  */
 function fillHeight(selector) {
-	var height = parseFloat($(window).height())-parseFloat(selector.css('top'));
+	if (selector.length == 0) {
+		return;
+	}
+	var height = parseFloat($(window).height())-selector.offset().top;
 	selector.css('height', height + 'px');
 	if(selector.outerHeight() > selector.height())
 		selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px');
@@ -307,8 +310,11 @@ function fillHeight(selector) {
  * Fills height and width of window. (more precise than height: 100%; or width: 100%;)
  */
 function fillWindow(selector) {
+	if (selector.length == 0) {
+		return;
+	}
 	fillHeight(selector);
-	var width = parseFloat($(window).width())-parseFloat(selector.css('left'));
+	var width = parseFloat($(window).width())-selector.offset().left;
 	selector.css('width', width + 'px');
 	if(selector.outerWidth() > selector.width())
 		selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px');
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index a9b7d10804f..89bb6cfa794 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -20,7 +20,7 @@ if (isset($_POST['user'])) {
 			$tmpl = new OC_Template('core/lostpassword', 'email');
 			$tmpl->assign('link', $link);
 			$msg = $tmpl->fetchPage();
-			$l = new OC_L10N('core');
+			$l = OC_L10N::get('core');
 			$from = 'lostpassword-noreply@' . $_SERVER['HTTP_HOST'];
 			mail($email, $l->t('Owncloud password reset'), $msg, 'From:' . $from);
 		}
diff --git a/core/strings.php b/core/strings.php
index 9b4290db476..8c3f64ef14f 100644
--- a/core/strings.php
+++ b/core/strings.php
@@ -1,7 +1,7 @@
 <?php
 
 //some strings that are used in /lib but wont be translatable unless they are in /core too
-$l=new OC_L10N('core');
+$l=OC_L10N::get('core');
 $l->t("Personal");
 $l->t("Users");
 $l->t("Apps");