This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-docs.git
commit 195f1279a3e461e3d2d0bf8c95a0f1230c33b710 Author: Josh Tynjala <[email protected]> AuthorDate: Thu Mar 20 14:14:07 2025 -0700 remove docsearch because of content-security-policy and adjust menu layout --- README.md | 6 - _includes/docsearch.html | 8 - _includes/header.html | 38 +--- _layouts/docpage.html | 1 - _sass/docsearch.sass | 523 ----------------------------------------------- _sass/royale-theme.sass | 24 ++- assets/css/styles.sass | 1 - 7 files changed, 18 insertions(+), 583 deletions(-) diff --git a/README.md b/README.md index 00cc5e4..3db2a0f 100644 --- a/README.md +++ b/README.md @@ -72,12 +72,6 @@ When linking to locations not in the help-docs stack, including other pages in t `[Apache Flex](https://flex.apache.org)` -## About Search - -Search is done thanks to [Algolia DocSearch](https://community.algolia.com/docsearch/). - - * [Algolia DocSearch Docs](https://community.algolia.com/docsearch/what-is-docsearch.html) - ## Build Locally 1. Install [Ruby+Devkit](https://rubyinstaller.org/downloads/). Ruby is required to run Jekyll. diff --git a/_includes/docsearch.html b/_includes/docsearch.html deleted file mode 100644 index 67b1021..0000000 --- a/_includes/docsearch.html +++ /dev/null @@ -1,8 +0,0 @@ -<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js";></script> -<script type="text/javascript"> docsearch({ -apiKey: 'd8ce6f56dbe882dae881d6cb769d8fc9', -indexName: 'apache_royale', -inputSelector: '.docsearch-input', -debug: false -}); -</script> \ No newline at end of file diff --git a/_includes/header.html b/_includes/header.html index 6090435..b415b63 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -9,42 +9,14 @@ </div> <div class="topbar-center"> - <!-- <div class="dropdown-wrapper"> --> - <button class="topMenu-dropbtn">DOCS</button> - <svg viewBox="0 0 926.23699 573.74994" version="1.1" x="0px" y="0px" width="8" height="8" class="toc-arrow-main"> - <g transform="translate(904.92214,-879.1482)"><path d=" - m -673.67664,1221.6502 -231.2455,-231.24803 55.6165, - -55.627 c 30.5891,-30.59485 56.1806,-55.627 56.8701,-55.627 0.6894, - 0 79.8637,78.60862 175.9427,174.68583 l 174.6892,174.6858 174.6892, - -174.6858 c 96.079,-96.07721 175.253196,-174.68583 175.942696, - -174.68583 0.6895,0 26.281,25.03215 56.8701, - 55.627 l 55.6165,55.627 -231.245496,231.24803 c -127.185,127.1864 - -231.5279,231.248 -231.873,231.248 -0.3451,0 -104.688, - -104.0616 -231.873,-231.248 z - " fill="currentColor"></path></g></svg> - <ul class="topMenu"> - {% include main-menu-options.html %} - </ul> - <!-- </div> --> </div> <div class="topbar-right"> - <div class="search-bar"> - <input class="docsearch-input" type="search" placeholder="Search docs..." autocomplete="off" spellcheck="false"/> - </div> - - <!-- <ul class="social"> - <li class="social_li fa fa-search"> - <a href="#grve-search-modal"></a> - </li> - <li class="social_li fa fa-share-alt"> - <a href="#grve-socials-modal"></a> - </li> - <li class="social_li fa fa-th"> - <a href="#grve-toggle-menu"></a> - </li> - </ul> --> - + <button class="topMenu-dropbtn"> + <i class="fa fa-bars"></i> MENU</button> + <ul class="topMenu"> + {% include main-menu-options.html %} + </ul> </div> </div> </header> \ No newline at end of file diff --git a/_layouts/docpage.html b/_layouts/docpage.html index fa3f428..579bc92 100644 --- a/_layouts/docpage.html +++ b/_layouts/docpage.html @@ -61,7 +61,6 @@ limitations under the License. </div> {% include footer.html %} - {% include docsearch.html %} <script> function showSideBar() diff --git a/_sass/docsearch.sass b/_sass/docsearch.sass deleted file mode 100644 index 5a509ea..0000000 --- a/_sass/docsearch.sass +++ /dev/null @@ -1,523 +0,0 @@ -/** - * Licensed under the Apache License, Version 2.0 (the "License") - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -.docsearch-input - font-size: 1em - height: 38px - line-height: 1em - - outline-style: none - display: inline-block - width: 100% - appearance: none - background-color: white - border-radius: 6px - border-style: solid - border-width: 0px - position: relative - padding: 0px 12px 0px 36px - background-image: url(/royale-docs/assets/svg/search.svg) - background-size: 16px 16px - background-repeat: no-repeat - background-position-y: center - background-position-x: 12px - -webkit-appearance: none - -moz-appearance: none - box-shadow: #e6e6e6 0px 0px 0px 1px inset - -.searchbox - display: inline-block - position: relative - width: 200px - height: 32px !important - white-space: nowrap - box-sizing: border-box - visibility: visible !important - -.searchbox .algolia-autocomplete - display: block - width: 100% - height: 100% - -.searchbox__wrapper - width: 100% - height: 100% - z-index: 999 - position: relative - -.searchbox__input - display: inline-block - box-sizing: border-box - transition: box-shadow 0.4s ease, background 0.4s ease - border: 0 - border-radius: 16px - box-shadow: inset 0 0 0 1px #cccccc - background: #ffffff !important - padding: 0 - padding-right: 26px - padding-left: 32px - width: 100% - height: 100% - vertical-align: middle - white-space: normal - font-size: 12px - appearance: none - -.searchbox__input::-webkit-search-decoration, .searchbox__input::-webkit-search-cancel-button, .searchbox__input::-webkit-search-results-button, .searchbox__input::-webkit-search-results-decoration - display: none - -.searchbox__input:hover - box-shadow: inset 0 0 0 1px #b3b3b3 - -.searchbox__input:focus, .searchbox__input:active - outline: 0 - box-shadow: inset 0 0 0 1px #aaaaaa - background: #ffffff - -.searchbox__input::placeholder - color: #aaaaaa - -.searchbox__submit - position: absolute - top: 0 - margin: 0 - border: 0 - border-radius: 16px 0 0 16px - background-color: rgba(69, 142, 225, 0) - padding: 0 - width: 32px - height: 100% - vertical-align: middle - text-align: center - font-size: inherit - user-select: none - right: inherit - left: 0 - -.searchbox__submit::before - display: inline-block - margin-right: -4px - height: 100% - vertical-align: middle - content: '' - -.searchbox__submit:hover, .searchbox__submit:active - cursor: pointer - -.searchbox__submit:focus - outline: 0 - -.searchbox__submit svg - width: 14px - height: 14px - vertical-align: middle - fill: #6d7e96 - -.searchbox__reset - display: block - position: absolute - top: 8px - right: 8px - margin: 0 - border: 0 - background: none - cursor: pointer - padding: 0 - font-size: inherit - user-select: none - fill: rgba(0, 0, 0, 0.5) - -.searchbox__reset.hide - display: none - -.searchbox__reset:focus - outline: 0 - -.searchbox__reset svg - display: block - margin: 4px - width: 8px - height: 8px - -.searchbox__input:valid ~ .searchbox__reset - display: block - animation-name: sbx-reset-in - animation-duration: 0.15s - -@keyframes sbx-reset-in - 0% - transform: translate3d(-20%, 0, 0) - opacity: 0 - - 100% - transform: none - opacity: 1 - -.algolia-autocomplete.algolia-autocomplete-right .ds-dropdown-menu - right: 0 !important - left: inherit !important - -.algolia-autocomplete.algolia-autocomplete-right .ds-dropdown-menu:before - right: 48px - -.algolia-autocomplete.algolia-autocomplete-left .ds-dropdown-menu - left: 0 !important - right: inherit !important - -.algolia-autocomplete.algolia-autocomplete-left .ds-dropdown-menu:before - left: 48px - -.algolia-autocomplete .ds-dropdown-menu - position: relative - top: -6px - border-radius: 4px - margin: 6px 0 0 - padding: 0 - text-align: left - height: auto - position: relative - background: transparent - border: none - z-index: 999 - min-width: 500px - max-width: 600px - box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2), 0 2px 3px 0 rgba(0, 0, 0, 0.1) - -.algolia-autocomplete .ds-dropdown-menu:before - display: block - position: absolute - content: '' - width: 14px - height: 14px - background: #fff - z-index: 1000 - top: -7px - border-top: 1px solid #d9d9d9 - border-right: 1px solid #d9d9d9 - transform: rotate(-45deg) - border-radius: 2px - -.algolia-autocomplete .ds-dropdown-menu .ds-suggestions - position: relative - z-index: 1000 - margin-top: 8px - -.algolia-autocomplete .ds-dropdown-menu .ds-suggestions a:hover - text-decoration: none - -.algolia-autocomplete .ds-dropdown-menu .ds-suggestion - cursor: pointer - -.algolia-autocomplete .ds-dropdown-menu .ds-suggestion.ds-cursor .algolia-docsearch-suggestion.suggestion-layout-simple - background-color: rgba(69, 142, 225, 0.05) - -.algolia-autocomplete .ds-dropdown-menu .ds-suggestion.ds-cursor .algolia-docsearch-suggestion:not(.suggestion-layout-simple) .algolia-docsearch-suggestion--content - background-color: rgba(69, 142, 225, 0.05) - -.algolia-autocomplete .ds-dropdown-menu [class^='ds-dataset-'] - position: relative - border: solid 1px #d9d9d9 - background: #fff - border-radius: 4px - overflow: auto - padding: 0 8px 8px - -.algolia-autocomplete .ds-dropdown-menu * - box-sizing: border-box - -.algolia-autocomplete .algolia-docsearch-suggestion - display: block - position: relative - padding: 0 8px - background: #fff - color: #02060c - overflow: hidden - -.algolia-autocomplete .algolia-docsearch-suggestion--highlight - color: #174d8c - background: rgba(143, 187, 237, 0.1) - padding: 0.1em 0.05em - -.algolia-autocomplete .algolia-docsearch-suggestion--category-header .algolia-docsearch-suggestion--category-header-lvl0 .algolia-docsearch-suggestion--highlight, .algolia-autocomplete .algolia-docsearch-suggestion--category-header .algolia-docsearch-suggestion--category-header-lvl1 .algolia-docsearch-suggestion--highlight - padding: 0 0 1px - background: inherit - box-shadow: inset 0 -2px 0 0 rgba(69, 142, 225, 0.8) - color: inherit - -.algolia-autocomplete .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight - padding: 0 0 1px - background: inherit - box-shadow: inset 0 -2px 0 0 rgba(69, 142, 225, 0.8) - color: inherit - -.algolia-autocomplete .algolia-docsearch-suggestion--content - display: block - float: right - width: 70% - position: relative - padding: 5.33333px 0 5.33333px 10.66667px - cursor: pointer - -.algolia-autocomplete .algolia-docsearch-suggestion--content:before - content: '' - position: absolute - display: block - top: 0 - height: 100% - width: 1px - background: #ddd - left: -1px - -.algolia-autocomplete .algolia-docsearch-suggestion--category-header - position: relative - border-bottom: 1px solid #ddd - display: none - margin-top: 8px - padding: 4px 0 - font-size: 1em - color: #2166ac - -.algolia-autocomplete .algolia-docsearch-suggestion--wrapper - width: 100% - float: left - padding: 8px 0 0 0 - -.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column - float: left - width: 30% - padding-left: 0 - text-align: right - position: relative - padding: 5.33333px 10.66667px - color: #a4a7ae - font-size: 0.9em - word-wrap: break-word - -.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column:before - content: '' - position: absolute - display: block - top: 0 - height: 100% - width: 1px - background: #ddd - right: 0 - -.algolia-autocomplete .algolia-docsearch-suggestion--subcategory-inline - display: none - -.algolia-autocomplete .algolia-docsearch-suggestion--title - margin-bottom: 4px - color: #02060c - font-size: 0.9em - font-weight: bold - -.algolia-autocomplete .algolia-docsearch-suggestion--text - display: block - line-height: 1.2em - font-size: 0.85em - color: #63676d - -.algolia-autocomplete .algolia-docsearch-suggestion--no-results - width: 100% - padding: 8px 0 - text-align: center - font-size: 1.2em - -.algolia-autocomplete .algolia-docsearch-suggestion--no-results::before - display: none - -.algolia-autocomplete .algolia-docsearch-suggestion code - padding: 1px 5px - font-size: 90% - border: none - color: #222222 - background-color: #ebebeb - border-radius: 3px - font-family: Menlo, Monaco, Consolas, 'Courier New', monospace - -.algolia-autocomplete .algolia-docsearch-suggestion code .algolia-docsearch-suggestion--highlight - background: none - -.algolia-autocomplete .algolia-docsearch-suggestion.algolia-docsearch-suggestion__main .algolia-docsearch-suggestion--category-header - display: block - -.algolia-autocomplete .algolia-docsearch-suggestion.algolia-docsearch-suggestion__secondary - display: block - -@media all and (min-width: 768px) - .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column - display: block - -@media all and (max-width: 768px) - .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column - display: inline-block - width: auto - text-align: left - float: left - padding: 0 - color: #02060c - font-size: 0.9em - font-weight: bold - text-align: left - opacity: 0.5 - - .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column:before - display: none - - .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--subcategory-column:after - content: '|' - - .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--content - display: inline-block - width: auto - text-align: left - float: left - padding: 0 - - .algolia-autocomplete .algolia-docsearch-suggestion .algolia-docsearch-suggestion--content:before - display: none - -.algolia-autocomplete .suggestion-layout-simple.algolia-docsearch-suggestion - border-bottom: solid 1px #eee - padding: 8px - margin: 0 - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--content - width: 100% - padding: 0 - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--content::before - display: none - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header - margin: 0 - padding: 0 - display: block - width: 100% - border: none - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl0 - opacity: 0.6 - font-size: 0.85em - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl1 - opacity: 0.6 - font-size: 0.85em - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--category-header-lvl1::before - background-image: url('data:image/svg+xmlutf8,<svg width="10" height="10" viewBox="0 0 20 38" xmlns="http://www.w3.org/2000/svg";><path d="M1.49 4.31l14 16.126.002-2.624-14 16.074-1.314 1.51 3.017 2.626 1.313-1.508 14-16.075 1.142-1.313-1.14-1.313-14-16.125L3.2.18.18 2.8l1.31 1.51z" fill-rule="evenodd" fill="%231D3657" /></svg>') - content: '' - width: 10px - height: 10px - display: inline-block - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--wrapper - width: 100% - float: left - margin: 0 - padding: 0 - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--duplicate-content, .algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--subcategory-inline - display: none !important - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--title - margin: 0 - color: #458ee1 - font-size: 0.9em - font-weight: normal - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--title::before - content: '#' - font-weight: bold - color: #458ee1 - display: inline-block - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--text - margin: 4px 0 0 - display: block - line-height: 1.4em - padding: 5.33333px 8px - background: #f8f8f8 - font-size: 0.85em - opacity: 0.8 - -.algolia-autocomplete .suggestion-layout-simple .algolia-docsearch-suggestion--text .algolia-docsearch-suggestion--highlight - color: #3f4145 - font-weight: bold - box-shadow: none - -.algolia-autocomplete .algolia-docsearch-footer - width: 134px - height: 20px - z-index: 2000 - margin-top: 10.66667px - float: right - font-size: 0 - line-height: 0 - -.algolia-autocomplete .algolia-docsearch-footer--logo - background-image: url("data:image/svg+xml,%3Csvg width='168' height='24' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cpath d='M78.988.938h16.594a2.968 2.968 0 0 1 2.966 2.966V20.5a2.967 2.967 0 0 1-2.966 2.964H78.988a2.967 2.967 0 0 1-2.966-2.964V3.897A2.961 2.961 0 0 1 78.988.938zm41.937 17.866c-4.386.02-4.386-3.54-4.386-4.106l-.007-13.336 2.675-.424v13.254c0 .322 0 2.358 1.718 2.364v2.248zm-10.846-2.18c.821 0 1.43-.047 1.855-.129v-2.719a6.334 6.334 [...] - background-repeat: no-repeat - background-position: center - background-size: 100% - overflow: hidden - text-indent: -9000px - padding: 0 !important - width: 100% - height: 100% - display: block - -// Since some values are added by Javascript, we have -// To add the !important option to override these values -.algolia-autocomplete - // On a max-width of 768px - @media (max-width: 768px) - - width: 100% !important - - .ds-dropdown-menu - max-width: 100% !important - min-width: 0 !important - width: 100% !important - margin-left: 16px !important - - .algolia-docsearch-suggestion--content - width: 100% !important - padding-left: 0 !important - - .algolia-docsearch-suggestion--content:before - display: none !important - - .algolia-docsearch-suggestion--subcategory-column - display: none !important - -/* Category (eg. Downloads) */ -// .algolia-autocomplete .algolia-docsearch-suggestion--subcategory-column - // color: #2166ac - -/* Title (eg. Bootstrap CDN) */ -// .algolia-autocomplete .algolia-docsearch-suggestion--title -// font-weight: bold -// color: #2166ac - -/* Description description (eg. Bootstrap currently works...) */ -// .algolia-autocomplete .algolia-docsearch-suggestion--text -// font-size: 0.8rem -// color: #2166ac - - -/* Highlighted text */ -// .algolia-autocomplete .algolia-docsearch-suggestion--highlight -// color: blue diff --git a/_sass/royale-theme.sass b/_sass/royale-theme.sass index 586857f..ce689f5 100644 --- a/_sass/royale-theme.sass +++ b/_sass/royale-theme.sass @@ -60,15 +60,12 @@ .topbar-center - display: inline-flex - flex: 1 1 auto - justify-content: center - padding: 0px 20px .topbar-right display: inline-flex - // flex: 1 1 auto + flex: 1 1 auto justify-content: flex-end + padding: 0px 20px .dropdown-wrapper display: flex @@ -93,34 +90,39 @@ height: 40px @media screen and (max-width: 1160px) - .topbar-center - align-items: center + .topbar-right + align-items: right .topMenu-dropbtn - display: flex + display: block z-index: 100 .topMenu display: none flex-direction: column position: absolute - z-index: 1 + z-index: 200 + right: 25px .topMenu_li background-color: #f7f7f7 - padding: 6px 18px margin: 0px box-shadow: 0px 18px 16px 0px rgba(0,0,0,0.2) line-height: 1em .topMenu_li_a + padding: 6px 18px font-family: "Hind Siliguri", sans-serif color: #4393c3 !important font-size: 16px line-height: 28px letter-spacing: 0px + display: block; + + .topMenu_li_a:hover + background-color: #e7e7e7 - .topbar-center:hover .topMenu + .topbar-right:hover .topMenu display: flex .topMenu_li diff --git a/assets/css/styles.sass b/assets/css/styles.sass index a8ab926..34a41cf 100644 --- a/assets/css/styles.sass +++ b/assets/css/styles.sass @@ -23,5 +23,4 @@ @import "highlight" @import "royale-theme" @import "sidebar" -@import "docsearch"
