diff options
author | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2012-02-01 21:19:31 +0100 |
---|---|---|
committer | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2012-02-01 21:19:31 +0100 |
commit | bbd10a3c94fdd0f8ac41d6d60651c7468360e487 (patch) | |
tree | fa3bf1aff98b00fe5e6fc9e87f6a89e1ba478205 /apps/bookmarks | |
parent | e4faea8f9007667ee77ddd114440747539a0b843 (diff) | |
download | nextcloud-server-bbd10a3c94fdd0f8ac41d6d60651c7468360e487.tar.gz nextcloud-server-bbd10a3c94fdd0f8ac41d6d60651c7468360e487.zip |
Bookmark layout updated
Diffstat (limited to 'apps/bookmarks')
-rw-r--r-- | apps/bookmarks/css/bookmarks.css | 33 | ||||
-rw-r--r-- | apps/bookmarks/js/bookmarks.js | 4 |
2 files changed, 16 insertions, 21 deletions
diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css index 233d4a02944..ef0ec68fcce 100644 --- a/apps/bookmarks/css/bookmarks.css +++ b/apps/bookmarks/css/bookmarks.css @@ -18,7 +18,7 @@ } .bookmarks_list { - margin-top: 45px; + margin-top: 2.8em; } .bookmarks_addBml { @@ -36,38 +36,33 @@ } .bookmark_actions { + position: absolute; + right: 1em; + top: 0.7em; display: none; - font-size: smaller; - color: #666; - padding-left: 4em; -} - -.bookmark_actions span:hover { - cursor: pointer; - text-decoration: underline; } +.bookmark_actions span { margin: 0 0.4em; } +.bookmark_actions img { opacity: 0.3; } +.bookmark_actions img:hover { opacity: 1; cursor: pointer; } .bookmark_single { + position: relative; padding: 0.5em 1em; + border-bottom: 1px solid #DDD; + -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; } .bookmark_single:hover { - background-color: #EAEAEA; + background-color:#f8f8f8 } .bookmark_single:hover .bookmark_actions { display: block; } -.bookmark_title { - font-size: larger; - color: blue; - text-decoration: underline; -} - -.bookmark_url { - color: green; -} +.bookmark_title { font-weight: bold; display: inline-block; margin-right: 0.8em; } +.bookmark_url { display: none; color: #999; } +.bookmark_single:hover .bookmark_url { display: inline; } .bookmark_tag { color: #ff3333; diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js index 51646e5382b..86bb71ac725 100644 --- a/apps/bookmarks/js/bookmarks.js +++ b/apps/bookmarks/js/bookmarks.js @@ -85,10 +85,10 @@ function addOrEditBookmark(event) { $('.bookmarks_add').children('p').children('.bookmarks_input').val(''); $('.bookmarks_list').prepend( '<div class="bookmark_single" data-id="' + bookmark_id + '" >' + + '<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span> <span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' + '<p class="bookmark_title"><a href="' + url + '" target="_blank" class="bookmark_link">' + title + '</a></p>' + '<p class="bookmark_url">' + url + '</p>' + '<p class="bookmark_tags">' + tagshtml + '</p>' + - '<p class="bookmark_actions"><span class="bookmark_delete">Delete</span> <span class="bookmark_edit">Edit</span></p>' + '</div>' ); } @@ -153,10 +153,10 @@ function updateBookmarksList(bookmark) { } $('.bookmarks_list').append( '<div class="bookmark_single" data-id="' + bookmark.id +'" >' + + '<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span> <span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' + '<p class="bookmark_title"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a></p>' + '<p class="bookmark_url">' + encodeEntities(bookmark.url) + '</p>' + '<p class="bookmark_tags">' + taglist + '</p>' + - '<p class="bookmark_actions"><span class="bookmark_delete">Delete</span> <span class="bookmark_edit">Edit</span></p>' + '</div>' ); } |