This is an automated email from the ASF dual-hosted git repository. houston pushed a commit to branch jira/solr-15556-antora in repository https://gitbox.apache.org/repos/asf/solr.git
commit 4419035cfb066f50f2fb1666cc2e094ae5891d6e Author: Houston Putman <[email protected]> AuthorDate: Thu Feb 3 16:21:43 2022 -0500 Explicitly call out changes for UI CSS files --- solr/solr-ref-guide/ui-src/css/base.css | 28 +++++++ solr/solr-ref-guide/ui-src/css/doc.css | 4 +- solr/solr-ref-guide/ui-src/css/footer.css | 2 + solr/solr-ref-guide/ui-src/css/header.css | 60 +++++++++++---- solr/solr-ref-guide/ui-src/css/main.css | 37 ++++++++++ solr/solr-ref-guide/ui-src/css/nav.css | 6 ++ solr/solr-ref-guide/ui-src/css/print.css | 86 ++++++++++++++++++++++ solr/solr-ref-guide/ui-src/css/site.css | 2 + solr/solr-ref-guide/ui-src/css/toc.css | 8 ++ .../ui-src/css/typeface-inconsolata.css | 1 + .../ui-src/css/typeface-noto-sans.css | 1 + solr/solr-ref-guide/ui-src/partials/toc.hbs | 5 ++ 12 files changed, 224 insertions(+), 16 deletions(-) diff --git a/solr/solr-ref-guide/ui-src/css/base.css b/solr/solr-ref-guide/ui-src/css/base.css index 61fe65d..ac75c2a 100644 --- a/solr/solr-ref-guide/ui-src/css/base.css +++ b/solr/solr-ref-guide/ui-src/css/base.css @@ -2,8 +2,10 @@ *::before, *::after { box-sizing: inherit; + /* Solr Changes - Start */ margin: 0; padding: 0; + /* Solr Changes - End */ } html { @@ -52,6 +54,22 @@ th { font-weight: var(--body-font-weight-bold); } +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + em em { /* stylelint-disable-line */ font-style: normal; } @@ -73,11 +91,21 @@ button::-moz-focus-inner { padding: 0; } +summary { + cursor: pointer; + -webkit-tap-highlight-color: transparent; + outline: none; +} + table { border-collapse: collapse; word-wrap: normal; /* table widths aren't computed as expected when word-wrap is enabled */ } +object[type="image/svg+xml"]:not([width]) { + width: fit-content; +} + @supports (scrollbar-width: thin) { body * { scrollbar-width: thin; diff --git a/solr/solr-ref-guide/ui-src/css/doc.css b/solr/solr-ref-guide/ui-src/css/doc.css index bcb7c36..a4cbd97 100644 --- a/solr/solr-ref-guide/ui-src/css/doc.css +++ b/solr/solr-ref-guide/ui-src/css/doc.css @@ -46,9 +46,11 @@ } } -.doc > h1.page:first-child + aside.toc.embedded { +/* Solr Changes - Start */ +.doc > h1.page:first-child + nav.toc.embedded { margin-top: -0.5rem; } +/* Solr Changes - End */ .doc > h2#name + .sectionbody { margin-top: 1rem; diff --git a/solr/solr-ref-guide/ui-src/css/footer.css b/solr/solr-ref-guide/ui-src/css/footer.css index 5ee9286..9f53773 100644 --- a/solr/solr-ref-guide/ui-src/css/footer.css +++ b/solr/solr-ref-guide/ui-src/css/footer.css @@ -3,10 +3,12 @@ footer.footer { color: var(--footer-font-color); font-size: calc(15 / var(--rem-base) * 1rem); line-height: var(--footer-line-height); + /* Solr Changes - Start */ padding: 10px; border-style: solid hidden; border-color: var(--color-solr-primary-orange); border-width: 1.5px; + /* Solr Changes - End */ } .footer p { diff --git a/solr/solr-ref-guide/ui-src/css/header.css b/solr/solr-ref-guide/ui-src/css/header.css index be1055d..66172ba 100644 --- a/solr/solr-ref-guide/ui-src/css/header.css +++ b/solr/solr-ref-guide/ui-src/css/header.css @@ -8,7 +8,9 @@ body { .navbar { background: var(--navbar-background); + /* Solr Changes - Start */ border-bottom: 2px solid var(--color-solr-primary-orange); + /* Solr Changes - End */ color: var(--navbar-font-color); font-size: calc(16 / var(--rem-base) * 1rem); height: var(--navbar-height); @@ -24,21 +26,42 @@ body { .navbar-brand { display: flex; + flex: auto; padding-left: 1rem; } -.navbar-brand .navbar-item:first-child, -.navbar-brand .navbar-item:first-child a, -.navbar-brand .navbar-item:nth-child(2), -.navbar-brand .navbar-item:nth-child(2) a { +.navbar-brand .navbar-item:first-child { align-self: center; padding: 0; color: var(--navbar-font-color); font-size: calc(22 / var(--rem-base) * 1rem); + flex-wrap: wrap; + line-height: 1; +} + +.navbar-brand .navbar-item:first-child a { + color: inherit; + word-wrap: normal; } -.navbar-brand .separator { - padding: 0 0.375rem; +.navbar-brand .navbar-item:first-child :not(:last-child) { + padding-right: 0.375rem; +} + +.navbar-brand .navbar-item.search { + flex: auto; + justify-content: flex-end; +} + +#search-input { + color: #333; + font-family: inherit; + font-size: 0.95rem; + width: 150px; + border: 1px solid #dbdbdb; + border-radius: 0.1em; + line-height: 1.5; + padding: 0 0.25em; } .navbar-burger { @@ -48,12 +71,12 @@ body { line-height: 1; position: relative; width: 3rem; - margin-left: auto; padding: 0; display: flex; flex-direction: column; align-items: center; justify-content: center; + margin-left: auto; min-width: 0; } @@ -132,7 +155,9 @@ body { display: inline-flex; align-items: center; background: var(--navbar-button-background); + /* Solr Changes - Start */ border: 1.25px solid var(--color-solr-primary-orange); + /* Solr Changes - End */ border-radius: 0.15rem; height: 1.75rem; color: var(--navbar-button-font-color); @@ -140,6 +165,19 @@ body { white-space: nowrap; } +@media screen and (max-width: 768.5px) { + .navbar-brand .navbar-item.search { + padding-left: 0; + padding-right: 0; + } +} + +@media screen and (min-width: 769px) { + #search-input { + width: 200px; + } +} + @media screen and (max-width: 1023.5px) { .navbar-brand { height: inherit; @@ -180,14 +218,6 @@ body { display: flex; } - .navbar-menu { - flex: auto; - } - - .navbar-end { - margin-left: auto; - } - .navbar-item, .navbar-link { display: flex; diff --git a/solr/solr-ref-guide/ui-src/css/main.css b/solr/solr-ref-guide/ui-src/css/main.css new file mode 100644 index 0000000..eb42afd --- /dev/null +++ b/solr/solr-ref-guide/ui-src/css/main.css @@ -0,0 +1,37 @@ +/* Solr Changes - Rename 'aside' -> 'nav' across whole file */ + +@media screen and (max-width: 1023.5px) { + nav.toc.sidebar { + display: none; + } + + main > .content { + overflow-x: auto; + } +} + +@media screen and (min-width: 1024px) { + main { + flex: auto; + min-width: 0; /* min-width: 0 required for flexbox to constrain overflowing elements */ + } + + main > .content { + display: flex; + } + + nav.toc.embedded { + display: none; + } + + nav.toc.sidebar { + flex: 0 0 var(--toc-width); + order: 1; + } +} + +@media screen and (min-width: 1216px) { + nav.toc.sidebar { + flex-basis: var(--toc-width--widescreen); + } +} diff --git a/solr/solr-ref-guide/ui-src/css/nav.css b/solr/solr-ref-guide/ui-src/css/nav.css index 42ca8b7..a3b6c3d 100644 --- a/solr/solr-ref-guide/ui-src/css/nav.css +++ b/solr/solr-ref-guide/ui-src/css/nav.css @@ -100,6 +100,7 @@ html.is-clipped--nav { color: inherit; } +/* Solr Changes - Start */ .nav-list { margin: 0 0 0 0.75rem; } @@ -107,6 +108,7 @@ html.is-clipped--nav { .nav-menu > ul.nav-list { padding-top: 20px; } +/* Solr Changes - End */ .nav-menu > .nav-list + .nav-list { margin-top: 0.5rem; @@ -114,7 +116,9 @@ html.is-clipped--nav { .nav-item { list-style: none; + /* Solr Changes - Start */ margin-top: 10px; + /* Solr Changes - End */ } /* adds some breathing room below a nested list */ @@ -151,7 +155,9 @@ html.is-clipped--nav { .is-current-page > .nav-link, .is-current-page > .nav-text { font-weight: var(--body-font-weight-bold); + /* Solr Changes - Start */ color: var(--color-solr-primary-orange); + /* Solr Changes - End */ } .nav-panel-explore { diff --git a/solr/solr-ref-guide/ui-src/css/print.css b/solr/solr-ref-guide/ui-src/css/print.css new file mode 100644 index 0000000..efa17c4 --- /dev/null +++ b/solr/solr-ref-guide/ui-src/css/print.css @@ -0,0 +1,86 @@ +@page { + margin: 0.5in; +} + +@media print { + .hide-for-print { + display: none !important; + } + + html { + font-size: var(--body-font-size--print); + } + + a { + color: inherit !important; + text-decoration: underline; + } + + a.bare, + a[href^="#"], + a[href^="mailto:";] { + text-decoration: none; + } + + tr, + img, + object, + svg { + page-break-inside: avoid; + } + + thead { + display: table-header-group; + } + + pre { + hyphens: none; + white-space: pre-wrap; + } + + body { + padding-top: 2rem; + } + + .navbar { + background: none; + color: inherit; + position: absolute; + } + + .navbar * { + color: inherit !important; + } + + .navbar > :not(.navbar-brand), + .nav-container, + .toolbar, + /* Solr Changes - Start */ + nav.toc, + /* Solr Changes - End */ + nav.pagination { + display: none; + } + + .doc { + color: inherit; + margin: auto; + max-width: none; + padding-bottom: 2rem; + } + + .doc .listingblock code[data-lang]::before { + display: block; + } + + footer.footer { + background: none; + border-top: 1px solid var(--panel-border-color); + color: var(--quote-attribution-font-color); + padding: 0.25rem 0.5rem 0; + } + + .footer * { + color: inherit; + } +} diff --git a/solr/solr-ref-guide/ui-src/css/site.css b/solr/solr-ref-guide/ui-src/css/site.css index 4fcc351..f8468bb 100644 --- a/solr/solr-ref-guide/ui-src/css/site.css +++ b/solr/solr-ref-guide/ui-src/css/site.css @@ -1,5 +1,7 @@ +/* Solr Changes - Start */ @import "typeface-noto-sans.css"; @import "typeface-inconsolata.css"; +/* Solr Changes - End */ @import "vars.css"; @import "base.css"; @import "body.css"; diff --git a/solr/solr-ref-guide/ui-src/css/toc.css b/solr/solr-ref-guide/ui-src/css/toc.css index 870c238..674dfaa 100644 --- a/solr/solr-ref-guide/ui-src/css/toc.css +++ b/solr/solr-ref-guide/ui-src/css/toc.css @@ -10,7 +10,9 @@ .toc .toc-menu h3 { color: var(--toc-heading-font-color); + /* Solr Changes - Start */ font-size: calc(18 / var(--rem-base) * 1rem); + /* Solr Changes - End */ font-weight: var(--body-font-weight-bold); line-height: 1.3; margin: 0 -0.5px; @@ -45,6 +47,7 @@ } @media screen and (min-width: 1024px) { + /* Solr Changes - Start */ .toc .toc-menu h3 { font-size: calc(18 / var(--rem-base) * 1rem); } @@ -52,6 +55,7 @@ .toc .toc-menu ul { font-size: calc(15 / var(--rem-base) * 1rem); } + /* Solr Changes - End */ } .toc .toc-menu li { @@ -80,11 +84,15 @@ } .toc .toc-menu a:hover { + /* Solr Changes - Start */ color: var(--color-solr-primary-orange); + /* Solr Changes - End */ } .toc .toc-menu a.is-active { + /* Solr Changes - Start */ border-left-color: var(--color-solr-primary-orange); + /* Solr Changes - End */ color: var(--doc-font-color); } diff --git a/solr/solr-ref-guide/ui-src/css/typeface-inconsolata.css b/solr/solr-ref-guide/ui-src/css/typeface-inconsolata.css index 3c77365..2b497ae 100644 --- a/solr/solr-ref-guide/ui-src/css/typeface-inconsolata.css +++ b/solr/solr-ref-guide/ui-src/css/typeface-inconsolata.css @@ -1,3 +1,4 @@ +/* Solr New File */ /* Load Inconsolata for monospace */ @font-face { font-family: 'Inconsolata'; diff --git a/solr/solr-ref-guide/ui-src/css/typeface-noto-sans.css b/solr/solr-ref-guide/ui-src/css/typeface-noto-sans.css index 7ce5d6d..1ae7229 100644 --- a/solr/solr-ref-guide/ui-src/css/typeface-noto-sans.css +++ b/solr/solr-ref-guide/ui-src/css/typeface-noto-sans.css @@ -1,3 +1,4 @@ +/* Solr New File */ /* Load Noto Sans for body and text */ @font-face { font-family: "Noto Sans"; diff --git a/solr/solr-ref-guide/ui-src/partials/toc.hbs b/solr/solr-ref-guide/ui-src/partials/toc.hbs new file mode 100644 index 0000000..3265b59 --- /dev/null +++ b/solr/solr-ref-guide/ui-src/partials/toc.hbs @@ -0,0 +1,5 @@ +<!-- Solr Changes - Start --> +<nav class="toc sidebar" data-title="{{or page.attributes.toctitle 'On This Page'}}" data-levels="{{{or page.attributes.toclevels 2}}}"> + <div class="toc-menu"></div> +</nav> +<!-- Solr Changes - End --> \ No newline at end of file
