[Pkg-owncloud-commits] [owncloud] 28/52: Fix resize issue for trash button in chrome and overflowing spinner in .update class

David Prévot taffit at moszumanska.debian.org
Mon Dec 2 01:49:39 UTC 2013


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 587fc1aff35464c2c3fbdde7a752801df62fa41e
Author: Morris Jobke <morris.jobke at gmail.com>
Date:   Thu Nov 28 21:36:43 2013 +0100

    Fix resize issue for trash button in chrome and overflowing spinner in .update class
    
    fixes #6108
---
 apps/files/css/files.css | 2 +-
 core/css/styles.css      | 4 ++--
 core/templates/login.php | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index e96fa64..2fc86ca 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -14,7 +14,7 @@
 	padding: 0 !important; /* override default control bar button padding */
 }
 #trash {
-	margin-right: 12px;
+	margin-right: 8px;
 	float: right;
 	z-index: 1010;
 	padding: 10px;
diff --git a/core/css/styles.css b/core/css/styles.css
index 859f11f..1388810 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -201,9 +201,9 @@ input[type="submit"].enabled {
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 	position: fixed;
+	right: 0;
+	left: 80px;
 	height: 44px;
-	width: 100%;
-	padding-right: 75px;
 	margin: 0;
 	background: #eee;
 	border-bottom: 1px solid #e7e7e7;
diff --git a/core/templates/login.php b/core/templates/login.php
index b81128a..e697ebe 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -21,6 +21,8 @@
 		<p id="message" class="hidden">
 			<img class="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/>
 			<span id="messageText"></span>
+			<!-- the following div ensures that the spinner is always inside the #message div -->
+			<div style="clear: both;"></div>
 		</p>
 		<p class="infield grouptop">
 			<input type="text" name="user" id="user" placeholder=""

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list