From 47200a5c3da7613689c992232f03fc8f686f7a5a Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Sun, 19 Feb 2017 14:15:21 +0200 Subject: [PATCH 01/37] create header, footer, bookmarks area and add panel buttons --- css/main.css | 244 ++++++++++------------------------------- icons/add-folder.png | Bin 0 -> 1385 bytes icons/cancel.png | Bin 0 -> 941 bytes icons/check.png | Bin 0 -> 1117 bytes icons/crop.png | Bin 0 -> 2652 bytes icons/delete.png | Bin 0 -> 1922 bytes icons/folder-arrow.png | Bin 0 -> 827 bytes icons/group-button.png | Bin 0 -> 1357 bytes icons/search.png | Bin 0 -> 1318 bytes icons/sort.png | Bin 0 -> 5191 bytes popup.html | 52 ++------- 11 files changed, 71 insertions(+), 225 deletions(-) create mode 100644 icons/add-folder.png create mode 100644 icons/cancel.png create mode 100644 icons/check.png create mode 100644 icons/crop.png create mode 100644 icons/delete.png create mode 100644 icons/folder-arrow.png create mode 100644 icons/group-button.png create mode 100644 icons/search.png create mode 100644 icons/sort.png diff --git a/css/main.css b/css/main.css index a034533..5115c04 100644 --- a/css/main.css +++ b/css/main.css @@ -1,204 +1,78 @@ -body { - overflow-y: scroll; - height: 800px; - width: 410px; +html { + overflow: hidden; + display: block; } -#top { - height: 120; - margin-top: 10; +body { + height: 600px; + width: 291px; + background-color: #009688; } -#head { - text-align: center; - padding: inherit; +.header { + background-color: #009688; + width: 308px; + height: 47px; } -#group { - position: relative; - left: 23; +.bookmarks { + background-color: #ffffff; + height: 503px; + width: 308px; } -#crop { - position: relative; - left: 46; +.footer { + margin-bottom: 0px; + background-color: #009688; + width: 308px; + height: 50px; } -#tools { - position: relative; - bottom: 10; - right: 1; +.sort{ + position: relative; + margin-left: 20px; + margin-top: 8px; + height: 29px; + width: 29px; } -#bookmarks { - height: 505px; - margin-top: 0px; - /* Keeps the scrollbar on jquery animate*/ - overflow-y: auto !important; - overflow-x: hidden; - position: relative; +.group{ + position: relative; + margin-left: 39px; + margin-top: 8px; + height: 34px; + width: 34px; } -#bottom { - padding-bottom: 10; +.cut{ + position: relative; + margin-left: 39px; + margin-top: 8px; + height: 31px; + width: 31px; } - -} -#apply { - height: 30; -} - -/* Expand folder icon */ -a .dropIcon { - padding: 0 3px 0 0; - color: #555; - font-weight: normal; - background-color: transparent; - background-repeat: no-repeat; - border: none; - cursor: pointer; - overflow: hidden; - outline: none; - transition: all .2s ease-in-out; -} -a .dropIcon:hover { - color: #248232; -} -a .linkIcon { - padding: 0 3px 0 0; - font-weight: normal; - background-color: transparent; - background-repeat: no-repeat; - border: none; - overflow: hidden; - outline: none; -} -.container { - background: #f2f2f2; -} -#bookmarkHeading { - width: 315px; - display: inline-block; -} -.panel-body .form-group { - margin: 0; -} -.search { - height: 50px; - width: 350px; - border: none; -} -.search .form-group{ - overflow-x: hidden; -} +.new_folder{ + position: relative; + margin-left: 39px; + margin-top: 8px; + height: 30px; + width: 31px; +} +/* #search { - width: 350px; - padding-right: 20px; - display: inline-block; - overflow: hidden; -} -#resetSearch { - margin-left: 335px; - margin-top: -30px; - width: 15px; - padding: 0; - background-color: #fff; - background-repeat: no-repeat; - color: #AAAFB5; - border: none; - cursor: pointer; - overflow: hidden; - outline: none; - transition: all .15s ease-in-out; + position: relative; + margin-left: 11px; + width: 280px; + color: #ffffff; + font size: 15px; } -#edit, #add-folder, #trash { - margin-top: -20px; - padding: 5 0 0 0; - background-color: transparent; - color: #fff; - border: none; - cursor: pointer; - overflow: hidden; - outline: none; -} -#edit:hover:not(.disabled), #add-folder:hover, #trash:hover, #resetSearch:hover { - color: #000000; -} -#edit.disabled{ - opacity: 0.65; -} -#add-folder, #trash { - display: none; -} -#edit{ - margin-left: 335px; -} -#add-folder { - margin-left: 297px; -} -#trash { - padding-top: 4px; - margin-left: 262px; -} -#bookmarks ul { - margin: 0; - padding: 0; - list-style-type: none; -} -#bookmarks :nth-child(n+1) ul:empty { - min-height: 20px; - color: #555; -} -#bookmarks :nth-child(n+1) ul:empty:after { - padding-left: 40%; - content: "Drag link here"; -} -#bookmarks .bFolder a { - display: inline-block; - color: #000; - width: 100%; - padding: 10px 12px 10px 8px; - text-decoration: none; - font-weight: bold; - border-top: 1px solid #ddd; -} -#bookmarks .bLink a { - display: inline-block; - color: #000; - width: 100%; - padding: 10px 3px 10px 17px; - text-decoration: none; - font-weight: normal; - border-top: 1px solid #ddd; - min-height: 20px; -} -#bookmarks a:hover { - background-color: #369; - color: #FFF; -} -#bookmarks .bLink a:empty{ - height: 40px; -} -#bookmarks .bLink a:empty:after{ - font-style: italic; - content: "No title"; -} -#bookmarks>ul { - border-left: 1px solid #ddd; - border-right: 1px solid #ddd; - border-bottom: 1px solid #ddd; -} -#bookmarks .selectedLink a { - background-color: #369; - color: #FFF; -} -#bookmarks .editSelectedVal { - background-color: rgba(0, 0, 0, 0.1); - width: 100%; - padding: 10px 12px 10px 8px; - border-top: 1px solid #ddd; -} -#bookmarks .ghost a { - opacity: 0.4; + +::-webkit-input-placeholder { + color: pink; } + +.search_icon { + width: 22px; + height: 22px; +}*/ diff --git a/icons/add-folder.png b/icons/add-folder.png new file mode 100644 index 0000000000000000000000000000000000000000..b32be2e74213c2fd79905ca8a318e7ae801a6185 GIT binary patch literal 1385 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H0wgodS2_SGmUKs7M+SzC{oH>NS%G|oWRDy)vIg-2>Wx(>pOP8zc-fP(BLp1!W^51E7+lsFnrvI9+IG52(F45_&FcJA5ikaUq_^NZ(Z zxJ(Z5Y-;kl%n_8uks`)>ls`tId4|XT#w}+Sxq2TAeYvW1qLY_mS)kYM6%URdn#TVuakI_-=5+a&9#uAf=9 z3n%xT+5ccmUV^pu*}BDX<$3?=^D=+72c>+we<{%aTWF|#_fO9N=|XmCTeFI;lmliv z72+$m@`pUU8=BL9^y1wgx2h+fyur4BGsa=@ceB@ztL1DO=CZCz{=p>qrz>XWV!7iR zD{n_Xl0LAIX>0M14Vxn8{5!oZbkzl`xm>YZ+O|Go4*UIyz4vvfLhIL`w+db6ZA^7- zd3V8m;r{>M{oMH8GUlvrb;;8*_&xg)n?2)^cLEorcpiKW*cmUkX{u|Y-G%R8`k9Kq zxktTT;he!gqg?XJ)eJ}ORhsW!U+63E@~QpxM>p{d>jL%*-C-etXY|kb);!Mtz{2o? z?aSlZZReH#wCPnoGG$nMNOa4_TCs=vGGD5HaWmA&MgP8Rp|k%-u3(1H{7toDi2}Js zFLrx2>d zUwqIT`@_sX^?z-9$U1RNPauI|-1M{~-HXHYDd!?E(@v8T( z&7UrwYW?0iwLHSegE7N+)^pKq*~K%R_s(KW zsOFrSD%&t6Ao3dH5jO4y-G*M)17Zh`F(q&(Br|Sc-LR422GflQh8)Hm9foZTX6LT6 zlu8F>9Ngs^7bd^z%d3s9_dfF*S!mYp5}V^6@4C43Mayw%*--T@ih;!twdl5* zuH3fbaOB$cH8aF_*s_-#JekYOeTiXtdEIW_2fpvW%`GpKZg_tG>#rA&%o@69e8{V3 z5>J+HxZ}=sIqt2$vg-F(z84j83eUIlx?dFA^;&KB3sI_-2x}j_i@=oTn7-UEA95Bi5ropMl}FO~Pje?gLl?>QL}Q z(_d22Q{1mT5qCMhv2|_NiMTG91p~4QX?Yp3wL7a?9cenv)t+E}XvRxH#O1 zDTB#8=}W@d7aogaix?Fw-yE0RHtU3C^WRCc=W?7(e(7lL77_2~(v!q;_mXmd;~w_# z4Bbf?sNS%G|oWRDy)vIg-2>Wx(>pOP8zc-fP(BLp1!W^51E9R~)og0~V$U%TrSAJ@7 zq|DTF{fh-2rB1sSxBtg&k5E;{WAheHfBIlTd(I}kR=&v8$?mUD@>h1A*zCs?`BYPB z{W6x_`>uFycZ7L zOWc|?x&N?SX1l=|@}f|9#l&Q_fThR07x?u|J%qk!g@#}1cX96zw+(sy>R?i? z)i1|gPrc|rIpvbPSAciDf}?5eW)_QIYMdLsTor!sa<$rlE8*S^tJhCrh_1I{-1je} zN$S^O&Q~w^RSPb!53zjj_)kpXzkterDV6;KO8Z6B{u{ddE1vPEjpL`T;iuV)o@_sQ zQod(`y_9mjh1b7|IW>(eKZPVexduHs{p5tW*ChR^s_{C$`(ozR9A^1BP4bg(@RQrm zPMG^m%Ac!x-^O=et({E6-~Y-^nnf?#CqB8zzwqSJ_kL6S?@!fQzE3(bu2y{4onOyd zetz}UH2iYbqwtGw#>OvKJ3oF2U1|9B>WRXyp)WRmUC#UA>vEl}7yPrYT$K0uV4u-h zdqwQ;hOJ9=87I^wH?8YzPWZ*kxhu_&>D7Ie7qhImR@F~jko`_)!#~fabtex$_{9#C z^cTPI-{XR5?VgT*(M@K5Z4ZXI*ZXgfeO=FJ_GH`hRNgmhfGJb8#5JNMC9x#cD!C{X zNHG{07@F%E80i{XgculE85>#|8fhCCS{WE*h5WsOq9HdwB{QuOw+3lW*9@QrNstY} s`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0TnTLy85}Sb4q9e0Ax#$;Q#;t literal 0 HcmV?d00001 diff --git a/icons/check.png b/icons/check.png new file mode 100644 index 0000000000000000000000000000000000000000..e1103dbb88bbb76e20c501a2c652cdddabb6dbaa GIT binary patch literal 1117 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H0wgodS2_SGmUKs7M+SzC{oH>NS%G|oWRDy)vIg-2>Wx(>pOP8zc-fP(BLp1!W^51E9Rq!^U8Hn=e`Fl&3dIEGZ*dV9w@dy1pP(T|(k zT0|Io85QRWG`qQ#s$D-_hPPTm&t^HG_(qM8t zmqkPS3#|{$k0V($&am%G5jfDuU$P?qePjHKz593MXJ26m-*7sk_llv7R-TJ22SHx87yP~g(>DKSQl~nUs z`u>k&=5;gw(`=h?rvFYxOX025>de^U5*fw2a{TZzva(3?+8Z_Um_c5t{ z5!bgSpkP*WOtjhlp78pg6W_{YeOPebW{Ua#_VZztH)PH~Ii3If^D?gX}+cd?=hJ zbhl%y_4!8$TO` zuk4Im8?5HhDzD+_^@o8o=yA2*1f~1QO(8$$2`xGEeS$*izT_sEAAFoe55;{Z2=8}j zDxdi=+Gm1ty`rP>eXF@=rtmZ5JpLN`L;uF=eW@=vjz|7yuWK{Ev2tI$B&Sv7EdQUi zoVC*y?>XB0YWCVK3IAi}ihfzxRd*%ua73yb?^bA%g;Kh2%*}pm;C~Rcaw9M&sg}4# zl%yn~RsLyHgtBP$~_D+2><14AGwWUO%uMMG|WN@iLmZVkzK z6ViYhBtbR==ckpFCl;kLl$V$5W#(lUCnpx9>g5-u&wghk1ysb~>FVdQ&MBb@0H0IW AC;$Ke literal 0 HcmV?d00001 diff --git a/icons/crop.png b/icons/crop.png new file mode 100644 index 0000000000000000000000000000000000000000..ed0461a36f3d49bd000378ddef76c4d290e5031f GIT binary patch literal 2652 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 SosASw5re0zpUXO@geCxcI6(;j literal 0 HcmV?d00001 diff --git a/icons/group-button.png b/icons/group-button.png new file mode 100644 index 0000000000000000000000000000000000000000..31670ce264d97308d3385ab6897a6acc6d033235 GIT binary patch literal 1357 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H0wgodS2_SGmUKs7M+SzC{oH>NS%G|oWRDy)vIg-2>Wx(>pOP8zc-fP(BLp1!W^51E9Rcr7c8du{+Nl=gIS45_&FcD8?pXt>1D^S)Ov zTyX6TS-Gt(Y4u89gRoWy){U);oWymN7Om!3*EK73dQ*w!ju)r&y1MhcG)0_RgLGMc zvuARB3fgjY+0p;U)Z8W=+jFE~*MvjW>lc5nDSlT|dG7n|*n4MZex7^g&diA4G^$zYk)=Utb%Xni-@y|`ltC%YEzB9PEhp=AQ zQo(SIZH;CP1NS1$=^r({l-A08McnIabJCkC$N(?6DLGd20A zafHk=5vN7Q3U>}(lsV1bmvKt`P}sb4sm(l|btiYM|H$hmP%+_og?-k`??04(Pg%Eg z_YsDM+=!^~<8?BtGHN^eU;SEr(O~sgZTqQ*MEE`NOWtjQ0T-SVvc(L4d@F&l<# z=4;@v`UrAK@DGMp6+$W2X6`>Y7FC@;F8yY@{6n>U+~!8BKg8ZU`BvBetV;RvtJ6Oj z9TDBpkpATV>_0o&*BSg-!IznQ;I?n9-3OCx_Pd;;7_`@FpYS=w6dT3x>1Wd&&y@%A zoBOZ+o>Fi+OMhF)mVL)1XMS?qBdXodSm5(?l6(m32VV=F;CJ@!uZT_k^k5it#JYM+DtKib{ z&NHXVXMQ*-Q(kDZ`4h`;h63Z~D#ja9*R3|ZsU0-$>1)$duOp^uoZl$^CrZh6()_D8 zWIC4p+38cMP$2TQH|7T?PkU&n+5cmcJWhpgbXsB~~>ztJpSOWpnob4^Ojl%etp5zY)23Pupdor;&LK2j9-sR!<~A)UyRCI%=9B`h9`(OdA}cwTAC6d5WPPvZ#32vcGY`UR zq)Q&phh8 ztPG82D?NY%?PN}v7CMhd8i!PC{xWt~$(69D5&OmP4J literal 0 HcmV?d00001 diff --git a/icons/search.png b/icons/search.png new file mode 100644 index 0000000000000000000000000000000000000000..bbf8902e90e423fdb4c72080f4a909e57ac46210 GIT binary patch literal 1318 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 literal 0 HcmV?d00001 diff --git a/popup.html b/popup.html index 34eb27c..575ef59 100644 --- a/popup.html +++ b/popup.html @@ -1,12 +1,13 @@ + @@ -16,48 +17,19 @@ -
    -
    -
    -

    Bookmark manager

    - Learn more - Backup -
    -
    +
    +
    +
    -
    -

    - Sort - Group - Shorten -

    -
    -
    -
    -

    Bookmarks

    - - - -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    - +
    + + + +
    From b2526e8e97d899895203dc8859c38becacc2f557 Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Sun, 19 Feb 2017 14:43:15 +0200 Subject: [PATCH 02/37] add input line and search button to header --- css/main.css | 94 ++++++++++++++++++++++++++--------------------- js/fontawesome.js | 18 --------- popup.html | 16 ++++---- 3 files changed, 59 insertions(+), 69 deletions(-) delete mode 100644 js/fontawesome.js diff --git a/css/main.css b/css/main.css index 5115c04..3d59ce5 100644 --- a/css/main.css +++ b/css/main.css @@ -9,70 +9,80 @@ body { background-color: #009688; } + +/* Header */ + .header { background-color: #009688; width: 308px; height: 47px; } +#search { + position: relative; + margin-left: 11px; + top: 3px; + width: 270px; + color: #ffffff; + font size: 15px; + display: inline-block; + overflow: hidden; +} + +.search_icon { + margin-left: -21px; + margin-top: 8px; + width: 17px; + height: 17px; +} + + +/* Bookmarks */ + .bookmarks { background-color: #ffffff; height: 503px; width: 308px; } + +/* Footer */ + .footer { - margin-bottom: 0px; + margin-bottom: 0px; background-color: #009688; width: 308px; height: 50px; } -.sort{ - position: relative; - margin-left: 20px; - margin-top: 8px; - height: 29px; - width: 29px; +.sort { + position: relative; + margin-left: 20px; + margin-top: 8px; + height: 29px; + width: 29px; } -.group{ - position: relative; - margin-left: 39px; - margin-top: 8px; - height: 34px; - width: 34px; +.group { + position: relative; + margin-left: 39px; + margin-top: 8px; + height: 34px; + width: 34px; } -.cut{ - position: relative; - margin-left: 39px; - margin-top: 8px; - height: 31px; - width: 31px; +.cut { + position: relative; + margin-left: 39px; + margin-top: 8px; + height: 31px; + width: 31px; } -.new_folder{ - position: relative; - margin-left: 39px; - margin-top: 8px; - height: 30px; - width: 31px; +.new_folder { + position: relative; + margin-left: 39px; + margin-top: 8px; + height: 30px; + width: 31px; } -/* -#search { - position: relative; - margin-left: 11px; - width: 280px; - color: #ffffff; - font size: 15px; -} - -::-webkit-input-placeholder { - color: pink; -} - -.search_icon { - width: 22px; - height: 22px; -}*/ diff --git a/js/fontawesome.js b/js/fontawesome.js deleted file mode 100644 index 12edc09..0000000 --- a/js/fontawesome.js +++ /dev/null @@ -1,18 +0,0 @@ -window.FontAwesomeCdnConfig = { - autoA11y: { - enabled: false - }, - asyncLoading: { - enabled: false - }, - reporting: { - - enabled: true, - domains: "localhost, *.dev" - - }, - useUrl: "use.fontawesome.com", - faCdnUrl: "https://cdn.fontawesome.com:443", - code: "f25384e9ff" -}; -!function(){function a(a){var b,c=[],d=document,e=d.documentElement.doScroll,f="DOMContentLoaded",g=(e?/^loaded|^c/:/^loaded|^i|^c/).test(d.readyState);g||d.addEventListener(f,b=function(){for(d.removeEventListener(f,b),g=1;b=c.shift();)b()}),g?setTimeout(a,0):c.push(a)}function b(a,b){var c=!1;return a.split(",").forEach(function(a){var d=new RegExp(a.trim().replace(".","\\.").replace("*","(.*)"));b.match(d)&&(c=!0)}),c}function c(a){"undefined"!=typeof MutationObserver&&new MutationObserver(a).observe(document,{childList:!0,subtree:!0})}function d(a){var b,c,d,e;a=a||"fa",b=document.querySelectorAll("."+a),Array.prototype.forEach.call(b,function(a){c=a.getAttribute("title"),a.setAttribute("aria-hidden","true"),d=a.nextElementSibling?!a.nextElementSibling.classList.contains("sr-only"):!0,c&&d&&(e=document.createElement("span"),e.innerHTML=c,e.classList.add("sr-only"),a.parentNode.insertBefore(e,a.nextSibling))})}!function(){"use strict";function a(a){l.push(a),1==l.length&&k()}function b(){for(;l.length;)l[0](),l.shift()}function c(a){this.a=m,this.b=void 0,this.f=[];var b=this;try{a(function(a){f(b,a)},function(a){g(b,a)})}catch(c){g(b,c)}}function d(a){return new c(function(b,c){c(a)})}function e(a){return new c(function(b){b(a)})}function f(a,b){if(a.a==m){if(b==a)throw new TypeError;var c=!1;try{var d=b&&b.then;if(null!=b&&"object"==typeof b&&"function"==typeof d)return void d.call(b,function(b){c||f(a,b),c=!0},function(b){c||g(a,b),c=!0})}catch(e){return void(c||g(a,e))}a.a=0,a.b=b,h(a)}}function g(a,b){if(a.a==m){if(b==a)throw new TypeError;a.a=1,a.b=b,h(a)}}function h(b){a(function(){if(b.a!=m)for(;b.f.length;){var a=b.f.shift(),c=a[0],d=a[1],e=a[2],a=a[3];try{0==b.a?e("function"==typeof c?c.call(void 0,b.b):b.b):1==b.a&&("function"==typeof d?e(d.call(void 0,b.b)):a(b.b))}catch(f){a(f)}}})}function i(a){return new c(function(b,c){function d(c){return function(d){g[c]=d,f+=1,f==a.length&&b(g)}}var f=0,g=[];0==a.length&&b(g);for(var h=0;h=i?b():document.fonts.load(j(f,f.family),h).then(function(b){1<=b.length?a():setTimeout(c,25)},function(){b()})}c()}),o=new Promise(function(a,b){setTimeout(b,i)});Promise.race([o,n]).then(function(){a(f)},function(){e(f)})}else b(function(){function b(){var b;(b=-1!=q&&-1!=r||-1!=q&&-1!=s||-1!=r&&-1!=s)&&((b=q!=r&&q!=s&&r!=s)||(null===k&&(b=/AppleWebKit\/([0-9]+)(?:\.([0-9]+))/.exec(window.navigator.userAgent),k=!!b&&(536>parseInt(b[1],10)||536===parseInt(b[1],10)&&11>=parseInt(b[2],10))),b=k&&(q==t&&r==t&&s==t||q==u&&r==u&&s==u||q==v&&r==v&&s==v)),b=!b),b&&(w.parentNode&&w.parentNode.removeChild(w),clearTimeout(x),a(f))}function m(){if((new Date).getTime()-l>=i)w.parentNode&&w.parentNode.removeChild(w),e(f);else{var a=document.hidden;!0!==a&&void 0!==a||(q=n.a.offsetWidth,r=o.a.offsetWidth,s=p.a.offsetWidth,b()),x=setTimeout(m,50)}}var n=new c(h),o=new c(h),p=new c(h),q=-1,r=-1,s=-1,t=-1,u=-1,v=-1,w=document.createElement("div"),x=0;w.dir="ltr",d(n,j(f,"sans-serif")),d(o,j(f,"serif")),d(p,j(f,"monospace")),w.appendChild(n.a),w.appendChild(o.a),w.appendChild(p.a),document.body.appendChild(w),t=n.a.offsetWidth,u=o.a.offsetWidth,v=p.a.offsetWidth,m(),g(n,function(a){q=a,b()}),d(n,j(f,'"'+f.family+'",sans-serif')),g(o,function(a){r=a,b()}),d(o,j(f,'"'+f.family+'",serif')),g(p,function(a){s=a,b()}),d(p,j(f,'"'+f.family+'",monospace'))})})},f=h}();var g={observe:function(a,b){for(var c=b.prefix,d=function(a){var b=a.weight?"-"+a.weight:"",d=a.style?"-"+a.style:"",e=a.className?"-"+a.className:"",g=a.className?"-"+a.className+b+d:"",h=document.getElementsByTagName("html")[0].classList,i=function(a){h.add(c+e+"-"+a),h.add(c+g+"-"+a)},j=function(a){h.remove(c+e+"-"+a),h.remove(c+g+"-"+a)};i("loading"),new f(a.familyName).load(a.testString).then(function(){i("ready"),j("loading")},function(){i("failed"),j("loading")})},e=0;e - @@ -18,18 +17,17 @@
    - +
    - - - - + + + +
    From 134efd4c408c7feb53d58fc6ccaef01eaec1370d Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Sun, 19 Feb 2017 16:02:07 +0200 Subject: [PATCH 03/37] change window size and search line --- css/main.css | 14 ++++++++++---- popup.html | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/css/main.css b/css/main.css index 3d59ce5..5ac6d7c 100644 --- a/css/main.css +++ b/css/main.css @@ -5,7 +5,7 @@ html { body { height: 600px; - width: 291px; + width: 308px; background-color: #009688; } @@ -20,15 +20,19 @@ body { #search { position: relative; - margin-left: 11px; + margin-left: 14px; top: 3px; - width: 270px; + width: 280px; color: #ffffff; font size: 15px; display: inline-block; overflow: hidden; } +#search::-webkit-input-placeholder { + color: #ffffff; +} + .search_icon { margin-left: -21px; margin-top: 8px; @@ -43,6 +47,8 @@ body { background-color: #ffffff; height: 503px; width: 308px; + border-left: 1px double #fafbfb; + border-right: 1px double #fafbfb; } @@ -57,7 +63,7 @@ body { .sort { position: relative; - margin-left: 20px; + margin-left: 28px; margin-top: 8px; height: 29px; width: 29px; diff --git a/popup.html b/popup.html index 9a1ab6e..36c93d5 100644 --- a/popup.html +++ b/popup.html @@ -17,8 +17,8 @@
    - - + +
    From f0a8ea6b99d0986a650f0e8fe7b6eca2d41d35c9 Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Mon, 20 Feb 2017 22:23:43 +0200 Subject: [PATCH 04/37] add and redesign bookmakrs panel, change search line --- css/main.css | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++-- js/popup.js | 5 +-- js/print.js | 35 ++++++++++--------- popup.html | 24 ++++++++----- 4 files changed, 129 insertions(+), 31 deletions(-) diff --git a/css/main.css b/css/main.css index 5ac6d7c..fcc65c6 100644 --- a/css/main.css +++ b/css/main.css @@ -29,10 +29,20 @@ body { overflow: hidden; } +#search:focus { + border-color: inherit; + -webkit-box-shadow: none; + box-shadow: none; +} + #search::-webkit-input-placeholder { color: #ffffff; } +#search:focus::-webkit-input-placeholder { + color: transparent +} + .search_icon { margin-left: -21px; margin-top: 8px; @@ -43,12 +53,92 @@ body { /* Bookmarks */ -.bookmarks { +#bookmarks { background-color: #ffffff; + overflow-y: auto !important; + overflow-x: hidden; height: 503px; width: 308px; - border-left: 1px double #fafbfb; - border-right: 1px double #fafbfb; + font size: 19px; +} + +#bookmarks ul { + margin: 0; + padding: 0; + list-style-type: none; +} + +#bookmarks :nth-child(n+1) ul:empty:after { + border-bottom: 1px solid #ddd; +} + +#bookmarks .bFolder a { + display: inline-block; + color: #000; + width: 308px; + padding: 17px 12px 13px 8px; + text-decoration: none; + font-weight: normal; + border-top: 1px solid #ddd; + font size: 19px; +} + +#bookmarks .bLink a { + display: inline-block; + color: #000; + width: 308px; + padding: 17px 3px 13px 17px; + text-decoration: none; + font-weight: normal; + border-top: 1px solid #ddd; + min-height: 20px; + font size: 19px; +} + +#bookmarks .bLink a:empty { + height: 40px; +} + +#bookmarks .bLink a:empty:after { + font-style: italic; + content: "No title"; +} + +#bookmarks>ul { + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; + border-bottom: 1px solid #ddd; +} + +#bookmarks .selectedLink a { + background-color: #F0F5FF; +} + +#bookmarks .editSelectedVal { + background-color: rgba(0, 0, 0, 0.1); + width: 308px; + padding: 10px 12px 10px 8px; + border-top: 1px solid #ddd; +} + +#bookmarks .ghost a { + opacity: 0.4; +} + +.dropIcon { + position: relative; + margin-top: -2px; + /*margin-left: 13px; только для для bookmarks bar, other bookmarks*/ + width: 17px; + height: 17px; + transform: rotate(270deg); +} + +.linkIcon { + position: relative; + margin-top: -2px; + width: 17px; + height: 17px; } diff --git a/js/popup.js b/js/popup.js index 00bd6d5..f93f489 100644 --- a/js/popup.js +++ b/js/popup.js @@ -11,7 +11,7 @@ $().ready(function() { printBookmarks(); //deleteEmptyFolder(); - $("#sort, #group, #crop").click(function(e) { + $(".sort, .group, .crop").click(function(e) { e.preventDefault(); toggleAllButtons(); }); @@ -30,9 +30,6 @@ $().ready(function() { $("#learn").click(function(e) { window.open("https://github.com/koolzz/bookmark-beautifier", "_blank"); }); - $("#backup").click(function(e) { - window.open("https://support.google.com/chrome/answer/96816?hl=en", "_blank"); - }); $("#search").click(function(e) { $("#search").select(); diff --git a/js/print.js b/js/print.js index 4b6c52e..cdcc2ee 100644 --- a/js/print.js +++ b/js/print.js @@ -1,4 +1,4 @@ -function printBookmarks(callbackList,showChildren) { +function printBookmarks(callbackList, showChildren) { chrome.bookmarks.getTree(function(root) { //console.log(root); $('#bookmarks').empty(); @@ -26,7 +26,7 @@ function printBookmarkFolder(bookmarkFolder, notShowChildren) { list.append(printNode(bookmark)); } else { var folder = printNodeFolder(bookmark); - var r = $(""); + var r = $(""); $(folder).find("a").prepend(r); folder.append(printBookmarkFolder(bookmark, notShowChildren)); if (EDIT_MODE && bookmark.children.length === 0) @@ -36,12 +36,14 @@ function printBookmarkFolder(bookmarkFolder, notShowChildren) { if ($(folder).find('li').is(':visible')) { $('.fa', this).removeClass("fa-chevron-down"); $('.fa', this).addClass("fa-chevron-right"); + //$('.dropIcon', this).css('transform', 'rotate(270deg)'); $(folder).children().hide(); $(folder).find('.dropIcon').show(); $(folder).find('a').css('display', 'inline-block'); } else { $('.fa', this).removeClass("fa-chevron-right"); $('.fa', this).addClass("fa-chevron-down"); + //$('.dropIcon', this).css('transform', 'rotate(0deg)'); $(folder).children().show(); } @@ -71,9 +73,9 @@ function printNode(bookmark) { }); li.append(link); - var hostname = $('').prop('href', bookmark.url).prop('hostname'); - li.find("a").prepend("") - + var hostname = $('').prop('href', bookmark.url).prop('hostname'); + li.find("a").prepend("") + return li; } @@ -166,21 +168,22 @@ function updateBookmarkListBuffer(keys) { function showFolderChildren() { $("#bookmarks ul").each(function(key, e) { - var parentTitle = $(e).siblings('a').text(); - if (parentTitle === "Bookmarks bar" || parentTitle === "Other bookmarks" || parentTitle === "Mobile bookmarks") - return; - if (!$(e).is(":visible")) { - $(e).slideDown(300, function() { - $(e).siblings('a').find('.fa').removeClass("fa-chevron-right"); - $(e).siblings('a').find('.fa').addClass("fa-chevron-down"); - }); - } + var parentTitle = $(e).siblings('a').text(); + if (parentTitle === "Bookmarks bar" || parentTitle === "Other bookmarks" || parentTitle === "Mobile bookmarks") + return; + if (!$(e).is(":visible")) { + $(e).slideDown(300, function() { + $(e).siblings('a').find('.fa').removeClass("fa-chevron-right"); + $(e).siblings('a').find('.fa').addClass("fa-chevron-down"); + }); + } }); } -function hideFolderChildren(){ + +function hideFolderChildren() { $("#bookmarks ul").each(function(key, e) { if (key > 0) { - var parentTitle = $(e).siblings('a').text(); + var parentTitle = $(e).siblings('a').text(); if (parentTitle === "Bookmarks bar" || parentTitle === "Other bookmarks" || parentTitle === "Mobile bookmarks") return; $(e).slideUp(300, function() { diff --git a/popup.html b/popup.html index 36c93d5..106f16a 100644 --- a/popup.html +++ b/popup.html @@ -2,11 +2,11 @@ - + @@ -17,18 +17,26 @@
    - - + +
    -
    +
    - - + + - +
    + From 3b49d092c850e45f3e4e2067a3226793a99806ed Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Tue, 21 Feb 2017 13:25:14 +0200 Subject: [PATCH 05/37] add reset search button, add function to change arrows and fix bookmarks position --- css/main.css | 28 ++++++++++ icons/down.png | Bin 0 -> 719 bytes icons/folder-arrow.png | Bin 827 -> 0 bytes icons/right.png | Bin 0 -> 665 bytes js/fontawesome.js | 18 ++++++ js/popup.js | 121 +++++++++-------------------------------- js/print.js | 37 +++++++------ js/tools.js | 1 + popup.html | 2 + 9 files changed, 96 insertions(+), 111 deletions(-) create mode 100644 icons/down.png delete mode 100644 icons/folder-arrow.png create mode 100644 icons/right.png create mode 100644 js/fontawesome.js diff --git a/css/main.css b/css/main.css index fcc65c6..3a16394 100644 --- a/css/main.css +++ b/css/main.css @@ -50,6 +50,21 @@ body { height: 17px; } +#resetSearch { + width: 15px; + position: relative; + left: 276px; + top: -27px; + padding: 0; + background-color: #009688; + background-repeat: no-repeat; + color: #ffffff; + border: none; + cursor: pointer; + overflow: hidden; + outline: none; + transition: all .15s ease-in-out; +} /* Bookmarks */ @@ -95,6 +110,7 @@ body { font size: 19px; } + #bookmarks .bLink a:empty { height: 40px; } @@ -131,9 +147,21 @@ body { /*margin-left: 13px; только для для bookmarks bar, other bookmarks*/ width: 17px; height: 17px; +} + +#root{ + margin-left: 13px; +} + + +.right { transform: rotate(270deg); } +.down { + transform: rotate(90deg); +} + .linkIcon { position: relative; margin-top: -2px; diff --git a/icons/down.png b/icons/down.png new file mode 100644 index 0000000000000000000000000000000000000000..9256600e0bab60214d374edf1fa4f71351a513aa GIT binary patch literal 719 zcmV;=0x(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;RY^oaRCwC#+Ph90K@BKQqUBW-SO0V>qx- z3$;)SwNMMS(8mlFotJ{soEB5`uJnWdE0 zHL<1*-8`oxesWU%nXXr?2P*j4VNu1nD!7ZsAV;ki|N}l`BD=qDj!qP z+^MMfRNPEu7wS)?%3UfivroIc+dvY(b*S9TzI}bMF1-F!ex|gJ_Ky5Bs^W#@LW?q` zgQ!e02USynXlWXSs;EG;NjD5tP!Vlyl9|n4jYQa!?`StfBnftBY@RY?t; zrtzuojO|+6!&$tO9tx_YGBQJ*IQvjpnIVtHB~)f+=rjBtDmyd6!-g(u49vjgsi&?E zU>U$p@lW{A(5|EQuNoF=p%!YP7HXju`ag`z0RX_aE&nEhQ#Jqq002ovPDHLkV1g$_ BK2HDu literal 0 HcmV?d00001 diff --git a/icons/folder-arrow.png b/icons/folder-arrow.png deleted file mode 100644 index 23207f39302b418aba2fd34aba059163e8c4306f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 827 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;mUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Sk<^iQ#HCfU+*xh|HF0{nIEG~0dwXSfp0Fc>+e2gP zWonDgwt91^OmEOwz{&40g~|O^%mkU9Y%ec+wj!M-kw*?2Tn;j)EL_Mq%f*ZF(V_#) z461$YN{5Qx-2Hg&3}5E6{FpZx=a*kRB_IX@Wv7IX+xNcsom=Q^n<@Lle_iaf(642$ zLKk0WH}SH+71E$wxc%n0+3W8L-k#EMF6GXPrk1WZc^f$#jvU(R|Ni?wXSq}RPk+{* zJa5H`PTxn3#&Y?I3iW%=rRe0_JvrDJd@nCih5u>1ZRJ-@VP|z^v2`_nHoUjxciAks zTXXr+8*7eQ-g`BJ{i|DC{qkp)=ATrASnoN7&C5@6b;$KnIkU{hE@<`I-1(K3-(Rd| zkZqj$HQny>-+HI`mcpNQ2lx|f>KFoS6#f6PIQ+KM+dl9234X=}RL5BbvVcOH44YMzvJUEB4^@jDC-wQj00SME2}+Oa#h z2NbS;JncN|1>pm#^Mw~EH+b8bJ2-npzuUujpdn#`ITKLv-e*n|E1encSj($MH6`AY zFlbAdvz;M>L#$HUf$gAHKBtFb#Iv=G&MdF@FefxTm{88-@K-1Mz~g8B)3>*@g23EQ z|Ck;s2|lV@n4$?xC#of`5hW>!C8<`)MX5lF!N|bST-U%z*U%!w$k@ur+{)No+rZGu zz@SSpeIbg5-29Zxv`X9>e%IWW1!|B4*$|wcR#Ki=l*&+EUaps!mtCBkSdglhUz9%k SosASw5re0zpUXO@geCxcI6(;j diff --git a/icons/right.png b/icons/right.png new file mode 100644 index 0000000000000000000000000000000000000000..92dec51717a6687bee3fb838855599335cf81aad GIT binary patch literal 665 zcmV;K0%rY*P)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;A4x<(RCwCV+P!WQK@bP<|Bn3t^dOOzikj~70O{=bLqbB~&f*!I#=Hesv5jKv zC<!DI!f)*;}r|6)PPm%^I`K8HI z$v07&O8%*`R4S4zNu^@xa#Si>AVsC(B{EbBDUzU4SQ$T+LJPU66kf_pr832wR4P}_ zN2Rh8a8arJ6g*U_ViFE2RWnWfRFij_=O1y)oS~UAurklzZxm?fcnOr*ZXpSeUM zW#G4oCfBGqf;$>_vYF$`nZeMwV-}puKqx;m2%2>HnE}wGi;w)w!cZw@L1-4!{HmK- z=sz0wFi&Uxjb=A$HqLR+2r|8)(o9dNJktw0=*u%bpo6|Wm1pKcvzYkF%gljhGjI2K zna(4fFrlNOegfoB`&luozT(U0Z6nlBLo7rQ?%F~kZV8iL&ffPVu3T)|j*#weaQ00000NkvXXu0mjf$wDli literal 0 HcmV?d00001 diff --git a/js/fontawesome.js b/js/fontawesome.js new file mode 100644 index 0000000..12edc09 --- /dev/null +++ b/js/fontawesome.js @@ -0,0 +1,18 @@ +window.FontAwesomeCdnConfig = { + autoA11y: { + enabled: false + }, + asyncLoading: { + enabled: false + }, + reporting: { + + enabled: true, + domains: "localhost, *.dev" + + }, + useUrl: "use.fontawesome.com", + faCdnUrl: "https://cdn.fontawesome.com:443", + code: "f25384e9ff" +}; +!function(){function a(a){var b,c=[],d=document,e=d.documentElement.doScroll,f="DOMContentLoaded",g=(e?/^loaded|^c/:/^loaded|^i|^c/).test(d.readyState);g||d.addEventListener(f,b=function(){for(d.removeEventListener(f,b),g=1;b=c.shift();)b()}),g?setTimeout(a,0):c.push(a)}function b(a,b){var c=!1;return a.split(",").forEach(function(a){var d=new RegExp(a.trim().replace(".","\\.").replace("*","(.*)"));b.match(d)&&(c=!0)}),c}function c(a){"undefined"!=typeof MutationObserver&&new MutationObserver(a).observe(document,{childList:!0,subtree:!0})}function d(a){var b,c,d,e;a=a||"fa",b=document.querySelectorAll("."+a),Array.prototype.forEach.call(b,function(a){c=a.getAttribute("title"),a.setAttribute("aria-hidden","true"),d=a.nextElementSibling?!a.nextElementSibling.classList.contains("sr-only"):!0,c&&d&&(e=document.createElement("span"),e.innerHTML=c,e.classList.add("sr-only"),a.parentNode.insertBefore(e,a.nextSibling))})}!function(){"use strict";function a(a){l.push(a),1==l.length&&k()}function b(){for(;l.length;)l[0](),l.shift()}function c(a){this.a=m,this.b=void 0,this.f=[];var b=this;try{a(function(a){f(b,a)},function(a){g(b,a)})}catch(c){g(b,c)}}function d(a){return new c(function(b,c){c(a)})}function e(a){return new c(function(b){b(a)})}function f(a,b){if(a.a==m){if(b==a)throw new TypeError;var c=!1;try{var d=b&&b.then;if(null!=b&&"object"==typeof b&&"function"==typeof d)return void d.call(b,function(b){c||f(a,b),c=!0},function(b){c||g(a,b),c=!0})}catch(e){return void(c||g(a,e))}a.a=0,a.b=b,h(a)}}function g(a,b){if(a.a==m){if(b==a)throw new TypeError;a.a=1,a.b=b,h(a)}}function h(b){a(function(){if(b.a!=m)for(;b.f.length;){var a=b.f.shift(),c=a[0],d=a[1],e=a[2],a=a[3];try{0==b.a?e("function"==typeof c?c.call(void 0,b.b):b.b):1==b.a&&("function"==typeof d?e(d.call(void 0,b.b)):a(b.b))}catch(f){a(f)}}})}function i(a){return new c(function(b,c){function d(c){return function(d){g[c]=d,f+=1,f==a.length&&b(g)}}var f=0,g=[];0==a.length&&b(g);for(var h=0;h=i?b():document.fonts.load(j(f,f.family),h).then(function(b){1<=b.length?a():setTimeout(c,25)},function(){b()})}c()}),o=new Promise(function(a,b){setTimeout(b,i)});Promise.race([o,n]).then(function(){a(f)},function(){e(f)})}else b(function(){function b(){var b;(b=-1!=q&&-1!=r||-1!=q&&-1!=s||-1!=r&&-1!=s)&&((b=q!=r&&q!=s&&r!=s)||(null===k&&(b=/AppleWebKit\/([0-9]+)(?:\.([0-9]+))/.exec(window.navigator.userAgent),k=!!b&&(536>parseInt(b[1],10)||536===parseInt(b[1],10)&&11>=parseInt(b[2],10))),b=k&&(q==t&&r==t&&s==t||q==u&&r==u&&s==u||q==v&&r==v&&s==v)),b=!b),b&&(w.parentNode&&w.parentNode.removeChild(w),clearTimeout(x),a(f))}function m(){if((new Date).getTime()-l>=i)w.parentNode&&w.parentNode.removeChild(w),e(f);else{var a=document.hidden;!0!==a&&void 0!==a||(q=n.a.offsetWidth,r=o.a.offsetWidth,s=p.a.offsetWidth,b()),x=setTimeout(m,50)}}var n=new c(h),o=new c(h),p=new c(h),q=-1,r=-1,s=-1,t=-1,u=-1,v=-1,w=document.createElement("div"),x=0;w.dir="ltr",d(n,j(f,"sans-serif")),d(o,j(f,"serif")),d(p,j(f,"monospace")),w.appendChild(n.a),w.appendChild(o.a),w.appendChild(p.a),document.body.appendChild(w),t=n.a.offsetWidth,u=o.a.offsetWidth,v=p.a.offsetWidth,m(),g(n,function(a){q=a,b()}),d(n,j(f,'"'+f.family+'",sans-serif')),g(o,function(a){r=a,b()}),d(o,j(f,'"'+f.family+'",serif')),g(p,function(a){s=a,b()}),d(p,j(f,'"'+f.family+'",monospace'))})})},f=h}();var g={observe:function(a,b){for(var c=b.prefix,d=function(a){var b=a.weight?"-"+a.weight:"",d=a.style?"-"+a.style:"",e=a.className?"-"+a.className:"",g=a.className?"-"+a.className+b+d:"",h=document.getElementsByTagName("html")[0].classList,i=function(a){h.add(c+e+"-"+a),h.add(c+g+"-"+a)},j=function(a){h.remove(c+e+"-"+a),h.remove(c+g+"-"+a)};i("loading"),new f(a.familyName).load(a.testString).then(function(){i("ready"),j("loading")},function(){i("failed"),j("loading")})},e=0;e bName) ? 1 : 0)); } @@ -361,44 +343,6 @@ function updateVal(currentLi, oldVal, url) { } -function toggleAllButtons() { - if ($("#sort").hasClass("disabled")) { - $('#bookmarks').animate({ - height: 505 - }, 600); - $(".search").slideDown(600); - $("#decision").slideUp(500, function() { - $("#decision").css('display', 'none'); - }); - $('body').animate({ - scrollTop: 1 - }, 700); - } else { - $(".search").slideUp(600); - $('#bookmarks').animate({ - height: 475 - }, 600); - $("#decision").slideDown(500); - $('body').animate({ - scrollTop: 300 - }, 700); - } - toggleButtons(["#reject", "#apply"]); - toggleButtons(["#sort", "#group", "#crop","#edit"]); -} - -function toggleButtons(idList) { - idList.forEach(function(id) { - var button = $(id); - if (button.hasClass("disabled")) { - button.removeClass("disabled"); - button.addClass("active"); - } else { - button.removeClass("active"); - button.addClass("disabled"); - } - }); -} function searchBookmark(text) { var keys = { @@ -415,31 +359,6 @@ function searchBookmark(text) { }); } -function showEditButtons() { - $(".search").slideUp(400, function print() { - printBookmarks([sortableList, showFolderChildren]); - }); - $("#add-folder").fadeIn(400); - $("#trash").fadeIn(400); - $("#search").val(''); -} - -function hideEditButtons() { - hideFolderChildren(); - $(".search").slideDown(400, function print() { - printBookmarks(); - }); - $("#add-folder").fadeOut(400); - $("#trash").fadeOut(400); - $("#search").val(''); - $('#search').attr("placeholder", "Type bookmark name"); -} - -function showSearchLine() { - $(".search").slideDown(400); - $('#search').attr("placeholder", "New folder name"); -} - function addNewFolder(name) { chrome.bookmarks.create({ 'parentId': '1', @@ -450,6 +369,20 @@ function addNewFolder(name) { $('#bookmarks').animate({ scrollTop: length }, 700); - }],true); + }], true); }); } + +function showSearchLine(){ + +} + +function showReserSearch(){ + $("#resetSearch").show(); + $(".search_icon").hide(); +} + +function showSearchIcon(){ + $("#resetSearch").hide(); + $(".search_icon").show(); +} diff --git a/js/print.js b/js/print.js index cdcc2ee..4fd80b1 100644 --- a/js/print.js +++ b/js/print.js @@ -3,12 +3,18 @@ function printBookmarks(callbackList, showChildren) { //console.log(root); $('#bookmarks').empty(); ROOT_TABS = root[0].children.length; + FIRST_TABS = root[0].children[0].children.length; root.forEach(function(folder) { $('#bookmarks').append(printBookmarkFolder(folder, showChildren)); $('#bookmarks .bFolder').each(function(index, val) { var depth = $(val).parents("ul").length, padding = 20; - $(val).children().find('a').css('padding-left', depth * padding); + if (root.id > FIRST_TABS){ + $(val).children().find('a').css('padding-left', depth * padding); + } else{ + $(val).children().find('a').css('padding-left', depth * padding + 13); + } + }); if (callbackList) { for (var i = 0, len = callbackList.length; i < len; i++) { @@ -26,24 +32,26 @@ function printBookmarkFolder(bookmarkFolder, notShowChildren) { list.append(printNode(bookmark)); } else { var folder = printNodeFolder(bookmark); - var r = $(""); - $(folder).find("a").prepend(r); + + if (bookmark.id > ROOT_TABS) { + var r = $(""); + $(folder).find("a").prepend(r); + } else { + var r = $(""); + $(folder).find("a").prepend(r); + } folder.append(printBookmarkFolder(bookmark, notShowChildren)); if (EDIT_MODE && bookmark.children.length === 0) folder.addClass("is-empty"); list.append(folder); $(r).click(function(e) { if ($(folder).find('li').is(':visible')) { - $('.fa', this).removeClass("fa-chevron-down"); - $('.fa', this).addClass("fa-chevron-right"); - //$('.dropIcon', this).css('transform', 'rotate(270deg)'); + $('.dropIcon', this).attr('src', 'icons/right.png'); $(folder).children().hide(); $(folder).find('.dropIcon').show(); $(folder).find('a').css('display', 'inline-block'); } else { - $('.fa', this).removeClass("fa-chevron-right"); - $('.fa', this).addClass("fa-chevron-down"); - //$('.dropIcon', this).css('transform', 'rotate(0deg)'); + $('.dropIcon', this).attr('src', 'icons/down.png'); $(folder).children().show(); } @@ -55,8 +63,7 @@ function printBookmarkFolder(bookmarkFolder, notShowChildren) { $(folder).find('.dropIcon').show(); $(folder).find('a').css('display', 'inline-block'); } else { - $(folder).children('a').find('.fa').removeClass("fa-chevron-right"); - $(folder).children('a').find('.fa').addClass("fa-chevron-down"); + $(folder).children('a').find('.dropIcon').attr('src', 'icons/down.png'); } } @@ -156,13 +163,11 @@ function updateBookmarkListBuffer(keys) { e.preventDefault(); $('#apply').unbind("click"); printBookmarks(); - toggleAllButtons(); }); $('#apply').one("click", function(e) { e.preventDefault(); $('#reject').unbind("click"); updateBookmarks(keys, true); - toggleAllButtons(); }); } @@ -173,8 +178,7 @@ function showFolderChildren() { return; if (!$(e).is(":visible")) { $(e).slideDown(300, function() { - $(e).siblings('a').find('.fa').removeClass("fa-chevron-right"); - $(e).siblings('a').find('.fa').addClass("fa-chevron-down"); + $(e).siblings('a').find('.dropIcon').attr('src', 'icons/down.png'); }); } }); @@ -187,8 +191,7 @@ function hideFolderChildren() { if (parentTitle === "Bookmarks bar" || parentTitle === "Other bookmarks" || parentTitle === "Mobile bookmarks") return; $(e).slideUp(300, function() { - $(e).siblings('a').find('.fa').removeClass("fa-chevron-down"); - $(e).siblings('a').find('.fa').addClass("fa-chevron-right"); + $(e).siblings('a').find('.dropIcon').attr('src', 'icons/right.png'); }); } }); diff --git a/js/tools.js b/js/tools.js index dbac785..23a50f0 100644 --- a/js/tools.js +++ b/js/tools.js @@ -1,3 +1,4 @@ + function sort(list) { list.children.sort(sortByName); list.children.forEach(function(folder) { diff --git a/popup.html b/popup.html index 106f16a..56c082e 100644 --- a/popup.html +++ b/popup.html @@ -6,6 +6,7 @@ + @@ -19,6 +20,7 @@
    +
    From 0065eb56e04b83e4c0d9a91f1fe577f413f7e3c6 Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Tue, 21 Feb 2017 17:21:09 +0200 Subject: [PATCH 06/37] change window size --- css/main.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/css/main.css b/css/main.css index 3a16394..10498cd 100644 --- a/css/main.css +++ b/css/main.css @@ -5,7 +5,7 @@ html { body { height: 600px; - width: 308px; + width: 358px; background-color: #009688; } @@ -14,7 +14,7 @@ body { .header { background-color: #009688; - width: 308px; + width: 358px; height: 47px; } @@ -22,7 +22,7 @@ body { position: relative; margin-left: 14px; top: 3px; - width: 280px; + width: 330px; color: #ffffff; font size: 15px; display: inline-block; @@ -53,7 +53,7 @@ body { #resetSearch { width: 15px; position: relative; - left: 276px; + left: 326px; top: -27px; padding: 0; background-color: #009688; @@ -73,7 +73,7 @@ body { overflow-y: auto !important; overflow-x: hidden; height: 503px; - width: 308px; + width: 358px; font size: 19px; } @@ -90,7 +90,7 @@ body { #bookmarks .bFolder a { display: inline-block; color: #000; - width: 308px; + width: 358px; padding: 17px 12px 13px 8px; text-decoration: none; font-weight: normal; @@ -101,7 +101,7 @@ body { #bookmarks .bLink a { display: inline-block; color: #000; - width: 308px; + width: 358px; padding: 17px 3px 13px 17px; text-decoration: none; font-weight: normal; @@ -132,7 +132,7 @@ body { #bookmarks .editSelectedVal { background-color: rgba(0, 0, 0, 0.1); - width: 308px; + width: 358px; padding: 10px 12px 10px 8px; border-top: 1px solid #ddd; } @@ -175,7 +175,7 @@ body { .footer { margin-bottom: 0px; background-color: #009688; - width: 308px; + width: 358px; height: 50px; } @@ -189,7 +189,7 @@ body { .group { position: relative; - margin-left: 39px; + margin-left: 55px; margin-top: 8px; height: 34px; width: 34px; @@ -197,7 +197,7 @@ body { .cut { position: relative; - margin-left: 39px; + margin-left: 55px; margin-top: 8px; height: 31px; width: 31px; @@ -205,7 +205,7 @@ body { .new_folder { position: relative; - margin-left: 39px; + margin-left: 55px; margin-top: 8px; height: 30px; width: 31px; From cc76bdbe70e612b910df3195e42a1eb38f434ca3 Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Tue, 21 Feb 2017 21:11:56 +0200 Subject: [PATCH 07/37] fix bug with root folders and slightly changed design --- css/main.css | 20 +++++--------------- js/popup.js | 14 +++++++------- js/print.js | 10 +++++----- js/tools.js | 1 - 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/css/main.css b/css/main.css index 10498cd..1bdb4b3 100644 --- a/css/main.css +++ b/css/main.css @@ -66,6 +66,7 @@ body { transition: all .15s ease-in-out; } + /* Bookmarks */ #bookmarks { @@ -95,7 +96,7 @@ body { text-decoration: none; font-weight: normal; border-top: 1px solid #ddd; - font size: 19px; + font size: 15px; } #bookmarks .bLink a { @@ -110,7 +111,6 @@ body { font size: 19px; } - #bookmarks .bLink a:empty { height: 40px; } @@ -144,22 +144,12 @@ body { .dropIcon { position: relative; margin-top: -2px; - /*margin-left: 13px; только для для bookmarks bar, other bookmarks*/ - width: 17px; + width: 22px; height: 17px; } -#root{ - margin-left: 13px; -} - - -.right { - transform: rotate(270deg); -} - -.down { - transform: rotate(90deg); +#root { + margin-left: 13px; } .linkIcon { diff --git a/js/popup.js b/js/popup.js index e23c4a6..2b601d7 100644 --- a/js/popup.js +++ b/js/popup.js @@ -373,16 +373,16 @@ function addNewFolder(name) { }); } -function showSearchLine(){ +function showSearchLine() { } -function showReserSearch(){ - $("#resetSearch").show(); - $(".search_icon").hide(); +function showReserSearch() { + $("#resetSearch").show(); + $(".search_icon").hide(); } -function showSearchIcon(){ - $("#resetSearch").hide(); - $(".search_icon").show(); +function showSearchIcon() { + $("#resetSearch").hide(); + $(".search_icon").show(); } diff --git a/js/print.js b/js/print.js index 4fd80b1..787ac45 100644 --- a/js/print.js +++ b/js/print.js @@ -9,10 +9,10 @@ function printBookmarks(callbackList, showChildren) { $('#bookmarks .bFolder').each(function(index, val) { var depth = $(val).parents("ul").length, padding = 20; - if (root.id > FIRST_TABS){ - $(val).children().find('a').css('padding-left', depth * padding); - } else{ - $(val).children().find('a').css('padding-left', depth * padding + 13); + if (root.id > FIRST_TABS) { + $(val).children().find('a').css('padding-left', depth * padding); + } else { + $(val).children().find('a').css('padding-left', depth * padding + 13); } }); @@ -37,7 +37,7 @@ function printBookmarkFolder(bookmarkFolder, notShowChildren) { var r = $(""); $(folder).find("a").prepend(r); } else { - var r = $(""); + var r = $(" "); $(folder).find("a").prepend(r); } folder.append(printBookmarkFolder(bookmark, notShowChildren)); diff --git a/js/tools.js b/js/tools.js index 23a50f0..dbac785 100644 --- a/js/tools.js +++ b/js/tools.js @@ -1,4 +1,3 @@ - function sort(list) { list.children.sort(sortByName); list.children.forEach(function(folder) { From e0293f52a4a7977379022e75cfa574dcde080a36 Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Tue, 21 Feb 2017 21:57:08 +0200 Subject: [PATCH 08/37] add func to sort, crop and group bookmarks with decisions bar --- css/main.css | 28 ++++++++++++++++++++++++---- js/popup.js | 18 ++++++++++++------ js/print.js | 10 ++++++++-- popup.html | 17 ++++++++++------- 4 files changed, 54 insertions(+), 19 deletions(-) diff --git a/css/main.css b/css/main.css index 1bdb4b3..d9bb492 100644 --- a/css/main.css +++ b/css/main.css @@ -169,7 +169,7 @@ body { height: 50px; } -.sort { +#sort { position: relative; margin-left: 28px; margin-top: 8px; @@ -177,7 +177,7 @@ body { width: 29px; } -.group { +#group { position: relative; margin-left: 55px; margin-top: 8px; @@ -185,7 +185,7 @@ body { width: 34px; } -.cut { +#crop { position: relative; margin-left: 55px; margin-top: 8px; @@ -193,10 +193,30 @@ body { width: 31px; } -.new_folder { +#new_folder { position: relative; margin-left: 55px; margin-top: 8px; height: 30px; width: 31px; } + +.decision { + width: 358px; +} + +#apply { + position: absolute; + width: 27px; + height: 27px; + margin-left: 124px; + margin-top: 11px; +} + +#reject { + position: absolute; + width: 25px; + height: 25px; + margin-left: 209px; + margin-top: 11px; +} diff --git a/js/popup.js b/js/popup.js index 2b601d7..2b6dd94 100644 --- a/js/popup.js +++ b/js/popup.js @@ -4,18 +4,14 @@ var EDIT_MODE = false; $().ready(function() { 'use strict'; - $("#resetSearch").hide(); + showSearchIcon(); + showToolsBar(); $(window).blur(function() { window.close; }); printBookmarks(); - //deleteEmptyFolder(); - - $(".sort, .group, .crop").click(function(e) { - e.preventDefault(); - }); $("#sort").click(function(e) { previewFunction(sort); @@ -386,3 +382,13 @@ function showSearchIcon() { $("#resetSearch").hide(); $(".search_icon").show(); } + +function showDecisionBar(){ + $('#tools').hide(); + $('.decision').show(); +} + +function showToolsBar(){ + $('.decision').hide(); + $('#tools').show(); +} diff --git a/js/print.js b/js/print.js index 787ac45..15c072f 100644 --- a/js/print.js +++ b/js/print.js @@ -104,7 +104,7 @@ function previewFunction(callbackFunction) { root[0].children.forEach(function(folder) { keys.children.push(folder); }); - + showDecisionBar(); callbackFunction(keys); updateBookmarkListBuffer(keys); }); @@ -157,17 +157,23 @@ function updateBookmarkListBuffer(keys) { $('#bookmarks .bFolder').each(function(index, val) { var depth = $(val).parents("ul").length, padding = 20; - $(val).children().find('a').css('padding-left', depth * padding); + if (root.id > FIRST_TABS) { + $(val).children().find('a').css('padding-left', depth * padding); + } else { + $(val).children().find('a').css('padding-left', depth * padding + 13); + } }); $('#reject').one("click", function(e) { e.preventDefault(); $('#apply').unbind("click"); printBookmarks(); + showToolsBar(); }); $('#apply').one("click", function(e) { e.preventDefault(); $('#reject').unbind("click"); updateBookmarks(keys, true); + showToolsBar(); }); } diff --git a/popup.html b/popup.html index 56c082e..44004b3 100644 --- a/popup.html +++ b/popup.html @@ -26,15 +26,18 @@
    - - - - +
    + + + + +
    +
    + + +
    From eed9b2f431f7dce1a7465f2d62167eec7e8686a5 Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Mon, 13 Mar 2017 00:53:17 +0200 Subject: [PATCH 13/37] fix bug with reject in new_folder section --- js/popup.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/popup.js b/js/popup.js index 8f3e108..d68857e 100644 --- a/js/popup.js +++ b/js/popup.js @@ -36,6 +36,11 @@ $().ready(function() { showNewFolderBar(); }); + $("#reject_folder").click(function() { + $("#create_new_folder").val(''); + showToolsBar(); + }); + $('#trash').click(function(e) { var list = $(".selectedLink"); var r = confirm("Delete " + list.length + " selected bookmarks?"); @@ -58,11 +63,6 @@ $().ready(function() { showToolsBar(); } - $("#reject_folder").click(function() { - $("#create_new_folder").val(''); - showToolsBar(); - }); - $("#apply_folder").click(function() { if ($("#create_new_folder").val().trim().length != 0) { addNewFolder($("#create_new_folder").val().trim()); From 5c0a19d81a8b175e8c0705f6743a5dcd025e80cb Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Mon, 13 Mar 2017 01:02:52 +0200 Subject: [PATCH 14/37] fix bug with trash icon in sort, crop, group mode --- js/popup.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/popup.js b/js/popup.js index d68857e..b9fe6af 100644 --- a/js/popup.js +++ b/js/popup.js @@ -460,6 +460,7 @@ function showDecisionBar() { function showToolsBar() { $('.decision').hide(); $('.add_new_folder').hide(); + $('#trash').hide(); $('#tools').show(); } @@ -471,9 +472,11 @@ function showNewFolderBar(){ // trash icon function showTrashIcon() { + $("#trash").show(); $("#trash").animate({top: 500, opacity:'1'},500); } function hideTrashIcon(){ $("#trash").animate({top: 560, opacity:'0'},500); + $("#trash").hide(); } From e84a623bdebd9c64f4e76b662b8b4610fb5c9c0b Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Mon, 13 Mar 2017 01:19:00 +0200 Subject: [PATCH 15/37] change trash button location and animation --- css/main.css | 2 +- js/popup.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/main.css b/css/main.css index 5ead3e5..99f606b 100644 --- a/css/main.css +++ b/css/main.css @@ -228,7 +228,7 @@ body { top: 560px; width: 4rem; height: 4rem; - left: 160; + left: 292; } .add_new_folder{ diff --git a/js/popup.js b/js/popup.js index b9fe6af..7d5ed8b 100644 --- a/js/popup.js +++ b/js/popup.js @@ -52,6 +52,7 @@ $().ready(function() { }); } hideTrashIcon(); + showToolsBar(); }); $("#create_new_folder").keyup(function(e) { @@ -478,5 +479,4 @@ function showTrashIcon() { function hideTrashIcon(){ $("#trash").animate({top: 560, opacity:'0'},500); - $("#trash").hide(); } From 1e4f420d43221e0b4f8d55e0052e2f45dc95f538 Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Sun, 12 Mar 2017 21:26:57 -0400 Subject: [PATCH 16/37] Fixed edit opnening link bug --- js/popup.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/popup.js b/js/popup.js index 7d5ed8b..5b33858 100644 --- a/js/popup.js +++ b/js/popup.js @@ -101,8 +101,13 @@ $().ready(function() { editLinkdelay = 300; $("#bookmarks").on('click', '.bLink', '.selectedLink', function selectFunction(e) { e.preventDefault(); - clicks++; var li = $(e.currentTarget); + + if (li.find(".editSelectedVal").length>0) { + return; + } + + clicks++; if (clicks === 1) { showTrashIcon(); if (li.hasClass("selectedLink")) { From dae778a50bb8a472e0e667743f39a054a8ffb3ed Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Mon, 13 Mar 2017 18:57:31 +0200 Subject: [PATCH 17/37] fix bug with trash icons in sort, group, crop mode --- js/popup.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/popup.js b/js/popup.js index 5b33858..d6dcdea 100644 --- a/js/popup.js +++ b/js/popup.js @@ -15,14 +15,17 @@ $().ready(function() { $("#sort").click(function(e) { previewFunction(sort); + hideTrashIcon(); }); $("#group").click(function(e) { previewFunction(group); + hideTrashIcon(); }); $("#crop").click(function(e) { previewFunction(crop); + hideTrashIcon(); }); $("#learn").click(function(e) { window.open("https://github.com/koolzz/bookmark-beautifier", "_blank"); @@ -52,7 +55,6 @@ $().ready(function() { }); } hideTrashIcon(); - showToolsBar(); }); $("#create_new_folder").keyup(function(e) { @@ -102,11 +104,11 @@ $().ready(function() { $("#bookmarks").on('click', '.bLink', '.selectedLink', function selectFunction(e) { e.preventDefault(); var li = $(e.currentTarget); - + if (li.find(".editSelectedVal").length>0) { return; } - + clicks++; if (clicks === 1) { showTrashIcon(); @@ -484,4 +486,5 @@ function showTrashIcon() { function hideTrashIcon(){ $("#trash").animate({top: 560, opacity:'0'},500); + showToolsBar(); } From eb16f3e2b90cad62137d8d9bba75b0c03a01c447 Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Mon, 13 Mar 2017 21:57:02 +0200 Subject: [PATCH 18/37] add learn more button --- css/main.css | 8 ++++++++ icons/question-mark.svg | 44 +++++++++++++++++++++++++++++++++++++++++ js/popup.js | 1 + popup.html | 1 + 4 files changed, 54 insertions(+) create mode 100644 icons/question-mark.svg diff --git a/css/main.css b/css/main.css index 99f606b..342c8bc 100644 --- a/css/main.css +++ b/css/main.css @@ -69,6 +69,14 @@ body { /* Bookmarks */ +#learn { + position: absolute; + width: 1.5rem; + height: 1.5rem; + top: 60px; + right: 30px; +} + #bookmarks { background-color: #ffffff; overflow-y: auto !important; diff --git a/icons/question-mark.svg b/icons/question-mark.svg new file mode 100644 index 0000000..a26d093 --- /dev/null +++ b/icons/question-mark.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/js/popup.js b/js/popup.js index d6dcdea..d3f1aa8 100644 --- a/js/popup.js +++ b/js/popup.js @@ -27,6 +27,7 @@ $().ready(function() { previewFunction(crop); hideTrashIcon(); }); + $("#learn").click(function(e) { window.open("https://github.com/koolzz/bookmark-beautifier", "_blank"); }); diff --git a/popup.html b/popup.html index faa6ffe..dfa5753 100644 --- a/popup.html +++ b/popup.html @@ -22,6 +22,7 @@
    +
    From 0af9b08858e562860852ea74e3db37c8a533939b Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Tue, 14 Mar 2017 00:38:47 +0200 Subject: [PATCH 19/37] add animation to decision bar --- js/popup.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/popup.js b/js/popup.js index d3f1aa8..723d965 100644 --- a/js/popup.js +++ b/js/popup.js @@ -27,7 +27,7 @@ $().ready(function() { previewFunction(crop); hideTrashIcon(); }); - + $("#learn").click(function(e) { window.open("https://github.com/koolzz/bookmark-beautifier", "_blank"); }); @@ -463,11 +463,11 @@ function showSearchIcon() { function showDecisionBar() { $('#tools').hide(); - $('.decision').show(); + $('.decision').animate({opacity:1},200); } function showToolsBar() { - $('.decision').hide(); + $('.decision').animate({opacity:0},200); $('.add_new_folder').hide(); $('#trash').hide(); $('#tools').show(); @@ -482,10 +482,10 @@ function showNewFolderBar(){ // trash icon function showTrashIcon() { $("#trash").show(); - $("#trash").animate({top: 500, opacity:'1'},500); + $("#trash").animate({top: 500, opacity:1},500); } function hideTrashIcon(){ - $("#trash").animate({top: 560, opacity:'0'},500); + $("#trash").animate({top: 560, opacity:0},500); showToolsBar(); } From 678b571774d5c0fb54d7a9e136dd0e094c9c4e3b Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Tue, 14 Mar 2017 00:59:19 +0200 Subject: [PATCH 20/37] change animation a little bit --- js/popup.js | 47 ++++++++++++++++++++++++++++------------------- popup.html | 10 +++++----- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/js/popup.js b/js/popup.js index 723d965..7028ad4 100644 --- a/js/popup.js +++ b/js/popup.js @@ -68,14 +68,14 @@ $().ready(function() { } $("#apply_folder").click(function() { - if ($("#create_new_folder").val().trim().length != 0) { - addNewFolder($("#create_new_folder").val().trim()); - $("#create_new_folder").val(''); - } - showToolsBar(); + if ($("#create_new_folder").val().trim().length != 0) { + addNewFolder($("#create_new_folder").val().trim()); + $("#create_new_folder").val(''); + } + showToolsBar(); }); - }); + }); $("#search").keyup(function() { if ($("#sort").hasClass("disabled")) @@ -106,7 +106,7 @@ $().ready(function() { e.preventDefault(); var li = $(e.currentTarget); - if (li.find(".editSelectedVal").length>0) { + if (li.find(".editSelectedVal").length > 0) { return; } @@ -462,30 +462,39 @@ function showSearchIcon() { } function showDecisionBar() { - $('#tools').hide(); - $('.decision').animate({opacity:1},200); + $('#tools').hide(200, function() { + $('.decision').show(200); + }); + } function showToolsBar() { - $('.decision').animate({opacity:0},200); + $('.decision').hide(); $('.add_new_folder').hide(); $('#trash').hide(); - $('#tools').show(); + $('#tools').show(400); } // New Folder section -function showNewFolderBar(){ - $('#tools').hide(); - $('.add_new_folder').show(); +function showNewFolderBar() { + $('#tools').hide(200, function() { + $('.add_new_folder').show(300); + }); } // trash icon function showTrashIcon() { - $("#trash").show(); - $("#trash").animate({top: 500, opacity:1},500); + $("#trash").show(); + $("#trash").animate({ + top: 500, + opacity: 1 + }, 500); } -function hideTrashIcon(){ - $("#trash").animate({top: 560, opacity:0},500); - showToolsBar(); +function hideTrashIcon() { + $("#trash").animate({ + top: 560, + opacity: 0 + }, 500); + showToolsBar(); } diff --git a/popup.html b/popup.html index dfa5753..5e0bba5 100644 --- a/popup.html +++ b/popup.html @@ -22,7 +22,7 @@
    - +
    @@ -37,11 +37,11 @@
    - +
    - - - + + +
    From 4c15a5fdb872158017bf2beeec005176552e540d Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Mon, 13 Mar 2017 19:53:05 -0400 Subject: [PATCH 21/37] Small animation fixes --- js/popup.js | 9 ++++----- js/print.js | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/popup.js b/js/popup.js index 7028ad4..dd1d1f5 100644 --- a/js/popup.js +++ b/js/popup.js @@ -15,17 +15,14 @@ $().ready(function() { $("#sort").click(function(e) { previewFunction(sort); - hideTrashIcon(); }); $("#group").click(function(e) { previewFunction(group); - hideTrashIcon(); }); $("#crop").click(function(e) { previewFunction(crop); - hideTrashIcon(); }); $("#learn").click(function(e) { @@ -126,6 +123,9 @@ $().ready(function() { if (window.event.ctrlKey) { li.removeClass("selectedLink"); + if ($(".selectedLink").length ==0) { + hideTrashIcon(); + } clicks = 0; } else { if ($(".selectedLink").length > 1) { @@ -495,6 +495,5 @@ function hideTrashIcon() { $("#trash").animate({ top: 560, opacity: 0 - }, 500); - showToolsBar(); + }, 250); } diff --git a/js/print.js b/js/print.js index 15c072f..e646569 100644 --- a/js/print.js +++ b/js/print.js @@ -97,6 +97,7 @@ function printNodeFolder(bookmark) { } function previewFunction(callbackFunction) { + hideTrashIcon(); var keys = { children: [] }; From ac78047b0daf2739008f9428268e61c73064bffb Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Mon, 13 Mar 2017 20:02:28 -0400 Subject: [PATCH 22/37] Fade animation for main buttons --- js/popup.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/popup.js b/js/popup.js index dd1d1f5..b49657b 100644 --- a/js/popup.js +++ b/js/popup.js @@ -462,8 +462,8 @@ function showSearchIcon() { } function showDecisionBar() { - $('#tools').hide(200, function() { - $('.decision').show(200); + $('#tools').fadeOut(300, function() { + $('.decision').fadeIn(300); }); } @@ -472,13 +472,13 @@ function showToolsBar() { $('.decision').hide(); $('.add_new_folder').hide(); $('#trash').hide(); - $('#tools').show(400); + $('#tools').fadeIn(400); } // New Folder section function showNewFolderBar() { - $('#tools').hide(200, function() { - $('.add_new_folder').show(300); + $('#tools').hide(300, function() { + $('.add_new_folder').fadeIn(300); }); } From d9f3b31788db6112ca7d81a21df3ee6dfd2c7e50 Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Mon, 13 Mar 2017 21:02:28 -0400 Subject: [PATCH 23/37] Added tooltips for main buttons --- css/main.css | 13 +++++++++++++ js/popup.js | 13 +++++++++++++ popup.html | 1 + 3 files changed, 27 insertions(+) diff --git a/css/main.css b/css/main.css index 342c8bc..b2fda57 100644 --- a/css/main.css +++ b/css/main.css @@ -269,3 +269,16 @@ body { margin-left: 310px; margin-top: 13px; } + +#tooltiptext{ + position: absolute; + top:528px; + display: none; + + width: 358px; + background-color: #555; + color: #fff; + text-align: center; + + font-size: 16px; +} \ No newline at end of file diff --git a/js/popup.js b/js/popup.js index b49657b..e8132be 100644 --- a/js/popup.js +++ b/js/popup.js @@ -17,6 +17,19 @@ $().ready(function() { previewFunction(sort); }); + var text ={ + "sort":"Sort bookmarks", + "group":"Group by domain name", + "crop":"Shorten long link titles", + "new_folder":"Add a new folder", + } + $("#sort, #group, #crop, #new_folder").hover(function(e) { + $("#tooltiptext").text(text[e.currentTarget.id]); + $("#tooltiptext").fadeIn(150); + },function(e) { + $("#tooltiptext").fadeOut(150); + }); + $("#group").click(function(e) { previewFunction(group); }); diff --git a/popup.html b/popup.html index 5e0bba5..aff1778 100644 --- a/popup.html +++ b/popup.html @@ -26,6 +26,7 @@
    + Tooltip text
    From dc5d63bfef805ccd4edad543e8efc5e280b2671e Mon Sep 17 00:00:00 2001 From: Alex Kurchev Date: Tue, 14 Mar 2017 15:02:25 +0200 Subject: [PATCH 24/37] Design Upgrade --- css/main.css | 96 ++++++++++++++++++++++++---------------- icons/Untitled-2.psd | Bin 0 -> 57157 bytes icons/cancel.png | Bin 941 -> 15666 bytes icons/check.png | Bin 1117 -> 718 bytes icons/crop.png | Bin 2652 -> 889 bytes icons/delete-button.png | Bin 28412 -> 18778 bytes icons/group.png | Bin 0 -> 1229 bytes icons/logo.png | Bin 0 -> 2742 bytes icons/sort.png | Bin 5191 -> 1609 bytes popup.html | 9 ++-- 10 files changed, 62 insertions(+), 43 deletions(-) create mode 100644 icons/Untitled-2.psd create mode 100644 icons/group.png create mode 100644 icons/logo.png diff --git a/css/main.css b/css/main.css index b2fda57..3f41e31 100644 --- a/css/main.css +++ b/css/main.css @@ -21,35 +21,46 @@ body { #search { position: relative; margin-left: 14px; - top: 3px; - width: 330px; - font size: 15px; + top: 2px; + width: 300px; + font-size: 12px; color: #ffffff; display: inline-block; overflow: hidden; + padding-top: 15px; + padding-bottom: 0.1; + font-family: "Roboto"; +} +#search:hover { + opacity: 0.5; } - #search:focus, #create_new_folder:focus { border-color: inherit; -webkit-box-shadow: none; box-shadow: none; + } #search::-webkit-input-placeholder, #create_new_folder::-webkit-input-placeholder { - color: #ffffff; + color: rgb(255, 255, 255); + } #search:focus::-webkit-input-placeholder, #create_new_folder:focus::-webkit-input-placeholder { - color: transparent + color: transparent; } -.search_icon { +#search_icon { margin-left: -21px; - margin-top: 8px; - width: 17px; - height: 17px; -} + margin-bottom: 3px; + width: 1.7rem; + height: 1.7rem; + opacity: inherit; +} +#search_icon:hover { + opacity: 0.5; +} #resetSearch { width: 15px; position: relative; @@ -66,16 +77,18 @@ body { transition: all .15s ease-in-out; } - -/* Bookmarks */ - #learn { - position: absolute; - width: 1.5rem; - height: 1.5rem; - top: 60px; - right: 30px; + position: relative; + width: 1.8rem; + margin-bottom: 3px; + margin-left: 10px; + color: white; } +#learn:hover { + opacity: 0.5; +} + +/* Bookmarks */ #bookmarks { background-color: #ffffff; @@ -106,7 +119,9 @@ body { border-top: 1px solid #ddd; font size: 15px; } - +.bLink:hover { + border: 1px; +} #bookmarks .bLink a { display: inline-block; color: #000; @@ -177,43 +192,37 @@ body { width: 358px; height: 50px; } - #sort { position: relative; margin-left: 28px; margin-top: 8px; height: 29px; - width: 29px; } - #group { position: relative; margin-left: 55px; margin-top: 8px; height: 34px; - width: 34px; -} +} #crop { position: relative; margin-left: 55px; margin-top: 8px; height: 31px; - width: 31px; } - #new_folder { position: relative; margin-left: 55px; margin-top: 8px; height: 30px; - width: 31px; } - +#sort:hover, #group:hover, #crop:hover, #new_folder:hover { + opacity: 0.5; +} .decision { width: 358px; } - #apply { position: absolute; width: 27px; @@ -224,12 +233,14 @@ body { #reject { position: absolute; - width: 25px; - height: 25px; + width: 28px; + height: 28px; margin-left: 209px; margin-top: 11px; } - +#apply:hover, #reject:hover { + opacity: 0.5; +} #trash{ position: absolute; opacity: 0; @@ -238,7 +249,9 @@ body { height: 4rem; left: 292; } - +#trash:hover { + opacity: 0.5; +} .add_new_folder{ position: absolute; } @@ -252,6 +265,10 @@ body { color: #ffffff; display: inline-block; overflow: hidden; + padding-top: 15px; + padding-bottom: 0.1; + opacity: 0.8; + font-family: "Roboto"; } #apply_folder { @@ -264,19 +281,20 @@ body { #reject_folder { position: absolute; - width: 25px; - height: 25px; + width: 27px; + height: 27px; margin-left: 310px; margin-top: 13px; } - +#apply_folder:hover, #reject_folder:hover { + opacity: 0.5; +} #tooltiptext{ position: absolute; top:528px; display: none; - width: 358px; - background-color: #555; + background-color: #323a46; color: #fff; text-align: center; diff --git a/icons/Untitled-2.psd b/icons/Untitled-2.psd new file mode 100644 index 0000000000000000000000000000000000000000..6efef61450bb15259e15ee2b81fa408dba1a9966 GIT binary patch literal 57157 zcmeHw2Ut``+xDEr-b;)oF={Mn7DRK<#e#xTVh0%RF<>edbJ`=Xp+{ui0o@!V&RP z3&B11t49n($aZvJGwTtxy0BO?5v%&k(mK<)@sR$e^Sm4!-JE?pOm}v1^&HSK=W-3?mW}gYJs=2?SheG9T&JcN}W2I4s6hWp2<89FAry5hYs^R+&z6v z<_+lR;3S*wYyz3Wh8;UFim%&%j)Q4JhlwLbcQBWEJ9prF7fN_PA88LGUfQ?U zPu)87>S<(b*i&j~^i%hqMkYO_COwThs6HJBHh|RM+i8Z0%@7OK=@1*xai*`Ymx-a_ z+_`gm%%tW2f5N97pZ&xp0SD9xA znye$0k=3zL`!OPI7M^D3#9pvPwImXM++np87 z$%peJe(X&X2`rf9DD~lczLH^y=QXr*wLspNx9_#5?v;pGYgSf1GHPw<}f} z2X`$Ft&39)>++Fo{&6ZRS09YV`C6kCW0kEXw$8Jwqv`~ASGFd2Ie7ax(B{Iw4M^f~6vboSIWeZ;I7 z>(iO|$Y%J?b?|l`?1B;U@62p5*XoCTn0QCVfD}c>|ZrL&1LQ~ z?-4R5=YhTZ8-5H{onJhG)+WHtFQV9Du)7&*wzuj<({$f|SopAE{=?ae+38PGqh{4N zm%h1b)B-gk>qnQqxoXq`H6rUrm%h1b)B-gk>qnQqxoXq`H6rUrm%h1b)B-gk>qnQq zxoXq`H6rUrm%h1b)B-gk>qnQqxoXq`H6rUrm%h1b)B-gk>qnQqxoXq`H6rUrm%h1b z)B-gk>qnQqxoXq`H6rUrm%h1b)B-gk>qnQqxoXq`H6rUrm%h1b)B-gk>qnQqxoXq` zH6rUrm%h1b)B-gk>qnQqxoXq`H6rUrm%h1b)B-gk>l|GTsva0~_QX?SbMZJBd!EdM zJzplrU;4b6_-tB3FK<^*-%)@grU|E7HJA!$yo{W9IJbsVY&U>3**6zOJ4uOQhFlZ1WLz!w9Q! zKbnQ4JN{JFxP?}YN3kc&e30InGR?hwJ=K*!C8v99A~r5QBQz0nZ%^~8h^KE=WcYM< zA5F?g7vDLW$WRaWA({xiK$Lx`4Ri%XbIWJ z(%bVNn3?-Od1l^DW5;>=T6D5;r+usWn7KQ3_!w^E*tj>J|hr5*k@ zCSx($9f&9K!5DXd>h#WQAe{Kaq(1QsL2i4*hrn#Jk!q+-0WCjJX6+ZUR6 zJ64YZ7O&6#;*XficjEJ=4d@xzhhy9#CR-8188eXLj=y!pR28ys+jb4o3n?7=1%K5X zT5gWexu!x`o~4KrI+ulyehgA+@<)?||C=<{7Bp*2e^pB%#HXs|da}5LV|A}Z%S}s8 zTSUT+uE!A7x*-_^7(Z2Bv>&ze`jSQsXbXsSr&0A2zoM*eX)*Rs?4F9Roz4nV4M0Ry zAPRf>xzqKQR;&)5kM(r&`CuJ!^ff{nt1_K@nh_50gBe21s%8=`3bCo0C^TNj2hT$~ z`;2!VPNzCo?L4(v8sHZA)nyUuAzJ6E>*6i*^Qs2bk+BC1)vNeWTbjH0v>@_m?BM4s zvvl@!_NGtj0U-1#KNY!wNTvu)vG#E3fZ%_-{swqRxY}068oxR+!pEihc2~#2-FK{m zOEp##M`w5UvCi{+t$nPL`jFfrOwyy6h^Maz_f7~0wb%WT#jI<$~@KVSkjo5?E_U0pqM93yhSd2I=0f`gh$a2!CUcGwt>ouxh zzftps4H`CY)wEHgrmfnvY}u-1%Qnp$v5zVcBOm_d8aHg%xJlz?O`0_OtVxq5pV2=} zJ`)dV{_kWUTqn)zp#pmixQ;~9oHJ<72??0F4TRgADN0$JV;>ZlehdgFsa3m9-Fo#K zG{ojqJ&_|419f6E!qwsoB()^9>(;4P+n`ZzBsMpw^-T+-+Jnb9wCp&0X|Fn;ZP<6( ztW)P!HaDjC{>l5dr{;CL1ls1l&2#kOKi~iNvTuiM9P2dn<^f;h)=}f$Ip?2Qe(RZE zQh~*Hn+~oxyZQF>_k}^{?nKLr#?P3ua?7FfcV8qI_pzMdGI!P1!xzG1Qc9W=i3Fvs z#mZE-PHmnQ;TxkCwNQfD9b4A!wRFR0v;;S7p62%MJpHZrZ-M5vtsH%R%Ii{x7NG98 z{LLs7;y`Psq2r8wo!@DS@aYnKS5*WdmNYV8=WI?)NzvFq>n=ZZ4z&K++R-oU_}8Wf zM_3lExwm1>ts{H(XY4uZ>Y}V)vH8STAw|mI=s&&~pS3q{?b!2SSxUdeqUg_u=dIjh zl=)Ts$y>c$B$h?Bk#6f;eD~>kNZ8!nksHD>ai>F zmw~4e3eW7m@z!?Yjndx!3f?Zk{^;d27x}^yr^AYx&I$=!^T2X``*RoCwmFcWwA}x4 zo0ZQNgiVk=jeJm+;24(vT0UdX@%9s4%cYU?a?c%`S7{ff-2TY=n;#kJxuxBM=!bc ziWx@bvlZ=gZWT`1g#LMIW8FD$kMKn7G4J+vi!XlpFxO<5Kz?o#_xJ5)x5}cElx|sy zip4AJ^Y%P8Jkj26gtOv1?){{@Q?lfH15%4FE4s#2X5d`Cl`YFo&=p}&+uDk@t5_!C|G@Uc9Lmfia>l?Jqny`-D7r_h;OaG+bRu@Pw5=^^U?DMHKV0-piQ84 z=S>Hf|JJsC6W7`&>eTDBioX>f1KO{qN9`v!Uh&u0b^;0d&OUA9azQ?n4{};9nF4mFr{jN-(nmw5)102JmPKP}NaHkje$N}m#_J5i_!Y{ z{_oZ$mj+z*yK0)=$L4@(yUfE$lLDqJeG!v0Cwa-D%l1>l{ayY1PnTONZiEZu{5FAX z7!_dHi!UrY=TkYUPOn=2lcs0amFF(p5f6za^t$&5~H~+e$Rv$OT=9n|_?}HxRYuN5&=V_(a8U-4y@4LeOvxq$j^9r|G z3Z&1JG9Pa+Z4;_As`sK}Fx23<;i$3A1NDl2BXq#p_t~@1c@gCz1 z#gFFAu=>)v^5J$<@8p0ApXbwGO`Y__Bsgt=&9TF6_9gDW-#*vVbd>V%oT!sF6HYlL zt-BmiO)`TyfHKcQ56*Ri0td&i17plUuc$KB2c_O1m9zCoZ}+{=34zTdo(# z(^Zwx7^dHr(*ay;KjuvC>;;~-z5brHFZ)3cH}_vBS{0s-yI6Ni#a!Ok|NJFWMdV$K zC3HvN)Cp5O{!Y)B^IQ126;FG%ee*c+Rs5x#O3$!@X{K3AG1@opwCm;de0tNStJg+) z?>zFrdq!k8mmYiTZSIR2p??E=f^%Dp}dz8;+Hap${sw-kd0bW((TZBww~nPSjGzNqa^vqhn;8h)ji6_H?i z?4f@yZ)o`AJ=5a{%->yH6fxei@brfD{!jN*#t6^)yjXqJ|Clr)GyMF%T*o%1=_SYR zxE<{`cS7V`MeG&-9geRAvS{3R_q7i!Z(m(kFZW$|`-J6=#X~Wh8~uqtHp|X8Lq~j* zI6MC8AM>Ka9$$Xr-?7-Z?|`*lZ?Ct%YA5#}min&J%M}fJRv^#a1E;zbCFBTX=NGjG zT#p%N@pt{=3be9i#cqLkr(e4gdMjPAq=mup;1kPQG>psoamQ|P4e7J6{fi=j^ewF4V^XEPH1SNY?bh8rtz(-?+=A|!o}FO&%-*H4(5hTiHicfUHG#LAG*A8jM*fR@!vGC?i_MCgtoz!J<-2j zZF;P4kIa%w2XcRHXPREz?T*{Q%d!dAvD}7^ZCY^5(KP4Y?dSU!nzx&mH~oJ5*UJwS z-w~d#8t?h~iCXicY?ThRh?iEPuuzXJ!sDhZTl_V98W z7C@}a48J;BcD_>5KPFW%QCa7w2!9O7bPLzcfyc6bpo-V{OXhR^7S;)<*gRMu#&=DX z&2N}4F5J1qGQVyzq_UPeKqY@ z?;rV#0{QXGW&4a?iIt6g8a`EC^ex!&B&%CX&mX>M6_9R_9*{LUW5SMmChM>$^1T%v zQ+K?zyBaaRQ{m~2X!s~Bic!{GS}wwH_}OkjK=g&2)V@swvSeDt%4m5;)U_kq$}cRF z+qL)E8Ex9NV9$45lN^hh4fuQU?2UI9%@xSje6-I|fdqFADaW|}qeLL#wism3J%fuZ zgNla7%y2SEep!6(q=$?<(fHk5qlof>iH@6DfT>6c3P%1^nV{8S=k$`Ba;O(LLhh6`j`55 zQXc(g?xL^uzw>pUoAfR;+athuz>8*+C!5=q9d}&3x|PYmVBbq7C$lU}lDy89GiKt|R5Mj)4M6H0#C z{C;?Ovc3a4<(h=FZhVDL%j4_o|uX{`vid1ar6Uk^{u-<==urZqH%xel}`ZPJu` zr+;O#Zlqni_ysFGl;>8>*~9iG`TNGB8b%E~Tv)K;NxETk&oR=^n`SIcYnu5acGHzB zvJT1<$D96{TwG??H0qv(5wtx20(;>_(KzTcLG3n1cfT|9&#%iTJ3^mHDm2aLp=eRm z1&YuW%$Ntrs>M} z&;}R2>b&}7FYIW!G$zX-sp)&_2tXe$O*M8097~_~aRzABN z+dY0S^Ni`y%82B5F>PmFe`3tfZUqaE&EL5={*Sd*!`qa!FYld>9mvE|5dmH1f*m%` zVa4HASW8|Cq&UMgf7t!v3)dIj_mC~A*c7&4Yxc@j&H*#?0^Y;VWm{3z2#6JSd&nX2`bL?K(PP6*Br8s$~5R zKeg_={>vww1AX0oF_lJm|Lkj0_vZnVLdO01_NP9Dq2DPRA5Qg;*;U>peb`s&Vdjbr z&)z*5_-aGb`<*75ZW}f#+vb@-JQoB^`mwmt!sapaXH9i{x9~~i_WiPUro&B-S74c_ zFT^m_z5lA1rbjJqDvvL@>5Ca$bYw}c*sULJCJ7RIBfv{z~I%LBjUdd%jIORT?JdF}wT{GdNb zi{ae;DTkk9CAIiF;`r{H-BVg@^?qVmxcV#Q<}9V_o;TZQF{8@Q74?5%w+z1x3mggVOoH*}Z1nll612bHRT?T>9z6(l3wquB+7e z=ePCFTJN6_9#v4kd%tVP7C9VFn|3wn?qQ>(+{FSZZ*b<4XWK;(E2y(aWiCoEN6TLUo^YW>j>*u|A91wmvm4Ho50w!$g4$ z{^pCX_bUdX1sk2tQ}Z*CnxCUW6s8A<9)OL%EHLlL?n%RVk8aHTymM-oUHET3W0D6v z40yb7l(E-z(+O*o%l(H{6ezl2AshcE)!krmy<(oGZ=GRsVD6?nmvqNH}#KTrWvg-ePVWV!;kg?J}MVJi{YwjhiZ=Xk6#FM-*er35IdM?E(8wuU$ShPh-oea{_MYG1u%N< zIUYW4NWG39yQo<0Dg{8Tk624BKufHJQme|Xh0?lkmM4gb!8sN#K^l$Usr(r!6jfdv zLnul^iqep)7E`CPJj5fB14XrS7V9E&L0!19G!4Ixw`FrT=lSZl$H}~h;}wG+y>g*$ ze%j-Wafo;Yg8IW%moI7~p`|8)zGcwekG@5aU6HN2LfS$@v7PDQ-l-Q z`qC?w$c|?D8I6y3aQAZ_r@PZQtqVdxG;4#P)ymh_gjXj!z~Raqtw0&T9B$d$#h`^OH|^HL$N-~zkI;z zLvy3`qM?{V&rA_@xTu=~DYT}vlr%T(Q0zI1&>qwd|5b0#YQ2aZLqpmIG!$#$O(>>#U5{soI`r;}%VDgyeMZNy+_Xcn4JblOO+(rSG!$#<-L(s=Db0=6n1*5s zJu^krq1%8VNTF>&OG$In4(WB)s@X`_NcBfTEU(6q<6Asfcyz`tO(>?UH*sc&b|@ic z+Xch9jG-M$$gs1`2}RVQ z^|BnqP1!oh^b$hXe%hi{`;l77py(&{5=k|EL462aFsb^%vfD}U57qkK-2&G^?^Cn^npR6QB!;dSubHB zdbAelL_Wu^-i$QIPy5@1G(nvHRfp=Bh&94&Yotn7Bif;uN*US`jfsdFrD4^#v4&lR zsig+w;tt=!c)smmaqtqN7+6j7H{9abS!5>c@xVy)G67mwA(sH|=~ zG1P8niZnwHe2$)|wUmUCqvWfmhNEP^?>u=kIw3PVUl8)MGZS9iJh}6C*(k%N1)!WJ zwOg3`?s||V7iwoc*yU^9q73MHXr^6f?2UaT)Qa6ZqZ_9L7D^1-OgobKR4~XqGObN0 zxk3zju82@R6o^t1v7+Y{5{COom%X|xCdIhL}IeH z_=Zp>NQ(EG+$Q0;4P)H>YeKOgxj)VzoIp8g;E`}eC=?_K9u4l3hlu;6UJ~*JNvcnS zhvYGl)NxI|DC7!~WY;>6Nd)1>#GMzi1ukw(1eO)9YuH&KQ{ck7Jt0v<(r{hH86iWE zR0P1ReFih>^=TnZ;1VsLk!ZrT+<#I?5x4^_qsa@x4NE;CBnw=MXWgniF31Im zGN9f|@``XjK07KT30zdyS0t8j;|oHBcLG;1A(misskKHKEW8DGO|5v6K)BDs4hxAW z!)FQPHQ~C%9ui&)Tx^%uB$06aGlGN!fy?ZlNZufyl7m9Lz?F=DL*5e3x$=MzCvcU{ zZ^=8t$&~wrSb4a+)w_S)r3${up z8H6*qzD;;4aMuko5F=~<5}pWTZ3f9C+&CqTaLRF+BnvH4uvLf@xWXT^NH*c>KHVZj z2;9?p*@%(#n}x>$S)WaE(B?`S;gnW6Bo}RyvPpP^R{ks(F|vQ7fU$ERm*f#*87Mpu zh*ciRCtRaM8sXkF%14Z>+aTN*NI*U*z*#G3gsb?m05KA}UbqMEaRDiW)fXVZsXV-p z6yaWU52KZF|snZ@KtCO;`B6@+yAUBGqS?iE!2jmgWH{EEr1Do7 zyn@Lqm>k9ACzV7&NV}EbaLO+gG~%*SxF(S4Og_fs5Cu`h$U_8&vKyLzZ&I*3!?>4#H;YgVk8 zG@9wOk4-HTHnsYd(W$7Je$}TXS1W-{*w>h_+EW>myn#5$Q!&Xg{XNGHwVjujV^Iz?5>%!tBj%MXT4SJlGQwSX>J0qP}-E@p2uiy4+VEA=vms^Nw1ah z!E#@HE5J6M(JjnN zwS~=oN4K{bs_kvYTe|g4C}mq;>BKi|Tg+nHVivYVx@E?(Ei)clX4Q6j9ouO<7UQ)? zgf{}W7F#Vg;t8sacw#Kwq`OA3P5N24S9A-nw_de{2Vx7y25*%jZtzww=;r^~0de#H zESf3?R*9lwVD*fu4UGcSYD1$as#N@VfhiRietbd|4r`Ud@pA-IN8D8Eh#S-qs4ES9 z)0n!F=G*WgQ)gsvnL6`U26YDNPVLE$n7Z?5a_w-c4)xooQit~SyZsM!iKL}Iim>b@X}S_Neb+E`nsV>!^qa*jE*Wg45L+l+k)(AX08&FF^Jo#}QhhtApi zARD?}_Jh51hPI@-ov0Lg{kiMZtrrQ|*+qg-l%1XM;?}8Me|n7;l|rgJVtJ~i|Nb|% zz*2drT>sOzfqo2pd<^JUtpBFfik4-mG*qhp>Dxd*20lIp^efhX-HOGB@=NtUeH-Y< zz(>abTe0-ldGyzL^w)Xx*Ln2Uc?6=r&ZEE1gH2I?ou~SxOZ{~ob~#&rorm7ypuf)Z z-+i4&g1Z14Y3_OYoJn=?1jL75$`ikzx<5*de^0(A9sk2$nx{Jde};{4=M&0ymYk&* zFTE;pA5f)N3S@E?j~$-+6rk4lU74o&7>ue{F&qn$(Kp4 zkY+OJ7f8P_X%wW9OfrXL&ZNGO`Y@?Gq;5=V2dN#CT0m;Sq`Hvml+*iI@X#)I)=1fr zGrCkRa2J?#0n(*j6g!JYddt~G`J7_hTGXVHa4jk;adS>HNX;rBRkncCq_`L_B4E6? zklv!+?<(oaZLx~Dr20{!T6gof^;x~7~?M; zjK3ITtq#T-##pL@v6M09=wSFUhN}*SD`QO7!I;DtqjfMwGsaLIj3JC+qJtr2jP5!Z z-5I034n}*%_)G@_m$orx>*-+BW4Db|;xY7UV@o~OfLE~lx^i_eav9^D4#r!?c%g&w zf-xTIU_4-q>pB==jB!>6<1AwY>0ksg#&#WyZH%!_2V)&$EYrdGjWOowV9aFDJ1~=&^b%4GlO98Q#H1ULZZPRAq_a#q4CxS)c0k&}r1g*jn6v`Y zawg4#G>=Knkery*8`4kgMy#8U1agzzhSfF^cagsRx)?WJ8MIuNsCX_IC=%DTEMmJR zj4ZYG@&7=0R``GCtM8fr*1pvD%zt^$=&dfj)kU8S&|6)E=&dehm%xJ2TU}bVKh;l} zMy$8G*!Vzu=&i2m<3n$C{qI>_?CDNC+8{e6xXUy0?@ zu9v#5)muPa4|V&gQ`K=As_QI!WU(o}zhH?+G^-5;V{6;rpiy4Tck zb*LWS|Kf>keSfHWUV~ma@aeS#~I1T@Qe`A3VDjXHQQk0hz=H+B%q@|{$ zB+KQ=DJiLG8Cf}bg(c;R0#Hs1wH2iWIq4~KdF_<+oPttC8PIcrK}Atc+AFz1T24`g z0!S#lheg>bPvr(F*+q&_`rLAPUiy8xBt5VE3Lcb}l;@}2l`G|vwEXfgJf$sB6sF&j zS0KGmaTCvcOUiPRZ^+B!lH{DS+w{5d;*4wZVmX&ld>2olOO%DFSLB6qNot|;J|1M3 zC<{_9$@ArslmfgG;W10UD9>f-kLlC#C28m7*>WzeB!WIiUy*rMo+;-tE1uA&@0EFf z%hTmtt}==~nO~ZETAn87QcIuFXZRJ_C*>(}E?W^zpYJb8IU!G$b19`S@JawqnR`tB zo*ws7c!fOEj>?ndTzbVT`tE?@=kK3I?9>0T^@y!Dbf)m8QbJf5=uXG@Jf61Sq zHW_%^11a7rk3?>nLKcosrV%c=B8$EiLYclr9)b2yW+O&&H_IQ(Np7})H+7e8l0TA@ z(j2@>f>Wf>2$!PBMT}%`ls}Y{>|7xatU&n#u=4N%3Qn0yBV4L7A2E`*L4F^37UpR@5a%rhN(#?un0LS|7U0@frl9nBm6>?B9~mq26%`7uGVd{Jq%1)?DMU^4 zZ{npJBp>xJWLO$7jB#KJU}+@+E*2C&l;1#zl;Tnv&(Op(N-4AK0ZT{gl$FtVjwYT{ zCg5^{B3TV^$%=9yr0_mF0&R#_S0j$ON6&zGdO2PSLMraDI9js2g2wYT@q89fL%g!I z66t9b0xo})uabv>TS?_SCg(9ZoyqByf3ukW?V(FQEiT3PX?qhmj-{0!d~_GLQlw zc~|8GgOn>tSEh35r8ung1F570WgyCH7=z&FfUls#H@Om-qt8>SLM|CstZ0*fn*(kZ zxRn^xmE{Q0rPV^ltOOIYTF3yiLMO8V%nUHoz%0|rECUlOjgSgvsZM4om{_5N6fjG4 zGSQM8-X$X>gGujqs8$no%~*|!!Nh7PT){ZfNi0NGBCkLvuRz1g*U8J*@bYx>@>l`I zs^scq=Bg@9nYZ(r%n>HI7bhxGKWTt~j zhZ`NlsXCddVA3H>r$>rTW(t^eV$l9f*2zo;lTNvkD{@`DtKw8G#|Tnjb^pXr!wLW* zo#hG;={*mhBvyh**Cj$bvO*UVlZ>t|pwd<^*G0u@qgtG3W0vWnVw$PeHrhs5PCi{! z%rn)}SO#jbE-EIPYGp-3kRn~wB2du)Sm@EMq(B$704pulbx<*;Nxm*>KB(E^_5o_1 zE@~dA;;up$X?pv~Cp#+_RBTGv+~}g8t&2)`DC}vVW`UZei;C?M;>J(j6y1zqPfM$^fDOnda z843WD461}&r_+yaTdCN-QmaDfV9<&LO4p@Y@f~U* zRYnO0l?5p(#aLT$)>f#YXy>XG?dmGHwsNkmv{zT>wH1AB1E9KTP~B|MHYl_WjdU#o zq`GNR-E66D(r6ny+D4GZI4Y1=Gn%xGDUFd;@UEKiRoyJBZn9N3=c-J-448Ux=vB25 z7+cLeq^4s!Gab`lI#xF;VRDvMnVi+l(dwouHDhx%W^8p67lWX*%KZJ%IR4Oh{?ND% zhcR7@&AAw+d9gD5AEx<-ru&DceRabhZh^|8Ean!-DymdF4pQMbNL4uwKJH-nH#`$d z;d7urPz&O225(+Dcjhm)Ru<+`skw!ft=-JID>nzdA=THsP*RDV0pv7SB8x1;?h|l2%A1Q;!uePe#B_Xy~q=iz6ZAc08Wt1Emc1fBql?*#n!h9L!$A@2(=1L{QkC!uF#`SUM zrP)$$+;!&5cayIvvHzRlHNok6d zTawGX8Fz-AkS0sH;rFOFLsIgm$#JP%Dlu7K#{3ztCmoe0Nx8|dnLp!-S%~zVlry^= zi$@A1m4PO~(zoCSR>o7GMvmKIX(Gyy!+aX=#vhWtmU83YF`vd0>mX@@l(Txmd>U6w z4@%>uoaq(n)8J0`J0Ojda{W$IuLc)vvR@i2d)X5v$jc}O1W8z4C>to{7d>oN&=~OgS%=%Bb>=q=HGa2wpAL5Hh9ha z8|72BNF$`&lrrYu2-qxrEF}Tdzro!zp%Km`oOw8MhHsKSLM!Jm569AtQjDD?%)@an zQ2Ibh!kLGo*oH>9F~!Wov0;PszLcz|9uDqxe;VQXzh*uT*?Q?cDUmTB$L$MJ{8vg8 zQ?Wi@8ZITbnU|wt!UZY0gB9}*1-bDR%*%1|yav20B`2AeqkNP$$c=*Oh8-v5oQ8Qv zN1 zp3LMa%+ry&5**GXgQ<8YS4yu*$r&ckzab^V!)=weWcW=f`IWjgIE4kko6NMoc~i<+ zDwt*(cU?+C85oM>*9;2*c7kEYft_U7B49xb3j+2V!)$=yu#MNH zl00TAL;zdOus?xCFzhHWe}?%3JIb(Cz~(S)4zQIBa|GtWFb`mk46^{{#4smd7S!2M zfT~Ys&?K}7wV~pGjAqDaAb72+a1)3nLo9*Z01^yjAVUTMISgd;RVl$(Y9}&W?&}Qf?FYE5V0#&Xo_Tq)kd6c^C?5D18h!CwLX zT=1z~nOcqzx^A_QF;l^u3+7BPU+ZMP26HBu6Tzg9O;pQEoj1!f8qA4cjt29wPUa&p zM}s*O%-cGdx4;|whno&mv#*$9rNn|DR4(a3_((rca^r>R~LnSl&Th z1nM4L)ZL&i6?YL(x9Fm7236c#=vuv67j-qLY;VFYMo*xNyY#xaxxwo(AKdx6xbv`s zVRr=e1gKuRs4`IhX4F(rU35`hZit&Q*5JuFYO*fwWbB;S%t8GNR9jtC8&E|Z;1#IW zx~SHmLUn*IV*;eXDk|J7a63pznkr0%dL#^jf-qjxNRTW18=PV|_N`Iufs&DsM$lbN zISSJ73iufm$WYW+;=#vU~53ivn^7$Q>Y0nfJp9(q$l* zZbLN?H9R1vft&`ybUd!o7Gf}*b#;XsK9KclRUAH$;xQT}9X^n7wfYVp z$P%?$43!-IQzzcGPS{md^W|cv*ff^?o zQw9Gv9)1ulGX{PTEfWWRkS8khCo+|qMi*74(Z!Sx%qI9kjxdAjF!P0ohSu))^un^n z0E20EL}i*Crrr?ll*(*7^_E_yzC4hbbOSHHp_j0qSTb|Z66PNKA@9a9Q*bOy!74Lx z7ROO=5MkI3uE%=nyy7wW<^EelYYrt4su!Y2|wTr^z6U(ieR zIZH&NHYb{1z7Mw%4c_o)%p6{?We&qD@_IHimS?|yLT?JVt1_hTM$lUZ%8#kc>|-#q z;T0(k`k9&GKL-^*WM+EsXlAC54u+WyGrr=Y12f|tE>3ZRHGYu?2bS5J%lX>o_R9`D(D+3XPAsu` z#n-Y~aw1--_KTcZFytw3Fl50Q(JzAf7(e8RF{<>6`9CH-&kWxS;S5;Pd~i(Hv@jW6aU)2^ueB4}{Fke9FqM~9Rgw7kUU^AgL0 zD!<4v>x+CYFR`W_hVBfrInQVFoJ|<>izLiE%V+Z3%y`i+643VypTSG|t`q$t;iFFT zX*@R)!vsSp*Z(A+!gGs7zsPON6MQnySz&llzsM@%yiyizkp0jwz{36*l z+xaMzFkAGCxNPH}@|=t47YX=_f5MXh<`=nQOe35z7AU%OnQrAHd2XQS7b&yb!bhNe zM8C+|&HQ7YtYv%cCqlNfZBt`90GL0+MgrT; zu zgVcTzo?8aKFZlE-dP+I3@{1r2H8mCS6z0Q7xyEz8U^;_I{UVe}8P!6@OaRjv%yD2o z*U5Yi<~T4%fcZ!#^C6hS!5j?cEuGApU=9Y;6wHe{nHRwvNc|lcOFD_ik(J1!&qr0O zu(|tz0}sx)n$#X6abz_d^`xvx&9FPJ01q}}MQ zlj#N~?M6B@9Cb3MgXsh&9d33ynRZ~(;YJ7YNS(})VA3H>r^ry9%pqXX$#EFWema@` zz@*deI>rX|i+rNbsb7TW!a$4#k@`hGNh|=7PWA#2sbA!i#1s&jU&IWhq<)c4G83<{ zMFxJ6X`s^AU3`)n4XU_CEeG|nF6tvt#U(BnRIDnW&h<8^;tKf~)Qh^Pm}{y9HV@R3 zx~L~W75yUUSrVj+8iWNG%RBrczk<3;7j-A7;_h$+)J?jm8$lH}7rIveu8aCRsBCZI z6m;?T*Twa}E^cmccFX~HjxMerb};OYpdJU+Ll@N@RB>}n0o6$t)#-+~DPz&H!%=p+ zxOUh%?ZizU)KR*qBS95)fR~_J=%QMH3e^FA5nD(DK&2au=ojHtei63ea6*452sWZd zf?Szj#0vY?Fynao|(G$cwp3H*PNVi@apgOGt6^C`RW> z0SW+(2VRg#kVL--sx0bEK;FQ)kccuct%=L0#fbqFbBkx171g}}MF5Jpg`Q{H*i#_4 zf!qf2g!x4rAcX?CcpIt#)95Y(IR)et5T@gCm7^iD_juglxly8DBpA?cuy#`|Q}l~i zLEHpr(_Nmk6#XJc0IdMD99ruU(JwL#;uJtrq1{rQ6@HQ9U`4_&5-IAoR13C29>b_# zBxN|&feHypdnOgzRCO|8nqhwOM*(_PAH%^VXsrG;_!=TDe3Tw+*PaZ z@QW;BYW*U5=~G+bhhOBb${4uA{304Nf%-+N38?}~nr#iCIw`bF-J6b;_H z%r8>3PHhesMbQT$UVAcQ*;Dk3+))|Qw?)55h|0_kQTasiif77Y|H=XGp U{Ksbfzv)cW|C>(jf7AJY0D$GksQ>@~ literal 0 HcmV?d00001 diff --git a/icons/cancel.png b/icons/cancel.png index 395792c38206725e837e597d882cce15e0987572..bd7c1310e349744044c90398d532e75bcc60fc9c 100644 GIT binary patch literal 15666 zcmeI3Yj6|S6~`Cyz?k3x57gA9u_|x_0cm&j)*_3CWg-(~z&2nP+<3LSvNx7?W$oIM zJtUaNV1uU#wV4b_fn+c<4oqm7&`BsHrgaM~;gL)YlR$tmO(?NLc#MZO!3Mf3$&!36 z-|6g_=+CBGw&pCU4_ny1^Ww$Obcy3~9W-5Xp6Z4&pLh0Bb|56^8{#o<>1=3-> z-&rb1`ls@5%%WMp3n7U07F%2*mbjJ@6z|iLH1B4#A)jCBjUcx9AwNk~F`~-NRIpr* z`u4HoY86Z8s8<_Zn9HBbRI<+c08><7P)yZVQC3<#-=1m<5mEpjBa*6+&&vr!C`TQR zOGxK(GpbgFyNFde>VVxLWwvT@qt&7_%vI?y+=OCQ6gOxv zoWQIEhO43Pk`c6DS%C2DL%GmJd{*xYcS!F&(PYX`~(+ zp^g*DkcJaxM1l;)aWDcEVErP?b1FG5>E>(19JN|b6#GQS<@3i9aYB@xL=g>_(BczPUBPN#S#N~?RPI|pQU((cq zm{%(yh$2nuDHPZF8MKfQ_?iI4bX+yFz0e4v=;z4pi|TRw8^_Hw8HVU`CAtp_?ck{zxmu*qk&T7s zDJgvXvW%q8L>Wz(2D7*g8XRZLQX*2yi&@=f1Fka|Df3{WgkZxGEeo*HzDIf!`p9FU z<*~RuCY{cp*Ld_MvqsMtEE-bpHfc!Of*ahp2d6!T!4yft3`^x?1!=X`C9Gm;Er)lu zBBpw1>!9Fe!#k9p3v*G0*q~Gu^mhH3D+?}Qu5wrr{wZrXd61DHGWw!&!`)l zWI9KMAQC^pedHX$N``}#S0q%p*T_Kx-XjLd0JE?{S|OvU{7BTHZeVyDD&Gsd?2j-J z0$KY#r(sl8_5G${$PV@Yn}+x*rYcFUf}!o`-~t|O7~RZ8=5uIe4OZ*$O0>y0Cqk-X zX+@FY>XA0VVQuluk^UueHF|5p{jHe%L2>y%>Y6BnuBC9-L>Y9Ad#>bI(XNYT1DX@O z-JIC%DcMbpn;7o~0vtCMZ$Q$Ydov zn1!n_(keanNl%<;?2&U=fyVZ+AMzwVq#rUW5KBn{0D+qdE;t`RRd4}7;HH8L&IeEx zTmTTbso;Y10aOJS00eF-xZr#MRlx-Sftw00I3GY&Z~;Kzrh*I32T&DU01&vT;DYl3 zR0S6R1a2z0;Cuj8!36+;n+h&CA3#-b0YKoUf(y_WT*e^+nF1$&D*q{%he_%SN;il{K9kCV$uZ#-rNFuRL|?>V>>7o6FcT=U)#U_`}pL z-1p+mCk{TF@lFKkqIu zsYBaVJU0Pfd*R68+9}7Mw)US`M6 zXU~Sp?1OolD<=zHY%V-7am<~RJL&tT?Nd8e?mRi^EJ--NN^dLL!Bs!Gcv>dq-*K(_ zmrg8iOMc`#UaQ@sy*==k&3(`4&trFQXuI=k`Tu)*Zj5xZTsSb?Ja$Uzq-}D|4(T9jgGhW_P4w-^>W6_Z-N`Xe)p(!w(4PH j)|g31@^7fW<4NRj=j!LR&ZDjJTg~}-1&-e@D&P1&E<0vE delta 899 zcmdl~wU&K?iaSfXqpu?a!^VE@KZ&di3=9g%9znhg3{`3j3=J&|48MRv4KElNN(~qo zUL`OvSj}Ky5HFasE6@fg!Ib3f?!v&Zs#n=)qM~>`1AB?5uPggQCLtzyp0E-N4WNo@ zPZ!6Kid%2zM&=!I5Mb4npIRI#Gxc2mVu44g)9%IX|8d(RRF(1AyoJ-BKA6y+vq`U& zFEVwq`|FeZm7OOx`!Pj6)l^!)jAi$}E1nx(dj~g}|5f6=_vO8C%?ojl4-4z(K5&q? zIoSBGvPrnM{sD{nuj8D0UmS&FUi|khSj<1;f!qJ`CbrrQEWE$$Ii*!VCgaM1%5qK544D> zH%e-{F$JIc!+D0YSiNB3>DdQ*b<&x_SJiOd=`2#^Sa@=>LQlPlds9Hy50-~48yOz{ z+9;s;<*~!17sn4Qx%8dgYx#TbsX_Pob=L0VkIAa7KJew&wh02i$`%;>GTRXF>(_yT zU%M_$_*L~_!!N537k+(a`tYk*NcGEc*HbV0Pfocc?-k%(ui$7}yP3t}mm24WFIR;h zyj-nz;7Yi6!|L^u7^3T~828ox3u%)2b(r(j3x3st%j-id-#h*jQ}{2S@?T12zkt$y z5w-t@F8_*W{AuI(scZOY_M#`-kDiq8nP4xaTyNp^uVPM3Bg;=A$xp69PfkBMA?`Iv zf2wM{j_r!3D33bU$>pGhge(`edO7mlSbzkMh zEGw>6^%EClzth?9&$DUW$-@tRu>&Rj#V`E#sJ~!ZyQkw{bd%X%+k;{5_5K@VU)M95 zJ=yj=mG{jWU~*M0ag8WRNi0dVN-jzTQVd20hUU5kM!JR;AqGZP#)ejgM%o63Rt5%H zA%Cx+Xvob^$xN%ntwEa8HNz07LlR^~aDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$ QQb0uvp00i_>zopr0IIo-YXATM diff --git a/icons/check.png b/icons/check.png index e1103dbb88bbb76e20c501a2c652cdddabb6dbaa..a943a56f5c3f965f69fb68452919ae8e33b52bb7 100644 GIT binary patch delta 503 zcmcc1agKFDS3NTyub|Y5FJAnPj6s#;RqUE}y=@Hhz-cwVddEvsteGJiOrc3*l#+ zQXkqKrSI0NWgPlGdx7Ns84qOUz1Mdv-nX8`O5(#`6@$mWJrYjot68)@zpYkqaJ%<| zw*1NU2SoSRGL`>HYD%uC+s$&z`ssGh2eabs8>{Q?vc!Jq=Hz?$vs9?$XuQ2+`JYnZ zl9TcJj@yB%Yb*Z!=G^jn&i}Y3fj>_<4}F-f%5hX*?MCbK^WFlJ>}?$*{%v7d`12{t z!=Fc4KK|?$I`ZhepFqF8wxiF#CoF|OCkq{UCN6yBxyk?83hebJj&lD_v+Vp)FZAT` ze~$^1|4&uW|36c~cs@LMdkp9QW^q|u{3$pkE_d=NW+`!FT|<))Lt`sLb1M@|Z39Cq X0|VC?tm`NL#x7@abg%Ga9Tr0X1Lp4@ delta 905 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 literal 0 HcmV?d00001 diff --git a/icons/logo.png b/icons/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..eba1572dc154dde72b9d716bceaac25f820a02e5 GIT binary patch literal 2742 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 literal 0 HcmV?d00001 diff --git a/icons/sort.png b/icons/sort.png index 2e2af097e3738aa50c90972020eb719b9426a72a..147f9be772b7550ee1b9a82e35db2cceb2ea78bf 100644 GIT binary patch delta 1479 zcma)+Yc$je7{>o&{Kd>5p}D4O}xx}8*mFme|n z_ZV_84AIziZH>yZX4-HhB5Yb@wP!!y>vVlnSzptrkHV&Q?Z zWaf$v4`Ew*9Gz7D7FND-y@OS7OES$xGClYF~5=%i5w zR1zFUH`RY;3#LKEcWn1*4bJ)c<_%273~f7d!?owm(r4QUt4B}yFLm?~m;{#jlT$A~ z`g|E}3QvfHPo#)7sbJ8p{tif%8aMmqOrJ-&vV$czPowI@AapC?euybjq*?Ew5 zEOfM2QT$L5*jX&B(K?_3Qy0$oBI4y)@zc)BkV`DWZ2$(d z)V--t>eoYL9;C|L0NNU{lGY^3R$}}oq8$kq3!Qzf5N%MT!65S(pRCGBjxC|#C+5-N z{VH2_GVHU0$fk-kHG&R3oRn*gw)6%wMYoex$I2`BGj%yv8^{VCD?6-Pl^k+b6mPS? zZbn2O37fU-_6u4(*jY9nsf}HxK=7Rq8860XLv>H)WAhpK2hgl;Q#}{I0NCd=xJ5N# zmrp?Qw9v_4AFQIhWM63}wJWkjwI7~-?k5bWIC(A%w;WzRs9d`lP>P&v{Mk?=<8GRa zV_Y3jAPmSUp!tA;I$8d$!o_uZ29=kVC}ueXi%~7yZbY$DEZ`5Q7PDq(3v!{Q*zX@5 zGMO8V2njtz`72+>njMtmkF~FQwg=aPDxWl_7zR>I7;Dx5Te(0>bgagVYs;fuHVKbH z7DxgIX2COP^ZVU;WC^e+(IgKBnil0_NNupi|7~Ud zr*|L7-|y+Uj&!K29!(s?kksak?5f-~Zl*eC2qvB?i}QP8e>7aGaE)7Yd6cU-M$a^< zCqrwigr8uKsT!A*i&db^v8tU=cMNH1PU-uhqt!NXleYP}vud>^`q-vosyLr1!F~Jg zy5I%EZ^|MT5{#94shC?q)%4_riFaiR{Hd|04U6-}dFcxro|ia39~Dl1BbT7a|HCF0 zx)!VVGU%bH6ziAD(Tp2Tn&6XT?uWYUxU8xs(VRGLsBZk>RV*u}!gCp>Z&)KeJsFyv z7q->8J-l;>UmwSlXca0gvYEOs{q?K6S`&IZvcAoa?H#TVnzsP0#=2YOn}87y2&l22 z*10((*D^}4QJ<4qy=M|x0y!ZH8fA47ACbF5HuZ&W^@6aKcXQ3GWqGbNQ6XZb^jdrH zdC{Y1H;5L&1gT^6*X?~(R2l)Km7S(UNOH-%8MlG?ySyk2KO4tf!BT|;?gdBuyl?Uy ztv(uLwBvi_y;FY_FMeyiYHDDRfKL}K;q)e5&k z(6$f9NJ?71d>?8DT8ZZJ)P{>Ra9fiLa8*Qnk3l`DyF`PuWsS9QRS-|1g{C;g$CFl& zb#g&2dvzJi6kFGm2(dl`PH{;N3zn#aRPKCxH{IXb1g~hwnAbBNESv!7^5_#myU}98 zI6K;;^lwWWcMDW2!qy|g?|cNEc;PC2R{%pC-c%1~q=!G^hBqYQO^HVcSR9^+!?9&1 dciZ(JKyZlPMgQx60m}bM%v1fcGWILr{{)+Hm9+o> delta 5089 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 -
    +
    - + +
    - +
    @@ -30,7 +31,7 @@
    - +
    From 8ddeea063c8599649d65bddb7894fb7f80c11e4a Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Tue, 14 Mar 2017 12:18:11 -0400 Subject: [PATCH 25/37] Fixed drag and drop after main functions --- js/popup.js | 1 + js/print.js | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/js/popup.js b/js/popup.js index e8132be..6213787 100644 --- a/js/popup.js +++ b/js/popup.js @@ -224,6 +224,7 @@ function sortableList() { put: true }, ghostClass: "sortable-ghost", + filter:".editSelectedVal", animation: 150, onUpdate: function(evt) { var item = evt.item; diff --git a/js/print.js b/js/print.js index e646569..e3ba6be 100644 --- a/js/print.js +++ b/js/print.js @@ -122,14 +122,17 @@ function updateBookmarks(list, printAfter) { folder.children.forEach(function(bookmark) { bookmark.parentId = e.id; }); - if (key === list.children.length - 1) + if (printAfter && key === list.children.length - 1) updateBookmarks(folder, true); else updateBookmarks(folder, false); }); return; } else { - updateBookmarks(folder, false); + if (key === list.children.length - 1) + updateBookmarks(folder, true); + else + updateBookmarks(folder, false); } } @@ -141,13 +144,13 @@ function updateBookmarks(list, printAfter) { 'title': folder.title }); } - chrome.bookmarks.move(String(folder.id), { 'parentId': folder.parentId, 'index': key }, function callback() { - if (printAfter && key === list.children.length - 1) - printBookmarks(); + if (printAfter && key === list.children.length - 1){ + printBookmarks([sortableList]); + } }); }); } @@ -167,7 +170,7 @@ function updateBookmarkListBuffer(keys) { $('#reject').one("click", function(e) { e.preventDefault(); $('#apply').unbind("click"); - printBookmarks(); + printBookmarks([sortableList]); showToolsBar(); }); $('#apply').one("click", function(e) { From 1d22b0352d25c71fa5761ae2f95e25dafdcebf2e Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Tue, 14 Mar 2017 18:52:29 +0200 Subject: [PATCH 26/37] fix bug with github icon when you type in search line --- css/main.css | 85 +++++++++++++++++++++++----------------- icons/Untitled-2.psd | Bin 57157 -> 0 bytes icons/group-button.png | Bin 1357 -> 0 bytes icons/question-mark.svg | 44 --------------------- js/popup.js | 26 ++++++------ popup.html | 8 ++-- 6 files changed, 67 insertions(+), 96 deletions(-) delete mode 100644 icons/Untitled-2.psd delete mode 100644 icons/group-button.png delete mode 100644 icons/question-mark.svg diff --git a/css/main.css b/css/main.css index 3f41e31..0a1bfe0 100644 --- a/css/main.css +++ b/css/main.css @@ -31,19 +31,19 @@ body { padding-bottom: 0.1; font-family: "Roboto"; } + #search:hover { opacity: 0.5; } + #search:focus, #create_new_folder:focus { border-color: inherit; -webkit-box-shadow: none; box-shadow: none; - } #search::-webkit-input-placeholder, #create_new_folder::-webkit-input-placeholder { color: rgb(255, 255, 255); - } #search:focus::-webkit-input-placeholder, #create_new_folder:focus::-webkit-input-placeholder { @@ -56,16 +56,17 @@ body { width: 1.7rem; height: 1.7rem; opacity: inherit; - } + #search_icon:hover { opacity: 0.5; } + #resetSearch { - width: 15px; - position: relative; - left: 326px; - top: -27px; + width: 14px; + position: absolute; + left: 295px; + top: 18px; padding: 0; background-color: #009688; background-repeat: no-repeat; @@ -78,12 +79,13 @@ body { } #learn { - position: relative; - width: 1.8rem; - margin-bottom: 3px; - margin-left: 10px; - color: white; + position: absolute; + width: 1.8rem; + top: 15px; + left: 327px; + color: white; } + #learn:hover { opacity: 0.5; } @@ -119,9 +121,11 @@ body { border-top: 1px solid #ddd; font size: 15px; } + .bLink:hover { border: 1px; } + #bookmarks .bLink a { display: inline-block; color: #000; @@ -192,37 +196,43 @@ body { width: 358px; height: 50px; } + #sort { position: relative; margin-left: 28px; margin-top: 8px; height: 29px; } + #group { position: relative; margin-left: 55px; margin-top: 8px; height: 34px; - } + #crop { position: relative; margin-left: 55px; margin-top: 8px; height: 31px; } + #new_folder { position: relative; margin-left: 55px; margin-top: 8px; height: 30px; } + #sort:hover, #group:hover, #crop:hover, #new_folder:hover { opacity: 0.5; } + .decision { width: 358px; } + #apply { position: absolute; width: 27px; @@ -238,33 +248,37 @@ body { margin-left: 209px; margin-top: 11px; } + #apply:hover, #reject:hover { opacity: 0.5; } -#trash{ - position: absolute; - opacity: 0; - top: 560px; - width: 4rem; - height: 4rem; - left: 292; + +#trash { + position: absolute; + opacity: 0; + top: 560px; + width: 4rem; + height: 4rem; + left: 292; } + #trash:hover { opacity: 0.5; } -.add_new_folder{ - position: absolute; + +.add_new_folder { + position: absolute; } -#create_new_folder{ - position: absolute; - margin-left: 12px; - margin-top: 5px; - width: 227px; - font-size: 15px; - color: #ffffff; - display: inline-block; - overflow: hidden; +#create_new_folder { + position: absolute; + margin-left: 12px; + margin-top: 5px; + width: 227px; + font-size: 15px; + color: #ffffff; + display: inline-block; + overflow: hidden; padding-top: 15px; padding-bottom: 0.1; opacity: 0.8; @@ -286,17 +300,18 @@ body { margin-left: 310px; margin-top: 13px; } + #apply_folder:hover, #reject_folder:hover { opacity: 0.5; } -#tooltiptext{ + +#tooltiptext { position: absolute; - top:528px; + top: 528px; display: none; width: 358px; background-color: #323a46; color: #fff; text-align: center; - font-size: 16px; -} \ No newline at end of file +} diff --git a/icons/Untitled-2.psd b/icons/Untitled-2.psd deleted file mode 100644 index 6efef61450bb15259e15ee2b81fa408dba1a9966..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57157 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 U{Ksbfzv)cW|C>(jf7AJY0D$GksQ>@~ diff --git a/icons/group-button.png b/icons/group-button.png deleted file mode 100644 index 31670ce264d97308d3385ab6897a6acc6d033235..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1357 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H0wgodS2_SGmUKs7M+SzC{oH>NS%G|oWRDy)vIg-2>Wx(>pOP8zc-fP(BLp1!W^51E9Rcr7c8du{+Nl=gIS45_&FcD8?pXt>1D^S)Ov zTyX6TS-Gt(Y4u89gRoWy){U);oWymN7Om!3*EK73dQ*w!ju)r&y1MhcG)0_RgLGMc zvuARB3fgjY+0p;U)Z8W=+jFE~*MvjW>lc5nDSlT|dG7n|*n4MZex7^g&diA4G^$zYk)=Utb%Xni-@y|`ltC%YEzB9PEhp=AQ zQo(SIZH;CP1NS1$=^r({l-A08McnIabJCkC$N(?6DLGd20A zafHk=5vN7Q3U>}(lsV1bmvKt`P}sb4sm(l|btiYM|H$hmP%+_og?-k`??04(Pg%Eg z_YsDM+=!^~<8?BtGHN^eU;SEr(O~sgZTqQ*MEE`NOWtjQ0T-SVvc(L4d@F&l<# z=4;@v`UrAK@DGMp6+$W2X6`>Y7FC@;F8yY@{6n>U+~!8BKg8ZU`BvBetV;RvtJ6Oj z9TDBpkpATV>_0o&*BSg-!IznQ;I?n9-3OCx_Pd;;7_`@FpYS=w6dT3x>1Wd&&y@%A zoBOZ+o>Fi+OMhF)mVL)1XMS?qBdXodSm5(?l6(m32VV=F;CJ@!uZT_k^k5it#JYM+DtKib{ z&NHXVXMQ*-Q(kDZ`4h`;h63Z~D#ja9*R3|ZsU0-$>1)$duOp^uoZl$^CrZh6()_D8 zWIC4p+38cMP$2TQH|7T?PkU&n+5cmcJWhpgbXsB~~>ztJpSOWpnob4^Ojl%etp5zY)23Pupdor;&LK2j9-sR!<~A)UyRCI%=9B`h9`(OdA}cwTAC6d5WPPvZ#32vcGY`UR zq)Q&phh8 ztPG82D?NY%?PN}v7CMhd8i!PC{xWt~$(69D5&OmP4J diff --git a/icons/question-mark.svg b/icons/question-mark.svg deleted file mode 100644 index a26d093..0000000 --- a/icons/question-mark.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/js/popup.js b/js/popup.js index 6213787..ad79edd 100644 --- a/js/popup.js +++ b/js/popup.js @@ -17,16 +17,16 @@ $().ready(function() { previewFunction(sort); }); - var text ={ - "sort":"Sort bookmarks", - "group":"Group by domain name", - "crop":"Shorten long link titles", - "new_folder":"Add a new folder", + var text = { + "sort": "Sort bookmarks", + "group": "Group by domain name", + "crop": "Shorten long link titles", + "new_folder": "Add a new folder", } - $("#sort, #group, #crop, #new_folder").hover(function(e) { + $("#sort, #group, #crop, #new_folder").hover(function(e) { $("#tooltiptext").text(text[e.currentTarget.id]); $("#tooltiptext").fadeIn(150); - },function(e) { + }, function(e) { $("#tooltiptext").fadeOut(150); }); @@ -103,7 +103,7 @@ $().ready(function() { showSearchIcon(); printBookmarks(); } else { - showReserSearch(); + showResetSearch(); searchBookmark($(this).val().trim()); } }); @@ -136,7 +136,7 @@ $().ready(function() { if (window.event.ctrlKey) { li.removeClass("selectedLink"); - if ($(".selectedLink").length ==0) { + if ($(".selectedLink").length == 0) { hideTrashIcon(); } clicks = 0; @@ -224,7 +224,7 @@ function sortableList() { put: true }, ghostClass: "sortable-ghost", - filter:".editSelectedVal", + filter: ".editSelectedVal", animation: 150, onUpdate: function(evt) { var item = evt.item; @@ -465,14 +465,14 @@ function addNewFolder(name) { }); } -function showReserSearch() { +function showResetSearch() { $("#resetSearch").show(); - $(".search_icon").hide(); + $("#search_icon").hide(); } function showSearchIcon() { $("#resetSearch").hide(); - $(".search_icon").show(); + $("#search_icon").show(); } function showDecisionBar() { diff --git a/popup.html b/popup.html index e1811c4..ee51709 100644 --- a/popup.html +++ b/popup.html @@ -17,17 +17,17 @@ -
    +
    - + - +
    - Tooltip text + Tooltip text
    From 3d14e0e6a7b4a8f2e822b7c22959cf8f97710b21 Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Tue, 14 Mar 2017 22:33:47 +0200 Subject: [PATCH 27/37] fix bug with trash icon over tools bar --- js/popup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/popup.js b/js/popup.js index ad79edd..9b8db1e 100644 --- a/js/popup.js +++ b/js/popup.js @@ -507,7 +507,7 @@ function showTrashIcon() { function hideTrashIcon() { $("#trash").animate({ - top: 560, + top: 590, opacity: 0 }, 250); } From da26584bb7cdd7b7de29c097bf6a2dec2b952142 Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Tue, 14 Mar 2017 19:51:15 -0400 Subject: [PATCH 28/37] Fixed a few list bugs related to drag and drop --- css/main.css | 16 ++++++++++------ js/popup.js | 37 ++++++++++++++++++++++++++----------- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/css/main.css b/css/main.css index 3f41e31..eba9f31 100644 --- a/css/main.css +++ b/css/main.css @@ -38,7 +38,7 @@ body { border-color: inherit; -webkit-box-shadow: none; box-shadow: none; - + } #search::-webkit-input-placeholder, #create_new_folder::-webkit-input-placeholder { @@ -105,10 +105,6 @@ body { list-style-type: none; } -#bookmarks :nth-child(n+1) ul:empty:after { - border-bottom: 1px solid #ddd; -} - #bookmarks .bFolder a { display: inline-block; color: #000; @@ -299,4 +295,12 @@ body { text-align: center; font-size: 16px; -} \ No newline at end of file +} +#bookmarks .showspace ul:empty{ + min-height: 20px; + +} +#bookmarks .showspace ul:empty:after { + padding-left: 40%; + content: "Drag link here"; +} diff --git a/js/popup.js b/js/popup.js index 6213787..30be79d 100644 --- a/js/popup.js +++ b/js/popup.js @@ -17,16 +17,16 @@ $().ready(function() { previewFunction(sort); }); - var text ={ - "sort":"Sort bookmarks", - "group":"Group by domain name", - "crop":"Shorten long link titles", - "new_folder":"Add a new folder", + var text = { + "sort": "Sort bookmarks", + "group": "Group by domain name", + "crop": "Shorten long link titles", + "new_folder": "Add a new folder", } - $("#sort, #group, #crop, #new_folder").hover(function(e) { + $("#sort, #group, #crop, #new_folder").hover(function(e) { $("#tooltiptext").text(text[e.currentTarget.id]); $("#tooltiptext").fadeIn(150); - },function(e) { + }, function(e) { $("#tooltiptext").fadeOut(150); }); @@ -136,7 +136,7 @@ $().ready(function() { if (window.event.ctrlKey) { li.removeClass("selectedLink"); - if ($(".selectedLink").length ==0) { + if ($(".selectedLink").length == 0) { hideTrashIcon(); } clicks = 0; @@ -224,8 +224,23 @@ function sortableList() { put: true }, ghostClass: "sortable-ghost", - filter:".editSelectedVal", + filter: ".editSelectedVal", + handle: 'a', animation: 150, + onStart: function( /**Event*/ evt) { + $(".bFolder").each(function(key, folder) { + if ($(folder).hasClass("sortable-chosen")) + return; + var ul = $(folder).children('ul'); + if (ul.children().length == 0) { + ul.show(); + $(".bfolder").addClass("showspace"); + } + }); + }, + onEnd: function( /**Event*/ evt) { + $(".showspace").removeClass("showspace"); + }, onUpdate: function(evt) { var item = evt.item; var href = $(item).children('a').href; @@ -246,7 +261,7 @@ function sortableList() { onAdd: function(evt) { var item = evt.item; var old = evt.from; - var parentTitle = $(item).parent('ul').siblings('a').text(); + var parentTitle = $(item).parent('ul').siblings('a').text().trim(); var href = $(item).children('a').href; var title = $(item).children('a').text(); var index = evt.newIndex; @@ -265,7 +280,7 @@ function sortableList() { }, function() { sortableList, showFolderChildren, - printBookmarks([sortableList], true); + printBookmarks([sortableList]); }); }); }); From 8622e27a2dd64e112ec2b887db1cf03499de44f3 Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Wed, 15 Mar 2017 09:49:27 -0400 Subject: [PATCH 29/37] Fixed fade on add folder --- js/popup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/popup.js b/js/popup.js index abad052..5ba1e89 100644 --- a/js/popup.js +++ b/js/popup.js @@ -506,7 +506,7 @@ function showToolsBar() { // New Folder section function showNewFolderBar() { - $('#tools').hide(300, function() { + $('#tools').fadeOut(300, function() { $('.add_new_folder').fadeIn(300); }); } From 8b7ec9ff25bbf8ed0cc4ebf47bd033debbb72c34 Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Wed, 15 Mar 2017 19:37:05 +0200 Subject: [PATCH 30/37] fix bug with x-scroll in bookmarks section --- css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/main.css b/css/main.css index 5d40355..b70015c 100644 --- a/css/main.css +++ b/css/main.css @@ -155,7 +155,7 @@ body { #bookmarks .editSelectedVal { background-color: rgba(0, 0, 0, 0.1); - width: 358px; + width: 346px; padding: 14px 12px 14px 8px; border: none; } From 1c920e7b4c1ea375d4d0395b62247bf7319a10ea Mon Sep 17 00:00:00 2001 From: SerhiiStets Date: Wed, 15 Mar 2017 19:42:26 +0200 Subject: [PATCH 31/37] fix bug with long blink in bookmarks --- css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/main.css b/css/main.css index b70015c..5cc62aa 100644 --- a/css/main.css +++ b/css/main.css @@ -125,7 +125,7 @@ body { #bookmarks .bLink a { display: inline-block; color: #000; - width: 358px; + width: 346px; padding: 14px 3px 14px 17px; text-decoration: none; font-weight: normal; From 35674a7703170d66aa3b728795a67b475658a888 Mon Sep 17 00:00:00 2001 From: Serhii Stets Date: Thu, 16 Mar 2017 11:57:48 +0200 Subject: [PATCH 32/37] Update README.md --- README.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0e42a0e..d0b311d 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,17 @@ -# Bookmark Beautifier -A google chrome extension that sorts and manages bookmarks. +# ![logo](https://cloud.githubusercontent.com/assets/17416048/23990418/a5bcf738-0a3e-11e7-8326-34e2633c65ba.png) Bookmark Beautifier +Chrome browser extension for sorting and organizing bookmarks. Simplifies the bookmark managing process by providing functions such as sorting, grouping similar links into folders and shortening obscure titles. -# Load the extension +## Install on Chrome +* Get Bookmark-beautifier directly from [Chrome Web Store](https://chrome.google.com/webstore/detail/bookmark-beautifier/ahnaocfoepojfegbafgokdjnpnhajjgb?hl=en) +* For dev branch get code from this repo and follow [these instructions](https://developer.chrome.com/extensions/getstarted#unpacked) -1. Visit **chrome://extensions** in your browser (or open up the Chrome menu by clicking the icon to the far right of the Omnibox: The menu's icon is three horizontal bars. and select Extensions under the Tools menu to get to the same place). +## Using +* [RubaXa Sortable](https://github.com/RubaXa/Sortable) js library used for implementing a reorderable bookmark list -2. Ensure that the Developer mode checkbox in the top right-hand corner is checked. +## Feedback -3. Click Load unpacked extension… to pop up a file-selection dialog. +All bugs, feature requests, pull requests, feedback, etc., are welcome. [Create an issue](https://github.com/koolzz/bookmark-beautifier/issues). Or [leave a comment](https://chrome.google.com/webstore/detail/bookmark-beautifier/ahnaocfoepojfegbafgokdjnpnhajjgb/support?utm_campaign=en&utm_source=en-et-na-us-oc-webstrhm&utm_medium=et). -4. Navigate to the directory in which your extension files live, and select it. +## License -Alternatively, you can drag and drop the directory where your extension files live onto **chrome://extensions** in your browser to load it. - -If the extension is valid, it'll be loaded up and active right away! If it's invalid, an error message will be displayed at the top of the page. Correct the error, and try again. +MIT License: http://adampritchard.mit-license.org/ or see [the `LICENSE` file](https://github.com/koolzz/bookmark-beautifier/blob/master/LICENSE.md). From fb7f81c84cce9970e771e016a6e23decdf4b5a02 Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Fri, 17 Mar 2017 16:05:18 -0400 Subject: [PATCH 33/37] Initial commit, folder drag n drop improvments --- css/main.css | 12 ++++++++++++ js/popup.js | 18 +++++++++++++++--- js/print.js | 16 +++++++++++++++- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/css/main.css b/css/main.css index 5d40355..311b887 100644 --- a/css/main.css +++ b/css/main.css @@ -320,3 +320,15 @@ body { padding-left: 40%; content: "Drag link here"; } +#bookmarks .unusedPlaceHolder a { + padding-bottom: 0; + padding-top: 0; + height: 50px; + border-top: none; + border-bottom: 5px solid #009688; +} +#bookmarks .unusedPlaceHolder a::before{ + position: relative; + top: 5px; +} + diff --git a/js/popup.js b/js/popup.js index 5ba1e89..bf5b67f 100644 --- a/js/popup.js +++ b/js/popup.js @@ -224,7 +224,7 @@ function sortableList() { put: true }, ghostClass: "sortable-ghost", - filter: ".editSelectedVal", + filter: ".editSelectedVal, .unusedPlaceHolder", handle: 'a', animation: 150, onStart: function( /**Event*/ evt) { @@ -232,9 +232,20 @@ function sortableList() { if ($(folder).hasClass("sortable-chosen")) return; var ul = $(folder).children('ul'); - if (ul.children().length == 0) { + if (ul.children().length == 0) { ul.show(); - $(".bfolder").addClass("showspace"); + var li = $("
  1. ") + .attr('class', 'unusedPlaceHolder'); + var link = $(""); + var depth = $(ul).parents("ul").length+1, + padding = 20; + $(link).css('padding-left', depth * padding + 13); + li.append(link); + ul.append(li); + + // + //ul.show(); + //$(".bfolder").addClass("showspace"); } }); }, @@ -242,6 +253,7 @@ function sortableList() { $(".showspace").removeClass("showspace"); }, onUpdate: function(evt) { + console.log(evt); var item = evt.item; var href = $(item).children('a').href; var title = $(item).children('a').text(); diff --git a/js/print.js b/js/print.js index e3ba6be..9476423 100644 --- a/js/print.js +++ b/js/print.js @@ -45,6 +45,9 @@ function printBookmarkFolder(bookmarkFolder, notShowChildren) { folder.addClass("is-empty"); list.append(folder); $(r).click(function(e) { + toggleFolder($(e.currentTarget).parent().parent()); + + /* if ($(folder).find('li').is(':visible')) { $('.dropIcon', this).attr('src', 'icons/right.png'); $(folder).children().hide(); @@ -54,7 +57,7 @@ function printBookmarkFolder(bookmarkFolder, notShowChildren) { $('.dropIcon', this).attr('src', 'icons/down.png'); $(folder).children().show(); } - + */ }); if (notShowChildren) return; @@ -206,3 +209,14 @@ function hideFolderChildren() { } }); } + +function toggleFolder(folder){ + if(folder.children('ul').is(":visible")){ + folder.find('.dropIcon').attr('src', 'icons/right.png'); + folder.find('ul').hide(); + } + else{ + folder.find('.dropIcon').attr('src', 'icons/down.png'); + folder.find('ul').show(); + } +} \ No newline at end of file From ee774a9864e245996871f3a5799bdac603a83e87 Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Fri, 17 Mar 2017 16:17:41 -0400 Subject: [PATCH 34/37] small css fix --- css/main.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/css/main.css b/css/main.css index 311b887..a83604c 100644 --- a/css/main.css +++ b/css/main.css @@ -320,11 +320,13 @@ body { padding-left: 40%; content: "Drag link here"; } -#bookmarks .unusedPlaceHolder a { +#bookmarks .unusedPlaceHolder a{ padding-bottom: 0; padding-top: 0; height: 50px; border-top: none; +} +#bookmarks .unusedPlaceHolder { border-bottom: 5px solid #009688; } #bookmarks .unusedPlaceHolder a::before{ From d106c768f41c7fa50388d9becd0d3738246af390 Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Fri, 17 Mar 2017 18:59:29 -0400 Subject: [PATCH 35/37] Close extended folders on drag stop --- js/popup.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/js/popup.js b/js/popup.js index bf5b67f..e3e88a6 100644 --- a/js/popup.js +++ b/js/popup.js @@ -242,18 +242,14 @@ function sortableList() { $(link).css('padding-left', depth * padding + 13); li.append(link); ul.append(li); - - // - //ul.show(); - //$(".bfolder").addClass("showspace"); } }); }, onEnd: function( /**Event*/ evt) { $(".showspace").removeClass("showspace"); + $(".unusedPlaceHolder").remove(); }, onUpdate: function(evt) { - console.log(evt); var item = evt.item; var href = $(item).children('a').href; var title = $(item).children('a').text(); From ff7f5534c6c283185fa008860819d5524023b3a3 Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Fri, 17 Mar 2017 19:11:01 -0400 Subject: [PATCH 36/37] Animation on folder open/close: --- js/print.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/print.js b/js/print.js index 9476423..b57d062 100644 --- a/js/print.js +++ b/js/print.js @@ -213,10 +213,10 @@ function hideFolderChildren() { function toggleFolder(folder){ if(folder.children('ul').is(":visible")){ folder.find('.dropIcon').attr('src', 'icons/right.png'); - folder.find('ul').hide(); + folder.find('ul').slideUp(400); } else{ folder.find('.dropIcon').attr('src', 'icons/down.png'); - folder.find('ul').show(); + folder.find('ul').slideDown(400); } } \ No newline at end of file From 65967af5de755d3d23a46568b4fd439dae251494 Mon Sep 17 00:00:00 2001 From: Kolya Yurchenko Date: Fri, 17 Mar 2017 20:45:31 -0400 Subject: [PATCH 37/37] Design update final commit --- css/main.css | 17 ++++++++++------- js/popup.js | 22 +++++++++++++--------- js/print.js | 43 +++++++++++++++++++------------------------ manifest.json | 2 +- 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/css/main.css b/css/main.css index d1a182e..504b23e 100644 --- a/css/main.css +++ b/css/main.css @@ -90,6 +90,7 @@ body { opacity: 0.5; } + /* Bookmarks */ #bookmarks { @@ -312,25 +313,27 @@ body { font-size: 16px; } -#bookmarks .showspace ul:empty{ +#bookmarks .showspace ul:empty { min-height: 20px; - } -#bookmarks .showspace ul:empty:after { + +#bookmarks .showspace ul:empty:after { padding-left: 40%; content: "Drag link here"; } -#bookmarks .unusedPlaceHolder a{ + +#bookmarks .unusedPlaceHolder a { padding-bottom: 0; padding-top: 0; height: 50px; border-top: none; } + #bookmarks .unusedPlaceHolder { border-bottom: 5px solid #009688; } -#bookmarks .unusedPlaceHolder a::before{ - position: relative; + +#bookmarks .unusedPlaceHolder a::before { + position: relative; top: 5px; } - diff --git a/js/popup.js b/js/popup.js index e3e88a6..5b7313d 100644 --- a/js/popup.js +++ b/js/popup.js @@ -1,5 +1,4 @@ var ROOT_TABS; -var EDIT_MODE = false; $().ready(function() { 'use strict'; @@ -232,13 +231,13 @@ function sortableList() { if ($(folder).hasClass("sortable-chosen")) return; var ul = $(folder).children('ul'); - if (ul.children().length == 0) { + if (ul.children().length == 0) { ul.show(); var li = $("
  2. ") .attr('class', 'unusedPlaceHolder'); var link = $(""); - var depth = $(ul).parents("ul").length+1, - padding = 20; + var depth = $(ul).parents("ul").length + 1, + padding = 20; $(link).css('padding-left', depth * padding + 13); li.append(link); ul.append(li); @@ -254,6 +253,7 @@ function sortableList() { var href = $(item).children('a').href; var title = $(item).children('a').text(); var index = evt.newIndex < evt.oldIndex ? evt.newIndex : evt.newIndex + 1; + var parentTitle = $(item).parent('ul').siblings('a').text().trim(); chrome.bookmarks.search({ 'title': title }, function(result) { @@ -262,13 +262,16 @@ function sortableList() { 'parentId': folder.parentId, 'index': index }, function() { - printBookmarks([sortableList]); + printBookmarks([sortableList, function() { + showFolder(parentTitle); + }]); }); }); }, onAdd: function(evt) { var item = evt.item; var old = evt.from; + var oldParentTitle = $(evt.from).siblings('a').text().trim(); var parentTitle = $(item).parent('ul').siblings('a').text().trim(); var href = $(item).children('a').href; var title = $(item).children('a').text(); @@ -286,9 +289,10 @@ function sortableList() { 'parentId': id, 'index': index }, function() { - sortableList, - showFolderChildren, - printBookmarks([sortableList]); + printBookmarks([sortableList, function() { + showFolder(parentTitle); + showFolder(oldParentTitle); + }]); }); }); }); @@ -484,7 +488,7 @@ function addNewFolder(name) { $('#bookmarks').animate({ scrollTop: length }, 700); - }], true); + }]); }); } diff --git a/js/print.js b/js/print.js index b57d062..e7f80b4 100644 --- a/js/print.js +++ b/js/print.js @@ -41,23 +41,9 @@ function printBookmarkFolder(bookmarkFolder, notShowChildren) { $(folder).find("a").prepend(r); } folder.append(printBookmarkFolder(bookmark, notShowChildren)); - if (EDIT_MODE && bookmark.children.length === 0) - folder.addClass("is-empty"); list.append(folder); $(r).click(function(e) { toggleFolder($(e.currentTarget).parent().parent()); - - /* - if ($(folder).find('li').is(':visible')) { - $('.dropIcon', this).attr('src', 'icons/right.png'); - $(folder).children().hide(); - $(folder).find('.dropIcon').show(); - $(folder).find('a').css('display', 'inline-block'); - } else { - $('.dropIcon', this).attr('src', 'icons/down.png'); - $(folder).children().show(); - } - */ }); if (notShowChildren) return; @@ -151,7 +137,7 @@ function updateBookmarks(list, printAfter) { 'parentId': folder.parentId, 'index': key }, function callback() { - if (printAfter && key === list.children.length - 1){ + if (printAfter && key === list.children.length - 1) { printBookmarks([sortableList]); } }); @@ -210,13 +196,22 @@ function hideFolderChildren() { }); } -function toggleFolder(folder){ - if(folder.children('ul').is(":visible")){ - folder.find('.dropIcon').attr('src', 'icons/right.png'); - folder.find('ul').slideUp(400); - } - else{ - folder.find('.dropIcon').attr('src', 'icons/down.png'); - folder.find('ul').slideDown(400); +function toggleFolder(folder) { + if (folder.children('ul').is(":visible")) { + folder.children('a').find('.dropIcon').attr('src', 'icons/right.png'); + folder.children('ul').slideUp(400); + } else { + folder.children('a').find('.dropIcon').attr('src', 'icons/down.png'); + folder.children('ul').slideDown(400); } -} \ No newline at end of file +} + +function showFolder(folderName) { + var elements = $('#bookmarks').find('a'); + var folder = elements.filter(function() { + return $(this).text() == folderName; + }).parent(); + + folder.children('a').find('.dropIcon').attr('src', 'icons/down.png'); + folder.children('ul').show(); +} diff --git a/manifest.json b/manifest.json index fdd6198..e8cb9fc 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "Bookmark beautifier", "short_name":"Bbeautifier", - "version": "0.0.0.4", + "version": "1.0.0.0", "description": "A browser extension that sorts and organizes bookmarks, also has an edit mode.", "permissions": [ "bookmarks"