phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Naive attempt to make bookmarks compatible with nav drawer. @ZasoGD - please have a look, if necessary undo this commit and do it right

Browse Source
This commit is contained in:
fkloft
2013-12-02 23:40:49 +01:00
parent ad6a447bde
commit 8a10848e15
2 changed files with 73 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/bookmarks-by-zaso.user.js
View File

@@ -169,6 +169,13 @@
window.plugin.bookmarks.saveStorageBox(); window.plugin.bookmarks.saveStorageBox();
} }
window.plugin.bookmarks.onPaneChanged = function(pane) {
if(pane == "plugin-bookmarks")
$('#bookmarksBox').css("display", "");
else
$('#bookmarksBox').css("display", "none");
}
// Switch list (maps/portals) // Switch list (maps/portals)
window.plugin.bookmarks.switchPageBkmrksBox = function(elem, page) { window.plugin.bookmarks.switchPageBkmrksBox = function(elem, page) {
window.plugin.bookmarks.statusBox.page = page; window.plugin.bookmarks.statusBox.page = page;
@@ -938,7 +945,12 @@
$("#bookmarksBox #bookmarksMin , #bookmarksBox ul li, #bookmarksBox ul li a, #bookmarksBox ul li a span, #bookmarksBox h5, #bookmarksBox .addForm a").disableSelection(); $("#bookmarksBox #bookmarksMin , #bookmarksBox ul li, #bookmarksBox ul li a, #bookmarksBox ul li a span, #bookmarksBox h5, #bookmarksBox .addForm a").disableSelection();
$('#bookmarksBox').css({'top':window.plugin.bookmarks.statusBox.pos.x, 'left':window.plugin.bookmarks.statusBox.pos.y}); $('#bookmarksBox').css({'top':window.plugin.bookmarks.statusBox.pos.x, 'left':window.plugin.bookmarks.statusBox.pos.y});
}else{ }else{
$('#portaldetails').before(window.plugin.bookmarks.htmlBoxTrigger + window.plugin.bookmarks.htmlBkmrksBox); $('body').append(window.plugin.bookmarks.htmlBkmrksBox);
$('#bookmarksBox').css("display", "none").addClass("mobile");
if(typeof android !== 'undefined' && android && android.addPane)
android.addPane("plugin-bookmarks", "Bookmarks", "ic_action_star");
window.addHook('paneChanged', window.plugin.bookmarks.onPaneChanged);
// Remove the star // Remove the star
window.addHook('portalSelected', function(data) { window.addHook('portalSelected', function(data) {

124
plugins/bookmarks-css.css
View File

@@ -358,139 +358,131 @@
/********************************************** /**********************************************
MOBILE MOBILE
**********************************************/ **********************************************/
#sidebar #bookmarksBox{ #bookmarksBox.mobile{
position:static !important; position:absolute !important;
width:auto !important; width: 100% !important;
height: 100% !important;
top: 0 !important;
left: 0 !important;
margin: 0 !important; margin: 0 !important;
padding: 0 !important;
border: 0 !important;
background: #0E3D4E;
} }
#sidebar #bkmrksTrigger, #bookmarksBox.mobile .bookmarkList ul,
#sidebar #bookmarksBox .bookmarkList ul, #bookmarksBox.mobile .bookmarkList ul li,
#sidebar #bookmarksBox .bookmarkList ul li, #bookmarksBox.mobile .bookmarkList.current,
#sidebar #bookmarksBox .bookmarkList.current, #bookmarksBox.mobile .bookmarkList li.bookmarkFolder.open ul{
#sidebar #bookmarksBox .bookmarkList li.bookmarkFolder.open ul{
width:100% !important; width:100% !important;
display:block !important; display:block !important;
} }
#sidebar #bookmarksBox *{ #bookmarksBox.mobile *{
box-shadow:none !important; box-shadow:none !important;
border-width:0 !important; border-width:0 !important;
} }
#sidebar #bookmarksBox #topBar{ #bookmarksBox.mobile #topBar{
display:none !important; display:none !important;
} }
#sidebar #bookmarksBox #bookmarksTypeBar h5{ #bookmarksBox.mobile #bookmarksTypeBar h5{
cursor:pointer; cursor:pointer;
text-align:center; text-align:center;
float:left; float:left;
width:50%; width:50%;
padding:7px 0; padding:7px 0;
} }
#sidebar #bookmarksBox #bookmarksTypeBar h5.current{ #bookmarksBox.mobile #bookmarksTypeBar h5.current{
cursor:default; cursor:default;
color:#fff; color:#fff;
} }
#sidebar #bookmarksBox #bookmarksTypeBar, #bookmarksBox.mobile #bookmarksTypeBar,
#sidebar #bookmarksBox .bookmarkList .addForm{ #bookmarksBox.mobile .bookmarkList .addForm{
border-bottom:1px solid #20a8b1 !important; border-bottom:1px solid #20a8b1 !important;
} }
#sidebar #bookmarksBox .bookmarkList ul li ul li.bkmrk, #bookmarksBox.mobile .bookmarkList ul li ul li.bkmrk,
#sidebar #bookmarksBox .bookmarkList li.bookmarkFolder .folderLabel{ #bookmarksBox.mobile .bookmarkList li.bookmarkFolder .folderLabel{
height:36px !important; height:36px !important;
clear:both; clear:both;
} }
#sidebar #bookmarksBox .bookmarkList li.bookmarkFolder .folderLabel a, #bookmarksBox.mobile .bookmarkList li.bookmarkFolder .folderLabel a,
#sidebar #bookmarksBox .bookmarkList ul li ul li.bkmrk a{ #bookmarksBox.mobile .bookmarkList ul li ul li.bkmrk a{
background:none; background:none;
padding:7px 0; padding:7px 0;
height:auto; height:auto;
box-shadow:inset 0 1px 0 #20a8b1 !important; box-shadow:inset 0 1px 0 #20a8b1 !important;
} }
#sidebar #bookmarksBox .bookmarkList li.bookmarkFolder a.bookmarksRemoveFrom, #bookmarksBox.mobile .bookmarkList li.bookmarkFolder a.bookmarksRemoveFrom,
#sidebar #bookmarksBox .bookmarkList li.bkmrk a.bookmarksRemoveFrom{ #bookmarksBox.mobile .bookmarkList li.bkmrk a.bookmarksRemoveFrom{
box-shadow:inset 0 1px 0 #20a8b1,inset -1px 0 0 #20a8b1 !important; box-shadow:inset 0 1px 0 #20a8b1,inset -1px 0 0 #20a8b1 !important;
width:15%; width:15%;
background:none !important; background:none !important;
} }
#sidebar #bookmarksBox .bookmarkList li.bookmarkFolder a.bookmarksAnchor, #bookmarksBox.mobile .bookmarkList li.bookmarkFolder a.bookmarksAnchor,
#sidebar #bookmarksBox .bookmarkList li.bkmrk a.bookmarksLink{ #bookmarksBox.mobile .bookmarkList li.bkmrk a.bookmarksLink{
text-indent:10px; text-indent:10px;
width:85%; width:85%;
height:21px; height:21px;
overflow:hidden; overflow:hidden;
} }
#sidebar #bookmarksBox .bookmarkList ul li.bookmarkFolder ul{ #bookmarksBox.mobile .bookmarkList ul li.bookmarkFolder ul{
margin-left:0 !important; margin-left:0 !important;
} }
#sidebar #bookmarksBox .bookmarkList > ul{ #bookmarksBox.mobile .bookmarkList > ul{
border-bottom:1px solid #20a8b1 !important; border-bottom:1px solid #20a8b1 !important;
border-right:1px solid #20a8b1 !important; border-right:1px solid #20a8b1 !important;
} }
#sidebar #bookmarksBox .bookmarkList .bookmarkFolder.othersBookmarks ul{ #bookmarksBox.mobile .bookmarkList .bookmarkFolder.othersBookmarks ul{
border-top:5px solid #20a8b1 !important; border-top:5px solid #20a8b1 !important;
} }
#sidebar #bookmarksBox .bookmarkList li.bookmarkFolder, #bookmarksBox.mobile .bookmarkList li.bookmarkFolder,
#sidebar #bookmarksBox .bookmarkList li.bkmrk{ #bookmarksBox.mobile .bookmarkList li.bkmrk{
box-shadow:inset 0 1px 0 #20a8b1, 1px 0 0 #20a8b1, -1px 1px 0 #20a8b1 !important; box-shadow:inset 0 1px 0 #20a8b1, 1px 0 0 #20a8b1, -1px 1px 0 #20a8b1 !important;
} }
#sidebar #bookmarksBox .bookmarkList > ul{ #bookmarksBox.mobile .bookmarkList > ul{
max-height:none; max-height:none;
width:85% !important; width:85% !important;
} }
#sidebar #bookmarksBox .bookmarkList li.bookmarkFolder .folderLabel{ #bookmarksBox.mobile .bookmarkList li.bookmarkFolder .folderLabel{
box-shadow:0 1px 0 #20a8b1 !important; box-shadow:0 1px 0 #20a8b1 !important;
} }
#sidebar #bookmarksBox .bookmarkList ul li.bookmarkFolder ul{ #bookmarksBox.mobile .bookmarkList ul li.bookmarkFolder ul{
width:85% !important; width:85% !important;
margin-left:15% !important; margin-left:15% !important;
} }
#sidebar #bookmarksBox .bookmarkList ul li.bookmarkFolder.othersBookmarks ul{ #bookmarksBox.mobile .bookmarkList ul li.bookmarkFolder.othersBookmarks ul{
width:100% !important; width:100% !important;
margin-left:0% !important; margin-left:0% !important;
} }
#sidebar #bkmrksTrigger{ #bookmarksBox.mobile{
position:static;
width:auto;
margin:0;
height:auto;
background:none;
text-indent:0;
padding:11px 0 9px;
margin-bottom:5px;
}
#sidebar #bkmrksTrigger.open{
margin-bottom:0;
}
#sidebar #bookmarksBox{
margin-bottom:5px !important; margin-bottom:5px !important;
} }
#sidebar #bookmarksBox #bookmarksTypeBar{ #bookmarksBox.mobile #bookmarksTypeBar{
height:auto; height:auto;
} }
#sidebar #bookmarksBox .addForm, #bookmarksBox.mobile .addForm,
#sidebar #bookmarksBox .addForm *{ #bookmarksBox.mobile .addForm *{
height:35px; height:35px;
padding:0; padding:0;
} }
#sidebar #bookmarksBox .addForm a{ #bookmarksBox.mobile .addForm a{
line-height:37px; line-height:37px;
} }
#sidebar #bookmarksBox .addForm a{ #bookmarksBox.mobile .addForm a{
width:25% !important; width:25% !important;
} }
#sidebar #bookmarksBox .addForm input{ #bookmarksBox.mobile .addForm input{
width:50% !important; width:50% !important;
text-indent:10px; text-indent:10px;
} }
#sidebar #bookmarksBox #bkmrk_portals .addForm input{ #bookmarksBox.mobile #bkmrk_portals .addForm input{
width:75% !important; width:75% !important;
} }
#sidebar #bookmarksBox #bookmarksTypeBar h5, #bookmarksBox.mobile #bookmarksTypeBar h5,
#sidebar #bookmarksBox .bookmarkList .addForm a{ #bookmarksBox.mobile .bookmarkList .addForm a{
box-shadow:-1px 0 0 #20a8b1 !important; box-shadow:-1px 0 0 #20a8b1 !important;
} }
#sidebar #bookmarksBox .bookmarkList li.bookmarkFolder ul{ #bookmarksBox.mobile .bookmarkList li.bookmarkFolder ul{
display:none !important; display:none !important;
min-height:37px !important; min-height:37px !important;
} }
@@ -500,26 +492,26 @@
padding:0 3px 1px 4px; padding:0 3px 1px 4px;
background:#262c32; background:#262c32;
} }
#sidebar #bookmarksBox .bookmarkList .bookmarkFolder .folderLabel .bookmarksAnchor span, #bookmarksBox.mobile .bookmarkList .bookmarkFolder .folderLabel .bookmarksAnchor span,
#sidebar #bookmarksBox .bookmarkList .bookmarkFolder .folderLabel > span, #bookmarksBox.mobile .bookmarkList .bookmarkFolder .folderLabel > span,
#sidebar #bookmarksBox .bookmarkList .bookmarkFolder .folderLabel > span > span, #bookmarksBox.mobile .bookmarkList .bookmarkFolder .folderLabel > span > span,
#sidebar #bookmarksBox .bookmarkList .triangle{ #bookmarksBox.mobile .bookmarkList .triangle{
width:0 !important; width:0 !important;
height:0 !important; height:0 !important;
} }
#sidebar #bookmarksBox .bookmarkList .bookmarkFolder .folderLabel .bookmarksAnchor span{ #bookmarksBox.mobile .bookmarkList .bookmarkFolder .folderLabel .bookmarksAnchor span{
float:left !important; float:left !important;
border-width:5px 0 5px 7px !important; border-width:5px 0 5px 7px !important;
border-color:transparent transparent transparent white !important; border-color:transparent transparent transparent white !important;
margin:7px 3px 0 13px !important; margin:7px 3px 0 13px !important;
} }
#sidebar #bookmarksBox .bookmarkList .bookmarkFolder.open .folderLabel .bookmarksAnchor span{ #bookmarksBox.mobile .bookmarkList .bookmarkFolder.open .folderLabel .bookmarksAnchor span{
margin:9px 1px 0 12px !important; margin:9px 1px 0 12px !important;
border-width:7px 5px 0 5px !important; border-width:7px 5px 0 5px !important;
border-color:white transparent transparent transparent !important; border-color:white transparent transparent transparent !important;
} }
#sidebar #bookmarksBox .bookmarkList .bookmarkFolder .folderLabel > span, #bookmarksBox.mobile .bookmarkList .bookmarkFolder .folderLabel > span,
#sidebar #bookmarksBox .bookmarkList .bookmarkFolder .folderLabel > span > span{ #bookmarksBox.mobile .bookmarkList .bookmarkFolder .folderLabel > span > span{
display:none !important; display:none !important;
border-width:0 12px 10px 0 !important; border-width:0 12px 10px 0 !important;
border-color:transparent #20a8b1 transparent transparent !important; border-color:transparent #20a8b1 transparent transparent !important;
@@ -528,14 +520,14 @@
top:21px !important; top:21px !important;
left:-10px !important; left:-10px !important;
} }
#sidebar #bookmarksBox .bookmarkList .bookmarkFolder .folderLabel > span > span{ #bookmarksBox.mobile .bookmarkList .bookmarkFolder .folderLabel > span > span{
top:18px !important; top:18px !important;
left:0 !important; left:0 !important;
border-width:0 10px 9px 0 !important; border-width:0 10px 9px 0 !important;
border-color:transparent #069 transparent transparent !important; border-color:transparent #069 transparent transparent !important;
} }
#sidebar #bookmarksBox .bookmarkList .bookmarkFolder.open .folderLabel > span, #bookmarksBox.mobile .bookmarkList .bookmarkFolder.open .folderLabel > span,
#sidebar #bookmarksBox .bookmarkList .bookmarkFolder.open .folderLabel > span > span{ #bookmarksBox.mobile .bookmarkList .bookmarkFolder.open .folderLabel > span > span{
display:block !important; display:block !important;
} }
/********************************************** /**********************************************