diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-05-30 08:16:34 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-05-30 08:16:34 +0200 |
| commit | 885eef2be57234f548e251cdea1c77141d41600e (patch) | |
| tree | 3a91a3d0a35d78dc8ebd3f9dffc0f228822816bb | |
| parent | fc1f7c700832bf3f82f2a4d4b884e7086ce6c202 (diff) | |
| parent | 0b0d9e56d96a9f1e4a01d37e4f84ef9c1f2211bc (diff) | |
Merge pull request #402 from owncloud/import-button
Import button
| -rw-r--r-- | css/public/style.css | 20 | ||||
| -rw-r--r-- | templates/contactImport.html | 5 |
2 files changed, 8 insertions, 17 deletions
diff --git a/css/public/style.css b/css/public/style.css index 096d8a31..5554d06c 100644 --- a/css/public/style.css +++ b/css/public/style.css @@ -346,23 +346,17 @@ li.addressBook-share-item span.shareeIdentifier { } #app-settings-content #upload.button { - padding: 5px 40px 5px 20px; - background-position-x: 80px; - position: absolute; - top: 2px; - right: 2px; -} -#app-settings-content #upload.button .icon-upload { + width: 100%; + padding: 7px 10px; + padding-left: 34px; + background-position: 10px center; + text-align: left; + margin: 0; display: block; - right: 16px; - position: absolute; - top: 7px; - opacity: 0.5; + margin-bottom: 10px; } - - /* Contacts List */ #new-contact-button { margin: 14px auto; /* to have the same height than a contact*/ diff --git a/templates/contactImport.html b/templates/contactImport.html index f8759c26..da3c6d91 100644 --- a/templates/contactImport.html +++ b/templates/contactImport.html @@ -1,5 +1,2 @@ <input type="file" id="contact-import" class="hidden-visually"/> -<label for="contact-import" class="button" id="upload"> - <span class="text">{{importText}}</span> - <span class="icon-upload"></span> -</label> +<label for="contact-import" class="icon-upload button" id="upload">{{importText}}</label> |