From 7c06d662e2b872b5742121e90ddc472efc1f2a21 Mon Sep 17 00:00:00 2001 From: twogee Date: Wed, 30 Aug 2017 20:20:16 +0200 Subject: [PATCH 1/2] use Unicode glyphs or SVG data URLs instead of bitmaps --- asciidoc/images/bullet.gif | Bin 193 -> 0 bytes asciidoc/images/closed.gif | Bin 141 -> 0 bytes asciidoc/images/discovery.gif | Bin 362 -> 0 bytes asciidoc/images/grippie.png | Bin 162 -> 0 bytes asciidoc/images/open.gif | Bin 151 -> 0 bytes asciidoc/images/warning.png | Bin 762 -> 0 bytes asciidoc/images/warning.svg | 23 --------- asciidoc/style/style.css | 90 ++++++++++++++++++---------------- 8 files changed, 48 insertions(+), 65 deletions(-) delete mode 100644 asciidoc/images/bullet.gif delete mode 100644 asciidoc/images/closed.gif delete mode 100644 asciidoc/images/discovery.gif delete mode 100644 asciidoc/images/grippie.png delete mode 100644 asciidoc/images/open.gif delete mode 100644 asciidoc/images/warning.png diff --git a/asciidoc/images/bullet.gif b/asciidoc/images/bullet.gif deleted file mode 100644 index a1b1748813e2537fb1ca76dce6743ac90e91529a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmZ?wbhEHb6krfwIKsft(%#?PF*(1i<=F9)vu4kkFmcl6Et@xNSifS$@&ya#&zw19 z%9P2ICr|3{?`vyoJ$?H0{{8#6Y}vALZiD8?f r(5RuL#}txqFvG}%;Yv#K!33RNPp<_UX_HoYDlAByc|N0rgTWdA5cyP) diff --git a/asciidoc/images/closed.gif b/asciidoc/images/closed.gif deleted file mode 100644 index 319fe8da1b312db10344ef3ff2c8347166dd8441..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmZ?wbhEHb6krfw*v!E2>(`G>>lQq?bMfh;n{Qt~{rctO>SePI9X$B||9=K-K=CIF zBLf2mgAPa%WCjC^mB2~Q)q7{moBWzFM!j~y*17HsYaZ^{XJ9SsntQ*rLZIgT=Ut5j c9x_`5R`fa^u!-aI6%2ZCBxgxP4hw@d0EL-05C8xG diff --git a/asciidoc/images/discovery.gif b/asciidoc/images/discovery.gif deleted file mode 100644 index ec6cca4525bf483077bcc2039eaede6e71258c89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmZ?wbhEHb6krfwxXQo~6H^{jeln(fZOo*T0n4t1_pLGO*y1x`Q}l#2#d9{*&R!j} z=48ytlQC=8PC9vVEf75cDvl|iRDSZw$w?>6*Pfg-V@=K4ljW1v0+qx}ngk@vPoA7q zUJhiJLo_{ka&qV9;sbl<|Nryp$;q{o)ztp~|6g8S4kQ^U28usf7#SEe8FWA#3>?NMQuIyKNr1_ck-SdrEfI?xO zE{-7@=ht31$a{c+g*9Muv_A`T#3JJ>D?>92U)cXW(#>IUt#SU!nQJpFT;{A?)mHqy zG3|Pw;LezGZR7OsmDy#L<~p%UUB0|pWS=o}YTe~~XX|w>8UHQ+cj~oGPa4n$22WQ% Jmvv4FO#rJyIb#3- diff --git a/asciidoc/images/open.gif b/asciidoc/images/open.gif deleted file mode 100644 index bd0be79ed2ea0e57ff5be35bdfc0e9d6e3b3a747..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmV;I0BHY5Nk%w1VGsZi0J8u9`T6$w`Sgwp=^z-lJ;n(2Y(dOgZ?d#?D_Vf1j z^5Wjq@$c%w!NLFk{{R30A^8LW000gEEC2ui01yBW000C;(8)=wbuG6`8~DM-VIL5V zSdu7-$TdVvxK|@EIBhjZkLVIjV?Z1TJBOrlscRIT&?gYHs9L8%gVunZG_>7L7&VCi F06W)qN>cy; diff --git a/asciidoc/images/warning.png b/asciidoc/images/warning.png deleted file mode 100644 index 283cc712745606f96406c923933d57c88b563d58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 762 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb< z5i~CwVQ6Il00MeRL_t(I%axK#Y)o+!#((F3XXcK!Gwo=#iZ0rsqSVGCA*B+cVudEc zLRg4}ofQirL@X?jT3JXu<54tNC`wd9CyE4(S0fdPq|qv!na=Cpdn~3(rHlHKlk>=V zd?)9?I7q)+#R>T*_Iw!=M$gfl{&1>r=xuXhivL0O;~W6AH@y4mhB9qwDpU7aXdgiG z$=r!IdbFoRzg`b$-wnUs-!(;5RmRIRe><7(DgcI};d2AM7Ui`WEv?FGVo>;Yt>_v+ zqP=qbiEb>Kqpmg6Zf-5rR21*_aa%7P4r=-#-u0$3RjsTB$b7yyTIc(1B)b{_=)KU_ z7AiK_VK{j?pW(EyX?2Q{iVW|MId_5T*n=%&S4c*eQ?N3L4o+_DycC>Qzxlf|ghUEG zB4H1PktOSX>hrchmA)+7SiBwLck2HzII^SzfEUfQ&aIE(3?s&ZNWK!9q_`OiCv9ZG ziUiT~!4^OY8XxBv#P8K{5O6vQ_r7~-+qFv*>ZSxYC4};o$sxtf8r+O9t1hjdx_!j2 zmL3B5*|Lby)7;-#sx^yZM5bm@1xtj^9)l5KVFkDj;2L5Beti?olQm~g`$g6|2B7au z$(7iEVM@8HUe-b#3(Xn|f`aV>bqqKb>KKY5N;(B!j_qg#5RJ{Rys@qSQ^Wcp^#xQw z0muu$#%7yDO1QH-Lp)(nSHQDSN3{J`P?`>u*UGE?<}DU z2=O02@C5Y)T!TUMRhM7vp#9p1C$nSUeY9T*3!?wL*C?SeT2;gtm_EasDYcRSM|}T?n33z}8IjAGU)6mN@40SaPyhe`07*qoM6N<$f~j3p=>Px# diff --git a/asciidoc/images/warning.svg b/asciidoc/images/warning.svg index 7a13b13c9..e69de29bb 100644 --- a/asciidoc/images/warning.svg +++ b/asciidoc/images/warning.svg @@ -1,23 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/asciidoc/style/style.css b/asciidoc/style/style.css index bca354539..c99e33272 100644 --- a/asciidoc/style/style.css +++ b/asciidoc/style/style.css @@ -26,8 +26,8 @@ body { margin: 8px auto; padding: 0; width: 98%; - color: #000; - background-color: #fff; + color: black; + background-color: white; border-radius: 5px; padding-top: 5px; padding-bottom: 5px; @@ -37,15 +37,16 @@ body, p, td, li, ul, ol { font-size: small; } h1, h2, h3, h4, h5, h6 { - color: #7a9438;font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif; + color: #7a9438; + font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif; } h1 { color: #7a9438; - background-color: #fff; + background-color: white; background: none; } h2 { - color: #fff; + color: white; background-color: #7a9438; padding-left: 10px; font-size: 1.6em; @@ -85,7 +86,7 @@ blockquote { font-size: 1.2em; line-height: 1.3em; font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif; - color: #696969; + color: dimgray; } pre { padding: 0.75em 1.5em; @@ -94,7 +95,7 @@ pre { border: 1px solid #ddd; } code { - background-color: #EEE; + background-color: #eee; } dt { font-weight: bold; @@ -122,27 +123,27 @@ li p { #navcontainer { color: white; margin-left: 20px; - background-color:#7a9438; + background-color: #7a9438; } #navcontainer a { color: white; text-decoration: none; } #nav { - background-color:#7a9438; + background-color: #7a9438; } #nav ul { - background-color:#7a9438; + background-color: #7a9438; border-top: 1px solid #7a9438; border-right: 1px solid #7a9438; border-bottom: 1px solid #7a9438; border-left: 0.75em solid #7a9438; } #nav li a { - color: #fff; + color: white; } #nav .title { - color: #fff; + color: white; background: #7a9438; border-top: 0; border-right: 0; @@ -150,7 +151,7 @@ li p { border-left: 0; } #nav li li a { - background: #fff; + background: white; color: #7a9438; border-top: 0; border-right: 0; @@ -161,7 +162,7 @@ li p { background: #9ebf47; } #top-menu { - background-color:#7a9438; + background-color: #7a9438; border-top: 3px solid #9ebf47; border-bottom: 3px solid #9ebf47; } @@ -207,12 +208,12 @@ li p { font-weight: 700; border-top-left-radius: 5px; border-top-right-radius: 5px; - color: #000; + color: black; background-color: #eee; font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif; } #content { - table-layout:fixed; + table-layout: fixed; } .block h2 { margin: 5px 0px 0px 0px; @@ -220,13 +221,15 @@ li p { font-size: 1.2em; font-weight: 700; border-top-left-radius: 5px; - border-top-right-radius: 5px;color: #000; + border-top-right-radius: 5px; + color: black; background-color: #eee; } .block .content { border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; - margin-bottom: 10px;background-color: #fff; + margin-bottom: 10px; + background-color: white; border: 1px solid #eee; } #main { @@ -254,20 +257,20 @@ table.tableblock { margin-bottom: 10px; } table.tableblock thead { - background-color: #DEE4CD; - border: 1px solid #7A9437; + background-color: #dee4cd; + border: 1px solid #7a9437; } table.tableblock th { font-family: monospace; - border: 1px solid #7A9437; + border: 1px solid #7a9437; padding: 5px; } table.tableblock tbody { - background-color: #FFFFFF; - border: 1px solid #7A9437; + background-color: white; + border: 1px solid #7a9437; } table.tableblock td { - border: 1px dotted #7A9437; + border: 1px dotted #7a9437; padding: 5px; } table.tableblock td p:last-child { @@ -281,49 +284,52 @@ table.tableblock .valign-middle { } .note { padding: 15px; - border-style:solid; - border-width:1px; - border-color: #F0D88D; - background-color: #FCFCCA; + border-style: solid; + border-width: 1px; + border-color: #f0d88d; + background-color: #fcfcca; margin: 10px; } .note .title { - display:none; + display: none; } .warning:before { - content: url(../images/warning.svg) + font-size: 1.25rem; + color: red; + margin: 10px; + content: '\0026A0'; } .warning { - border-style:solid; - border-width:1px; - border-color: #F0D88D; - background-color: #FCFCCA; + border-style: solid; + border-width: 1px; + border-color: #f0d88d; + background-color: #fcfcca; margin: 10px; } .warning .title { - display:none; + display: none; } #treemenu { padding-left: 10px; } +.treeview .hitarea { + cursor: pointer; +} .treeview ul { margin: 0; padding: 0; } .treeview li { - background: white url(../images/bullet.gif) no-repeat left center; + background: white url('data:image/svg+xml;utf-8,') no-repeat left center; list-style-type: none; padding-left: 22px; margin-bottom: 3px; } .treeview li.submenu { - background: white url(../images/closed.gif) no-repeat left 1px; -} -.treeview .hitarea { - cursor: pointer; + background: white url('data:image/svg+xml;utf-8,') no-repeat left 1px; } .treeview li.collapsable, .treeview li.open { - background: white url(../images/open.gif) no-repeat left 1px; + background: white url('data:image/svg+xml;utf-8,') no-repeat left 1px; } .treeview ul.closed { display: none; @@ -342,5 +348,5 @@ table.tableblock .valign-middle { color: #7a9438; } #book { - background-color: #FFFFFF; + background-color: white; } From 333deff4961ea9b45d104361368c96884605a8c0 Mon Sep 17 00:00:00 2001 From: twogee Date: Sun, 3 Sep 2017 08:33:35 +0200 Subject: [PATCH 2/2] IVY-450 highlight current page in menu --- asciidoc/style/style.css | 1 + asciidoc/templates/document.html.slim | 2 +- asciidoc/templates/helpers.rb | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/asciidoc/style/style.css b/asciidoc/style/style.css index c99e33272..d0803841a 100644 --- a/asciidoc/style/style.css +++ b/asciidoc/style/style.css @@ -324,6 +324,7 @@ table.tableblock .valign-middle { list-style-type: none; padding-left: 22px; margin-bottom: 3px; + color: #7a9438; } .treeview li.submenu { background: white url('data:image/svg+xml;utf-8,') no-repeat left 1px; diff --git a/asciidoc/templates/document.html.slim b/asciidoc/templates/document.html.slim index 4df1de46d..2e55cad0f 100644 --- a/asciidoc/templates/document.html.slim +++ b/asciidoc/templates/document.html.slim @@ -28,7 +28,7 @@ html lang=(attr :lang, 'en' unless attr? :nolang) link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript" javascript: - $(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});}); + $(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});$("#xooki-" + $(location).attr('pathname').split('/').slice(-1 - ($("#xooki-index a").attr('href').match(/\.\./g) || []).length).join('--').replace(/\.html$/, '') + ' > a').css('color', '#9ebf47')}); hljs.initHighlightingOnLoad(); body div id="body" diff --git a/asciidoc/templates/helpers.rb b/asciidoc/templates/helpers.rb index 9f5d063cb..8ff623517 100644 --- a/asciidoc/templates/helpers.rb +++ b/asciidoc/templates/helpers.rb @@ -59,7 +59,7 @@ def link(printpage) def relativeRoot() p = '' - (self.id.split("/").length-1).times do |e| + (self.id.split("/").length - 1).times do |e| p += '../' end return p @@ -97,7 +97,7 @@ def menu() def innermenu(page) m = '
    ' + "\n" page.children.each do |p| - m += '
  • 0 m += ' class="submenu"' end