diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-21 19:20:25 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-21 19:20:25 +0200 |
| commit | 0ce35af02acb2fa9fe0ef401dc75345b5114e3d6 (patch) | |
| tree | 5ff19a7cc1bce5901cfeec7e11179ed2682b9e78 /core/css | |
| parent | 7c296a6cf915da6630422ceb8e253ebf9f004964 (diff) | |
| parent | a89199cc7bd19f6ba3e76fcd510219b2bd930ae6 (diff) | |
| download | nextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.tar.gz nextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.zip | |
Merge branch 'master' into improve_app-management
Conflicts:
settings/js/apps.js
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/auth.css | 2 | ||||
| -rw-r--r-- | core/css/styles.css | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/css/auth.css b/core/css/auth.css index bce7fa7b711..0adc10c77d9 100644 --- a/core/css/auth.css +++ b/core/css/auth.css @@ -36,4 +36,4 @@ h2 img { font-size:1.2em; margin:.7em; padding:0; -}
\ No newline at end of file +} diff --git a/core/css/styles.css b/core/css/styles.css index 39121fccb23..1e7098d16a2 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -424,6 +424,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } .error-wide { width: 800px; + margin-left: -250px; } /* Fixes for log in page, TODO should be removed some time */ |