diff options
| author | raghunayyar <me@iraghu.com> | 2014-01-26 20:51:29 +0530 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-02 12:52:52 +0200 |
| commit | 0663d954e6d8170c10d444771f90210fb48f65c9 (patch) | |
| tree | 7a18402c7aaa13516d2efecb733231edf19cd5c4 /settings/css | |
| parent | f0e69b2b99174c29859729c0d91d8b4a97c6f28b (diff) | |
| download | nextcloud-server-0663d954e6d8170c10d444771f90210fb48f65c9.tar.gz nextcloud-server-0663d954e6d8170c10d444771f90210fb48f65c9.zip | |
resolve conflicts while picking c0fb623
Diffstat (limited to 'settings/css')
| -rw-r--r-- | settings/css/settings.css | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index be6cfe1e9bf..878ee555890 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -57,7 +57,6 @@ tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:point tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; } tr:hover>td.remove>a { float:right; } -table.grid { width:100%; } div.quota { float: right; display: block; |