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 /core | |
| parent | f0e69b2b99174c29859729c0d91d8b4a97c6f28b (diff) | |
| download | nextcloud-server-0663d954e6d8170c10d444771f90210fb48f65c9.tar.gz nextcloud-server-0663d954e6d8170c10d444771f90210fb48f65c9.zip | |
resolve conflicts while picking c0fb623
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 4a84568244c..fb14ad27acc 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -309,7 +309,7 @@ input[type="submit"].enabled { position: fixed; top:45px; right: 0; - left: 0; + left:380px; height: 44px; width: 100%; padding: 0; @@ -320,9 +320,6 @@ input[type="submit"].enabled { } /* account for shift of controls bar due to app navigation */ #body-user #controls, -#body-settings #controls { - padding-left: 80px; -} #controls .button, #controls button, #controls input[type='submit'], |