rooty/OwncloudBookmarksOfficial
1
0
Fork 0
mirror of https://github.com/owncloud/bookmarks.git synced 2025-02-01 02:52:09 +01:00
Code Issues Releases Activity

Merge pull request #170 from owncloud/add-button-style

Browse Source 
use proper inline style for bookmark add button and feedback
This commit is contained in:
Jan-Christoph Borchardt 2015-07-12 10:45:30 +02:00
commit f57bb4803a
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
css/bookmarks.css
View File

@ -3,9 +3,9 @@ input.disabled, input.disabled:hover, input.disabled:focus {
background-color: #ddd; background-color: #ddd;
color: gray; color: gray;
} }
#settingsbtn { background: transparent; color:#666; #settingsbtn { background: transparent; color:#666;
border-bottom: 1px solid #ddd; border-top: 1px solid #fff; } border-bottom: 1px solid #ddd; border-top: 1px solid #fff; }
#settingsbtn:hover { background:#dbdbdb !important; color:#999; #settingsbtn:hover { background:#dbdbdb !important; color:#999;
border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; } border-bottom: 1px solid #CCCCCC; border-top: 1px solid #D4D4D4; }
#settingsbtn img { width: 18px; height: 18px; margin: 10px; } #settingsbtn img { width: 18px; height: 18px; margin: 10px; }
@ -48,6 +48,15 @@ input.disabled, input.disabled:hover, input.disabled:focus {
.bookmarks_addBml { .bookmarks_addBml {
text-decoration: underline; text-decoration: underline;
} }
#bookmark_add_submit {
background-color: transparent;
border: none;
position: absolute;
right: 0;
top: 0;
opacity: .5;
padding: 17px 14px;
}
.bookmarks_label { .bookmarks_label {
width: 7em; width: 7em;
@ -262,7 +271,7 @@ li:hover > .tags_actions > em { display : none; }
#tag_filter ul li:hover > a { #tag_filter ul li:hover > a {
background-color: transparent; background-color: transparent;
} }
#tag_filter ul.tagit li.tagit-choice .close{ #tag_filter ul.tagit li.tagit-choice .close{
margin-top: -8px; margin-top: -8px;
@ -308,17 +317,17 @@ ul.tagit li.tagit-choice .close .text-icon {
/* /*
.bm_view_img .bookmark_single:hover .bookmark_url{ .bm_view_img .bookmark_single:hover .bookmark_url{
display:block; display:block;
} }
.bm_view_img .bookmark_single .bookmark_url{ .bm_view_img .bookmark_single .bookmark_url{
display:block; display:block;
} }
*/ */
.bookmark_single:hover .bookmark_url { display: inline; } .bookmark_single:hover .bookmark_url { display: inline; }
.bookmark_single:hover .bookmark_url a[href]{ color:gray; } .bookmark_single:hover .bookmark_url a[href]{ color:gray; }
.bookmark_url { display: none; } .bookmark_url { display: none; }
.bookmark_form_title { .bookmark_form_title {
float: left; float: left;
width:25%; width:25%;
} }
@ -427,4 +436,4 @@ ul.tagit li.tagit-choice .close .text-icon {
#app-navigation a.bookmarklet { #app-navigation a.bookmarklet {
margin-top: 5px; margin-top: 5px;
padding: 0 5px 2px; padding: 0 5px 2px;
} }

7
js/bookmarks.js
View File

@ -65,9 +65,11 @@ function decreaseAjaxCallCount() {
function updateLoadingAnimation() { function updateLoadingAnimation() {
if (ajaxCallCount === 0) { if (ajaxCallCount === 0) {
$("#add_form_loading").css("visibility", "hidden"); $('#bookmark_add_submit').removeClass('icon-loading-small');
$('#bookmark_add_submit').addClass('icon-add');
} else { } else {
$("#add_form_loading").css("visibility", "visible"); $('#bookmark_add_submit').removeClass('icon-add');
$('#bookmark_add_submit').addClass('icon-loading-small');
} }
} }
@ -417,4 +419,3 @@ function deleteTag() {
} }
}); });
} }

3
templates/main.php
View File

@ -33,8 +33,7 @@ function bookmarklet($bookmarkleturl) {
<li> <li>
<form id="add_form"> <form id="add_form">
<input type="text" id="add_url" value="" placeholder="<?php p($l->t('Address')); ?>"/> <input type="text" id="add_url" value="" placeholder="<?php p($l->t('Address')); ?>"/>
<input type="submit" value="<?php p($l->t('Add')); ?>" id="bookmark_add_submit" /> <button id="bookmark_add_submit" title="Add" class="icon-add"></button>
<div id="add_form_loading"><img src="<?php print_unescaped(OCP\image_path("bookmarks", "loading.gif")); ?>"> </div>
</form> </form>
<p id="tag_filter" class="open"> <p id="tag_filter" class="open">
<input type="text" value="<?php if(isset($_['req_tag'])) p($_['req_tag']); else ""; ?>"/> <input type="text" value="<?php if(isset($_['req_tag'])) p($_['req_tag']); else ""; ?>"/>