pageflow 15.7.1 → 16.0.0

data/entry_types/scrolled/package/package.json

@@ -8,6 +8,7 @@
   "license": "MIT",
   "dependencies": {
     "@egjs/view360": "^3.4.3",
+    "@headlessui/react": "^1.6.6",
     "core-js": "^3.6.5",
     "debounce": "^1.2.0",
     "deep-assign": "^3.0.0",
@@ -47,7 +48,7 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.1",
-    "@testing-library/user-event": "^13.5.0",
+    "@testing-library/user-event": "^14.4.3",
     "@typescript-eslint/eslint-plugin": "2.x",
     "@typescript-eslint/parser": "2.x",
     "babel-eslint": "10.x",
@@ -77,6 +78,6 @@
     "lint": "eslint .",
     "start-storybook": "start-storybook -s .storybook/static",
     "build-storybook": "build-storybook -s .storybook/static -o .storybook/out",
-    "snapshot": "STORYBOOK_SPLIT=true build-storybook --quiet -s .storybook/static -o .storybook/out && PERCY_TOKEN=${PERCY_TOKEN:-$PT} percy-storybook --widths=1280 --build_dir=.storybook/out"
+    "snapshot": "build-storybook --quiet -s .storybook/static -o .storybook/out && PERCY_TOKEN=${PERCY_TOKEN:-$PT} percy-storybook --widths=1280 --build_dir=.storybook/out"
   }
 }

data/entry_types/scrolled/package/testHelpers.js

@@ -128,12 +128,16 @@ function normalizeSeed() {
         themeOptions: themeOptions,
         themeAssets: themeAssets
       }),
-      additionalSeedData: additionalSeedData || {}
+      additionalSeedData: additionalSeedData || {
+        frontendVersion: 1
+      }
     },
     collections: {
       entries: normalizedEntries,
       imageFiles: normalizeCollection(imageFiles, {
         isReady: true,
+        basename: 'image',
+        extension: 'jpg',
         width: 1920,
         height: 1279,
         configuration: {}
@@ -183,7 +187,13 @@ function normalizeSections() {
     }, sectionDefaults)];
   }
 
-  return normalizeCollection(sections, sectionDefaults);
+  return normalizeCollection(sections, sectionDefaults).map(function (section) {
+    return _objectSpread2(_objectSpread2({}, section), {}, {
+      configuration: _objectSpread2({
+        transition: sectionDefaults.configuration.transition
+      }, section.configuration)
+    });
+  });
 }
 
 function normalizeChapters() {

data/entry_types/scrolled/package/widgets/defaultNavigation.css

@@ -1,4 +1,4 @@
-.DefaultNavigation-module_navigationBar__2RK0h{--default-navigation-bar-height:var(--theme-default-navigation-bar-height,50px);--default-navigation-scroller-top:var(--theme-default-navigation-scroller-top,0);--default-navigation-scroll-button-top:var(--theme-default-navigation-scroll-button-top,5px);--default-navigation-chapter-link-height:var(--theme-default-navigation-chapter-link-height,50px);--default-navigation-progress-indicator-height:var(--theme-default-navigation-progress-indicator-height,10px);font-family:var(--theme-widget-font-family);position:fixed;top:calc(-1*var(--default-navigation-bar-height));transition:top .15s;z-index:10000;width:100%;text-align:center;height:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.DefaultNavigation-module_navigationBarExpanded__C3sLq{top:0}.DefaultNavigation-module_navigationBarContentWrapper__3narH{position:relative;z-index:2;background-color:var(--theme-widget-surface-color);color:var(--theme-widget-on-surface-color);height:var(--default-navigation-bar-height);box-sizing:border-box;padding-top:var(--default-navigation-scroller-top)}.DefaultNavigation-module_menuIcon__2bb8s{position:absolute;top:0;left:12px;height:var(--default-navigation-bar-height)}.DefaultNavigation-module_contextIcons__2e65s{position:absolute;top:0;right:12px;display:flex}.DefaultNavigation-module_contextIcons__2e65s>*{pointer-events:auto}.DefaultNavigation-module_contextIcon__ELsqa{cursor:pointer;width:40px;height:var(--default-navigation-bar-height);color:var(--theme-widget-secondary-color);fill:currentcolor;stroke:currentColor}.DefaultNavigation-module_contextIcon__ELsqa svg{width:35px;height:35px;margin:7px 2px}.DefaultNavigation-module_contextIcon__ELsqa:hover,div:focus-within>.DefaultNavigation-module_contextIcon__ELsqa{color:var(--theme-widget-primary-color)}.DefaultNavigation-module_logo__3gUbx{top:0;left:15px;height:100%;max-width:15%}.DefaultNavigation-module_logo__3gUbx img{height:100%;max-width:100%;-o-object-fit:contain;object-fit:contain}.DefaultNavigation-module_chapterList__3VoXX{padding:0;margin:0;list-style:none;display:flex}.DefaultNavigation-module_chapterListItem__1YF5e{position:relative;padding:0 5px;border-right:1px solid #e9e9e9}.DefaultNavigation-module_chapterListItem__1YF5e:last-of-type{border-right:none}.DefaultNavigation-module_navigationTooltip__26Fvn{opacity:1!important;box-shadow:0 0 .3125rem rgba(0,0,0,.2)}.DefaultNavigation-module_progressBar__1jvov{position:relative;background-color:hsla(0,0%,76.1%,.8);height:8px;width:100%}.DefaultNavigation-module_progressIndicator__2d_e3{position:absolute;top:0;left:0;width:0;height:100%;background-color:var(--theme-accent-color)}@media screen and (max-width:767px){.DefaultNavigation-module_logo__3gUbx{max-width:30%}.DefaultNavigation-module_hasChapters__3ab-r .DefaultNavigation-module_logo__3gUbx{left:65px}.DefaultNavigation-module_navigationChapters__3M6zh{display:block;position:fixed;top:calc(var(--default-navigation-bar-height) + var(--default-navigation-progress-indicator-height));left:0;background:var(--theme-widget-background-color);width:100vw;bottom:0;-ms-scroll-chaining:none;overscroll-behavior:contain;overflow:scroll}.DefaultNavigation-module_navigationChaptersHidden__2TrUo{display:none}.DefaultNavigation-module_chapterList__3VoXX{display:block;padding-top:var(--default-navigation-bar-height);box-sizing:border-box;min-height:101%}.DefaultNavigation-module_chapterListItem__1YF5e{width:80vw;padding:25px 10vw;border-right:none}.DefaultNavigation-module_chapterListItem__1YF5e:after,.DefaultNavigation-module_chapterListItem__1YF5e:before{display:table;content:" ";border-top:1px solid #646464;width:14%;margin:0 43%;transition:width .15s,margin .15s}.DefaultNavigation-module_chapterListItem__1YF5e:hover:after,.DefaultNavigation-module_chapterListItem__1YF5e:hover:before{border-top:1px solid var(--theme-widget-primary-color);width:80%;margin:0 10%}.DefaultNavigation-module_chapterListItem__1YF5e p{margin-top:0}.DefaultNavigation-module_progressBar__1jvov{height:var(--default-navigation-progress-indicator-height)}}@media print{.DefaultNavigation-module_navigationBar__2RK0h{position:relative;top:0;height:auto}.DefaultNavigation-module_logo__3gUbx{left:0}.DefaultNavigation-module_chapterList__3VoXX,.DefaultNavigation-module_contextIcons__2e65s,.DefaultNavigation-module_progressBar__1jvov{display:none}}@media (min-width:768px){.HamburgerIcon-module_burgerMenuIconContainer__3aBkk{display:none}}.HamburgerIcon-module_burgerMenuIcon__1WUV0{outline:none}
+.DefaultNavigation-module_navigationBar__2RK0h{--default-navigation-bar-height:var(--theme-default-navigation-bar-height,50px);--default-navigation-scroller-top:var(--theme-default-navigation-scroller-top,0);--default-navigation-scroll-button-top:var(--theme-default-navigation-scroll-button-top,5px);--default-navigation-chapter-link-height:var(--theme-default-navigation-chapter-link-height,50px);--default-navigation-progress-bar-height:var(--theme-default-navigation-progress-bar-height,8px);--default-navigation-separator-color:var(--theme-default-navigation-separator-color,#e9e9e9);font-family:var(--theme-widget-font-family);position:fixed;top:calc(-1*var(--default-navigation-bar-height));transition:top .15s;z-index:10000;width:100%;text-align:center;height:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.DefaultNavigation-module_navigationBarExpanded__C3sLq{top:0}.DefaultNavigation-module_navigationBarContentWrapper__3narH{position:relative;z-index:2;background-color:var(--theme-widget-surface-color);color:var(--theme-widget-on-surface-color);height:var(--default-navigation-bar-height);box-sizing:border-box;padding-top:var(--default-navigation-scroller-top)}.DefaultNavigation-module_menuIcon__2bb8s{position:absolute;top:0;left:12px;height:var(--default-navigation-bar-height)}.DefaultNavigation-module_contextIcons__2e65s{position:absolute;top:0;right:12px;display:flex}.DefaultNavigation-module_contextIcons__2e65s>*{pointer-events:auto}.DefaultNavigation-module_contextIcon__ELsqa{cursor:pointer;width:40px;height:var(--default-navigation-bar-height);color:var(--theme-widget-secondary-color);fill:currentcolor;stroke:currentColor}.DefaultNavigation-module_contextIcon__ELsqa svg{width:35px;height:35px;margin:7px 2px}.DefaultNavigation-module_contextIcon__ELsqa:hover,div:focus-within>.DefaultNavigation-module_contextIcon__ELsqa{color:var(--theme-widget-primary-color)}.DefaultNavigation-module_logo__3gUbx{top:0;left:15px;height:100%;max-width:15%}.DefaultNavigation-module_logo__3gUbx img{height:100%;max-width:100%;-o-object-fit:contain;object-fit:contain}.DefaultNavigation-module_chapterList__3VoXX{padding:0;margin:0;list-style:none;display:flex}.DefaultNavigation-module_chapterListItem__1YF5e{position:relative;padding:0 5px;border-right:1px solid var(--default-navigation-separator-color)}.DefaultNavigation-module_chapterListItem__1YF5e:last-of-type{border-right:none}.DefaultNavigation-module_navigationTooltip__26Fvn{opacity:1!important;box-shadow:0 0 .3125rem rgba(0,0,0,.2)}.DefaultNavigation-module_progressBar__1jvov{position:relative;background-color:var(--theme-default-navigation-progress-bar-background-color,hsla(0,0%,76.1%,.8));height:var(--default-navigation-progress-bar-height);width:100%}.DefaultNavigation-module_progressIndicator__2d_e3{position:absolute;top:0;left:0;width:0;height:100%;background-color:var(--theme-default-navigation-progress-bar-indicator-color,var(--theme-accent-color))}@media screen and (max-width:767px){.DefaultNavigation-module_navigationBar__2RK0h{--default-navigation-progress-bar-height:var(--theme-default-navigation-progress-bar-height,10px)}.DefaultNavigation-module_logo__3gUbx{max-width:30%}.DefaultNavigation-module_hasChapters__3ab-r .DefaultNavigation-module_logo__3gUbx{left:65px}.DefaultNavigation-module_navigationChapters__3M6zh{display:block;position:fixed;top:calc(var(--default-navigation-bar-height) + var(--default-navigation-progress-bar-height));left:0;background:var(--theme-widget-background-color);width:100vw;bottom:0;-ms-scroll-chaining:none;overscroll-behavior:contain;overflow:scroll}.DefaultNavigation-module_navigationChaptersHidden__2TrUo{display:none}.DefaultNavigation-module_chapterList__3VoXX{display:block;padding-top:var(--default-navigation-bar-height);box-sizing:border-box;min-height:101%}.DefaultNavigation-module_chapterListItem__1YF5e{padding:1rem;margin:0 1.5rem;border-right:none;border-bottom:1px solid var(--default-navigation-separator-color)}.DefaultNavigation-module_chapterListItem__1YF5e:last-child{border-bottom:none}.DefaultNavigation-module_chapterListItem__1YF5e p{margin-top:0}}@media print{.DefaultNavigation-module_navigationBar__2RK0h{position:relative;top:0;height:auto}.DefaultNavigation-module_logo__3gUbx{left:0}.DefaultNavigation-module_chapterList__3VoXX,.DefaultNavigation-module_contextIcons__2e65s,.DefaultNavigation-module_progressBar__1jvov{display:none}}@media (min-width:768px){.HamburgerIcon-module_burgerMenuIconContainer__3aBkk{display:none}}.HamburgerIcon-module_burgerMenuIcon__1WUV0{outline:none}.HamburgerIcon-module_small__asAkY{--hamburger-icon-transform:scale(0.7);--hamburger-icon-line-width:3px}
 
 /*!
  * Hamburgers
@@ -6,4 +6,4 @@
  * @author Jonathan Suh @jonsuh
  * @site https://jonsuh.com/hamburgers
  * @link https://github.com/jonsuh/hamburgers
- */.HamburgerIcons-module_hamburger__SOreS{display:inline-block;cursor:pointer;transition-property:opacity,filter;transition-duration:.15s;transition-timing-function:linear;font:inherit;color:inherit;text-transform:none;background-color:transparent;border:0;margin:0;overflow:visible}.HamburgerIcons-module_hamburger__SOreS.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn,.HamburgerIcons-module_hamburger__SOreS.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn:after,.HamburgerIcons-module_hamburger__SOreS.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn:before{background-color:var(--theme-accent-color)}.HamburgerIcons-module_hamburger-box__10MR1{width:40px;height:24px;display:inline-block;position:relative;vertical-align:top}.HamburgerIcons-module_hamburger-inner__Wv7Dn{display:block;top:50%;margin-top:-2px}.HamburgerIcons-module_hamburger-inner__Wv7Dn,.HamburgerIcons-module_hamburger-inner__Wv7Dn:after,.HamburgerIcons-module_hamburger-inner__Wv7Dn:before{width:30px;height:4px;background-color:var(--theme-widget-primary-color);border-radius:4px;position:absolute;transition-property:transform;transition-duration:.15s;transition-timing-function:ease}.HamburgerIcons-module_hamburger-inner__Wv7Dn:after,.HamburgerIcons-module_hamburger-inner__Wv7Dn:before{content:"";display:block}.HamburgerIcons-module_hamburger-inner__Wv7Dn:before{top:-10px}.HamburgerIcons-module_hamburger-inner__Wv7Dn:after{bottom:-10px}.HamburgerIcons-module_hamburger--collapse__1xOkf .HamburgerIcons-module_hamburger-inner__Wv7Dn{top:auto;bottom:0;transition-duration:.13s;transition-delay:.13s;transition-timing-function:cubic-bezier(.55,.055,.675,.19)}.HamburgerIcons-module_hamburger--collapse__1xOkf .HamburgerIcons-module_hamburger-inner__Wv7Dn:after{top:-20px;transition:top .2s cubic-bezier(.33333,.66667,.66667,1) .2s,opacity .1s linear}.HamburgerIcons-module_hamburger--collapse__1xOkf .HamburgerIcons-module_hamburger-inner__Wv7Dn:before{transition:top .12s cubic-bezier(.33333,.66667,.66667,1) .2s,transform .13s cubic-bezier(.55,.055,.675,.19)}.HamburgerIcons-module_hamburger--collapse__1xOkf.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn{transform:translate3d(0,-10px,0) rotate(-45deg);transition-delay:.22s;transition-timing-function:cubic-bezier(.215,.61,.355,1)}.HamburgerIcons-module_hamburger--collapse__1xOkf.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn:after{top:0;opacity:0;transition:top .2s cubic-bezier(.33333,0,.66667,.33333),opacity .1s linear .22s}.HamburgerIcons-module_hamburger--collapse__1xOkf.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn:before{top:0;transform:rotate(-90deg);transition:top .1s cubic-bezier(.33333,0,.66667,.33333) .16s,transform .13s cubic-bezier(.215,.61,.355,1) .25s}.ChapterLink-module_chapterLink__3YspQ{line-height:42px;color:var(--theme-widget-primary-color);text-decoration:none;position:relative;display:block;font-family:inherit;font-weight:700;font-size:1rem;height:42px;white-space:nowrap;padding:0 10px;margin:4px 0}.ChapterLink-module_chapterLink__3YspQ:hover,.ChapterLink-module_chapterLinkActive__9i8SL{color:var(--theme-accent-color)}.ChapterLink-module_summary__2ZfRU{color:var(--theme-widget-on-background-color)}.ChapterLink-module_tooltipBubble__3VRUO{display:none}@media (min-width:768px){.ChapterLink-module_summary__2ZfRU{display:none}.ChapterLink-module_tooltipBubble__3VRUO{display:block}}.LegalInfoMenu-module_legalInfoTooltip__Qmf8u{text-align:left}.LegalInfoMenu-module_scroller__3NPW_{overflow:auto;max-height:40vh;scrollbar-width:thin;margin-right:-5px;padding-right:5px}.LegalInfoMenu-module_scroller__3NPW_::-webkit-scrollbar{width:3px}.LegalInfoMenu-module_scroller__3NPW_::-webkit-scrollbar-thumb{background-color:var(--theme-widget-secondary-color);border-radius:2px}.LegalInfoMenu-module_scroller__3NPW_::-webkit-scrollbar-track{background-color:var(--theme-widget-surface-color)}.LegalInfoMenu-module_links__1kpsd{position:relative;padding-top:5px;padding-bottom:5px}.LegalInfoMenu-module_links__1kpsd:before{content:"";position:absolute;top:0;left:-5px;right:-5px;border-top:1px solid var(--theme-widget-primary-color);opacity:.1}.LegalInfoMenu-module_legalInfoTooltip__Qmf8u:after{left:90%!important}.LegalInfoMenu-module_legalInfoTooltip__Qmf8u p{margin:0 0 .5em}.LegalInfoMenu-module_legalInfoTooltip__Qmf8u a{color:var(--theme-accent-color)}.LegalInfoMenu-module_legalInfoLink__gkXaF{display:block;margin-top:5px}.SharingMenu-module_shareIcon__2iW2l svg{width:40px;height:40px;margin:5px 0}header .share svg{fill:var(--theme-widget-primary-color)}header .share:hover svg{fill:var(--theme-accent-color)}.SharingMenu-module_sharingTooltip__2Tyev{width:160px;padding:0!important}.SharingMenu-module_sharingTooltip__2Tyev:after{left:90%!important}.SharingMenu-module_shareLinkContainer__3-3W6{display:inline-block;width:80px;height:60px;cursor:pointer;color:transparent;text-align:center}.SharingMenu-module_shareLink__3PdRE{position:relative;color:var(--theme-widget-primary-color);text-decoration:none}.SharingMenu-module_shareLink__3PdRE:hover{color:var(--theme-accent-color)}.SharingMenu-module_shareIcon__2iW2l{width:80px;height:25px;margin-top:5px;margin-bottom:3px}.ToggleMuteButton-module_button__1ACmo{color:var(--theme-widget-primary-color)}.ToggleMuteButton-module_animate__pd1yK{position:relative}.ToggleMuteButton-module_animate__pd1yK:before{content:"";display:block;position:absolute;top:50%;left:50%;margin:-5px;z-index:-1;width:10px;height:10px;background-color:#ddd;border-radius:5px;-webkit-animation:ToggleMuteButton-module_pulse__2UN7Q .5s ease .2s 1;animation:ToggleMuteButton-module_pulse__2UN7Q .5s ease .2s 1;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;pointer-events:none}@-webkit-keyframes ToggleMuteButton-module_pulse__2UN7Q{0%{opacity:.8}to{transform:scale(40);opacity:0}}@keyframes ToggleMuteButton-module_pulse__2UN7Q{0%{opacity:.8}to{transform:scale(40);opacity:0}}.SkipLinks-module_link__HMj9l{position:absolute;z-index:10000;top:-1000em;left:-1000em;display:block;border:1px solid #eee;border-radius:5px;padding:5px;background:#00375a;text-align:center;line-height:25px;color:#fff}.SkipLinks-module_link__HMj9l:focus{left:13.8%;top:13%}.utils-module_clip__34eot{clip:rect(0,auto,auto,0);-webkit-clip-path:polygon(0 0,100% 0,100% 100%,0 100%);clip-path:polygon(0 0,100% 0,100% 100%,0 100%)}.utils-module_unstyledButton__3rgne{border:0;padding:0;background-color:transparent;text-align:initial}.ScrollButton-module_button__1GKRF{position:absolute;top:var(--default-navigation-scroll-button-top);height:40px;width:20px;opacity:0;visibility:hidden;transition:opacity .2s ease,visibility .2s ease;z-index:1}.ScrollButton-module_button__1GKRF svg{width:18px;height:18px;color:var(--theme-widget-primary-color)}.ScrollButton-module_visible__29yco{opacity:1;visibility:visible}.ScrollButton-module_start__1XPra{right:80%}.ScrollButton-module_end__3PxQt{left:79%}@media screen and (min-width:768px){.Scroller-module_scroller__139cK{overflow:hidden;scroll-behavior:smooth;padding-bottom:90vh;pointer-events:none;margin:0 auto;width:58%}.Scroller-module_scroller__139cK>*{pointer-events:auto}@supports ((-webkit-clip-path:polygon(0 0)) or (clip-path:polygon(0 0))){.Scroller-module_scroller__139cK{width:auto;-webkit-clip-path:polygon(20% 0,79% 0,79% var(--default-navigation-chapter-link-height),100% var(--default-navigation-chapter-link-height),100% 400%,0 400%,0 var(--default-navigation-chapter-link-height),20% var(--default-navigation-chapter-link-height));clip-path:polygon(20% 0,79% 0,79% var(--default-navigation-chapter-link-height),100% var(--default-navigation-chapter-link-height),100% 400%,0 400%,0 var(--default-navigation-chapter-link-height),20% var(--default-navigation-chapter-link-height));-webkit-mask:linear-gradient(90deg,transparent 0,transparent 20%,#000 22%,#000 77%,transparent 79%,transparent) top,linear-gradient(90deg,#000 0,#000) bottom;mask:linear-gradient(90deg,transparent 0,transparent 20%,#000 22%,#000 77%,transparent 79%,transparent) top,linear-gradient(90deg,#000 0,#000) bottom;-webkit-mask-size:100% var(--default-navigation-chapter-link-height),100% calc(100% - var(--default-navigation-chapter-link-height));mask-size:100% var(--default-navigation-chapter-link-height),100% calc(100% - var(--default-navigation-chapter-link-height));-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat}.Scroller-module_inner__3dhuM{display:inline-block;margin:0 22%}}}
+ */.HamburgerIcons-module_hamburger__SOreS{display:inline-block;cursor:pointer;transition-property:opacity,filter;transition-duration:.15s;transition-timing-function:linear;font:inherit;color:inherit;text-transform:none;background-color:transparent;border:0;margin:0;overflow:visible}.HamburgerIcons-module_hamburger__SOreS.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn,.HamburgerIcons-module_hamburger__SOreS.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn:after,.HamburgerIcons-module_hamburger__SOreS.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn:before{background-color:var(--theme-accent-color)}.HamburgerIcons-module_hamburger-box__10MR1{width:40px;height:24px;display:inline-block;position:relative;vertical-align:top;transform:var(--hamburger-icon-transform)}.HamburgerIcons-module_hamburger-inner__Wv7Dn{display:block;top:50%;margin-top:-2px}.HamburgerIcons-module_hamburger-inner__Wv7Dn,.HamburgerIcons-module_hamburger-inner__Wv7Dn:after,.HamburgerIcons-module_hamburger-inner__Wv7Dn:before{width:30px;height:var(--hamburger-icon-line-width,4px);background-color:var(--theme-widget-primary-color);border-radius:4px;position:absolute;transition-property:transform;transition-duration:.15s;transition-timing-function:ease}.HamburgerIcons-module_hamburger-inner__Wv7Dn:after,.HamburgerIcons-module_hamburger-inner__Wv7Dn:before{content:"";display:block}.HamburgerIcons-module_hamburger-inner__Wv7Dn:before{top:-10px}.HamburgerIcons-module_hamburger-inner__Wv7Dn:after{bottom:-10px}.HamburgerIcons-module_hamburger--collapse__1xOkf .HamburgerIcons-module_hamburger-inner__Wv7Dn{top:auto;bottom:0;transition-duration:.13s;transition-delay:.13s;transition-timing-function:cubic-bezier(.55,.055,.675,.19)}.HamburgerIcons-module_hamburger--collapse__1xOkf .HamburgerIcons-module_hamburger-inner__Wv7Dn:after{top:-20px;transition:top .2s cubic-bezier(.33333,.66667,.66667,1) .2s,opacity .1s linear}.HamburgerIcons-module_hamburger--collapse__1xOkf .HamburgerIcons-module_hamburger-inner__Wv7Dn:before{transition:top .12s cubic-bezier(.33333,.66667,.66667,1) .2s,transform .13s cubic-bezier(.55,.055,.675,.19)}.HamburgerIcons-module_hamburger--collapse__1xOkf.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn{transform:translate3d(0,-10px,0) rotate(-45deg);transition-delay:.22s;transition-timing-function:cubic-bezier(.215,.61,.355,1)}.HamburgerIcons-module_hamburger--collapse__1xOkf.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn:after{top:0;opacity:0;transition:top .2s cubic-bezier(.33333,0,.66667,.33333),opacity .1s linear .22s}.HamburgerIcons-module_hamburger--collapse__1xOkf.HamburgerIcons-module_is-active__2jpzX .HamburgerIcons-module_hamburger-inner__Wv7Dn:before{top:0;transform:rotate(-90deg);transition:top .1s cubic-bezier(.33333,0,.66667,.33333) .16s,transform .13s cubic-bezier(.215,.61,.355,1) .25s}.ChapterLink-module_chapterLink__3YspQ{line-height:42px;color:var(--theme-widget-primary-color);text-decoration:none;position:relative;display:block;font-family:inherit;font-weight:700;font-size:1rem;height:42px;white-space:nowrap;padding:0 10px;margin:4px 0}.ChapterLink-module_chapterLink__3YspQ:hover,.ChapterLink-module_chapterLinkActive__9i8SL{color:var(--theme-accent-color)}.ChapterLink-module_summary__2ZfRU{color:var(--theme-widget-on-background-color)}.ChapterLink-module_tooltipBubble__3VRUO{display:none}@media (min-width:768px){.ChapterLink-module_summary__2ZfRU{display:none}.ChapterLink-module_tooltipBubble__3VRUO{display:block}}.LegalInfoMenu-module_legalInfoTooltip__Qmf8u{text-align:left}.LegalInfoMenu-module_scroller__3NPW_{overflow:auto;max-height:40vh;scrollbar-width:thin;margin-right:-5px;padding-right:5px}.LegalInfoMenu-module_scroller__3NPW_::-webkit-scrollbar{width:3px}.LegalInfoMenu-module_scroller__3NPW_::-webkit-scrollbar-thumb{background-color:var(--theme-widget-secondary-color);border-radius:2px}.LegalInfoMenu-module_scroller__3NPW_::-webkit-scrollbar-track{background-color:var(--theme-widget-surface-color)}.LegalInfoMenu-module_links__1kpsd{position:relative;padding-top:5px;padding-bottom:5px}.LegalInfoMenu-module_links__1kpsd:before{content:"";position:absolute;top:0;left:-5px;right:-5px;border-top:1px solid var(--theme-widget-primary-color);opacity:.1}.LegalInfoMenu-module_legalInfoTooltip__Qmf8u:after{left:90%!important}.LegalInfoMenu-module_legalInfoTooltip__Qmf8u p{margin:0 0 .5em}.LegalInfoMenu-module_legalInfoTooltip__Qmf8u a{color:var(--theme-accent-color)}.LegalInfoMenu-module_legalInfoLink__gkXaF{display:block;margin-top:5px}header .share svg{fill:var(--theme-widget-primary-color)}header .share:hover svg{fill:var(--theme-accent-color)}.SharingMenu-module_sharingTooltip__2Tyev{width:160px;padding:0!important}.SharingMenu-module_sharingTooltip__2Tyev:after{left:90%!important}.SharingMenu-module_shareLinkContainer__3-3W6{display:inline-block;width:80px;height:60px;cursor:pointer;color:transparent;text-align:center}.SharingMenu-module_shareLink__3PdRE{position:relative;color:var(--theme-widget-primary-color);text-decoration:none}.SharingMenu-module_shareLink__3PdRE:hover{color:var(--theme-accent-color)}.SharingMenu-module_shareLink__3PdRE svg{width:80px;height:25px;margin-top:5px;margin-bottom:3px}.ToggleMuteButton-module_button__1ACmo{color:var(--theme-widget-primary-color)}.ToggleMuteButton-module_animate__pd1yK{position:relative}.ToggleMuteButton-module_animate__pd1yK:before{content:"";display:block;position:absolute;top:50%;left:50%;margin:-5px;z-index:-1;width:10px;height:10px;background-color:#ddd;border-radius:5px;-webkit-animation:ToggleMuteButton-module_pulse__2UN7Q .5s ease .2s 1;animation:ToggleMuteButton-module_pulse__2UN7Q .5s ease .2s 1;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;pointer-events:none}@-webkit-keyframes ToggleMuteButton-module_pulse__2UN7Q{0%{opacity:.8}to{transform:scale(40);opacity:0}}@keyframes ToggleMuteButton-module_pulse__2UN7Q{0%{opacity:.8}to{transform:scale(40);opacity:0}}.SkipLinks-module_link__HMj9l{position:absolute;z-index:10000;top:-1000em;left:-1000em;display:block;border:1px solid #eee;border-radius:5px;padding:5px;background:#00375a;text-align:center;line-height:25px;color:#fff}.SkipLinks-module_link__HMj9l:focus{left:13.8%;top:13%}.utils-module_clip__34eot{clip:rect(0,auto,auto,0);-webkit-clip-path:polygon(0 0,100% 0,100% 100%,0 100%);clip-path:polygon(0 0,100% 0,100% 100%,0 100%)}.utils-module_unstyledButton__3rgne{border:0;padding:0;background-color:transparent;text-align:initial}.ScrollButton-module_button__1GKRF{position:absolute;top:var(--default-navigation-scroll-button-top);height:40px;width:20px;opacity:0;visibility:hidden;transition:opacity .2s ease,visibility .2s ease;z-index:1}.ScrollButton-module_button__1GKRF svg{width:18px;height:18px;color:var(--theme-widget-primary-color)}.ScrollButton-module_visible__29yco{opacity:1;visibility:visible}.ScrollButton-module_start__1XPra{right:80%}.ScrollButton-module_end__3PxQt{left:79%}@media screen and (min-width:768px){.Scroller-module_scroller__139cK{overflow:hidden;scroll-behavior:smooth;padding-bottom:90vh;pointer-events:none;margin:0 auto;width:58%}.Scroller-module_scroller__139cK>*{pointer-events:auto}@supports ((-webkit-clip-path:polygon(0 0)) or (clip-path:polygon(0 0))){.Scroller-module_scroller__139cK{width:auto;-webkit-clip-path:polygon(20% 0,79% 0,79% var(--default-navigation-chapter-link-height),100% var(--default-navigation-chapter-link-height),100% 400%,0 400%,0 var(--default-navigation-chapter-link-height),20% var(--default-navigation-chapter-link-height));clip-path:polygon(20% 0,79% 0,79% var(--default-navigation-chapter-link-height),100% var(--default-navigation-chapter-link-height),100% 400%,0 400%,0 var(--default-navigation-chapter-link-height),20% var(--default-navigation-chapter-link-height));-webkit-mask:linear-gradient(90deg,transparent 0,transparent 20%,#000 22%,#000 77%,transparent 79%,transparent) top,linear-gradient(90deg,#000 0,#000) bottom;mask:linear-gradient(90deg,transparent 0,transparent 20%,#000 22%,#000 77%,transparent 79%,transparent) top,linear-gradient(90deg,#000 0,#000) bottom;-webkit-mask-size:100% var(--default-navigation-chapter-link-height),100% calc(100% - var(--default-navigation-chapter-link-height));mask-size:100% var(--default-navigation-chapter-link-height),100% calc(100% - var(--default-navigation-chapter-link-height));-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat}.Scroller-module_inner__3dhuM{display:inline-block;margin:0 22%}}}

data/entry_types/scrolled/package/widgets/defaultNavigation.js

@@ -1,4 +1,4 @@
-import { useI18n, utils, Tooltip, useFileRights, useLegalInfo, useCredits, Widget, ThemeIcon, usePhonePlatform, useShareProviders, useShareUrl, useMediaMuted, useTheme, useOnUnmuteMedia, useChapters, useCurrentChapter, useScrollPosition, frontend } from 'pageflow-scrolled/frontend';
+import { useTheme, useI18n, utils, Tooltip, useFileRights, useLegalInfo, useCredits, Widget, ThemeIcon, useShareUrl, useMediaMuted, useOnUnmuteMedia, useChapters, useCurrentChapter, usePhonePlatform, useShareProviders, useScrollPosition, frontend } from 'pageflow-scrolled/frontend';
 import React, { useRef, useEffect, useCallback, useState } from 'react';
 import classNames from 'classnames';
 import { media } from 'pageflow/frontend';
@@ -79,18 +79,20 @@ function _slicedToArray(arr, i) {
 
 var styles = {"breakpoint-below-md":"(max-width: 767px)","navigationBar":"DefaultNavigation-module_navigationBar__2RK0h scope-defaultNavigation","navigationBarExpanded":"DefaultNavigation-module_navigationBarExpanded__C3sLq","navigationBarContentWrapper":"DefaultNavigation-module_navigationBarContentWrapper__3narH","menuIcon":"DefaultNavigation-module_menuIcon__2bb8s","contextIcons":"DefaultNavigation-module_contextIcons__2e65s","contextIcon":"DefaultNavigation-module_contextIcon__ELsqa utils-module_unstyledButton__3rgne","logo":"DefaultNavigation-module_logo__3gUbx","chapterList":"DefaultNavigation-module_chapterList__3VoXX scope-defaultNavigationChapterList","chapterListItem":"DefaultNavigation-module_chapterListItem__1YF5e","navigationTooltip":"DefaultNavigation-module_navigationTooltip__26Fvn","progressBar":"DefaultNavigation-module_progressBar__1jvov","progressIndicator":"DefaultNavigation-module_progressIndicator__2d_e3","hasChapters":"DefaultNavigation-module_hasChapters__3ab-r","navigationChapters":"DefaultNavigation-module_navigationChapters__3M6zh","navigationChaptersHidden":"DefaultNavigation-module_navigationChaptersHidden__2TrUo"};
 
-var styles$1 = {"breakpoint-md":"(min-width: 768px)","burgerMenuIconContainer":"HamburgerIcon-module_burgerMenuIconContainer__3aBkk","burgerMenuIcon":"HamburgerIcon-module_burgerMenuIcon__1WUV0"};
+var styles$1 = {"breakpoint-md":"(min-width: 768px)","burgerMenuIconContainer":"HamburgerIcon-module_burgerMenuIconContainer__3aBkk","burgerMenuIcon":"HamburgerIcon-module_burgerMenuIcon__1WUV0","small":"HamburgerIcon-module_small__asAkY"};
 
 var hamburgerIconStyles = {"hamburger":"HamburgerIcons-module_hamburger__SOreS","is-active":"HamburgerIcons-module_is-active__2jpzX","hamburger-inner":"HamburgerIcons-module_hamburger-inner__Wv7Dn","hamburger-box":"HamburgerIcons-module_hamburger-box__10MR1","hamburger--collapse":"HamburgerIcons-module_hamburger--collapse__1xOkf"};
 
 function HamburgerIcon(props) {
+  var theme = useTheme();
+
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
   return /*#__PURE__*/React.createElement("div", {
     className: styles$1.burgerMenuIconContainer
   }, /*#__PURE__*/React.createElement("button", {
-    className: classNames(styles.menuIcon, styles$1.burgerMenuIcon, hamburgerIconStyles.hamburger, hamburgerIconStyles['hamburger--collapse'], _defineProperty({}, hamburgerIconStyles['is-active'], !props.mobileNavHidden)),
+    className: classNames(styles.menuIcon, styles$1.burgerMenuIcon, hamburgerIconStyles.hamburger, hamburgerIconStyles['hamburger--collapse'], _defineProperty({}, styles$1.small, theme.options.defaultNavigationMenuIconVariant === 'small'), _defineProperty({}, hamburgerIconStyles['is-active'], !props.mobileNavHidden)),
     title: props.mobileNavHidden ? t('pageflow_scrolled.public.navigation.open_mobile_menu') : t('pageflow_scrolled.public.navigation.close_mobile_menu'),
     type: "button",
     onClick: props.onClick
@@ -177,8 +179,8 @@ function LegalInfoMenu(props) {
     role: "creditsBoxFooter"
   }));
   return /*#__PURE__*/React.createElement(Tooltip, {
-    horizontalOffset: -30,
-    arrowPos: 120,
+    horizontalOffset: props.tooltipOffset - 30,
+    arrowPos: 120 - props.tooltipOffset,
     content: content
   }, /*#__PURE__*/React.createElement("button", {
     className: classNames(styles.contextIcon),
@@ -189,13 +191,10 @@ function LegalInfoMenu(props) {
   })));
 }
 
-var styles$4 = {"shareIcon":"SharingMenu-module_shareIcon__2iW2l","sharingTooltip":"SharingMenu-module_sharingTooltip__2Tyev","shareLinkContainer":"SharingMenu-module_shareLinkContainer__3-3W6","shareLink":"SharingMenu-module_shareLink__3PdRE"};
+var styles$4 = {"sharingTooltip":"SharingMenu-module_sharingTooltip__2Tyev","shareLinkContainer":"SharingMenu-module_shareLinkContainer__3-3W6","shareLink":"SharingMenu-module_shareLink__3PdRE"};
 
-function SharingMenu() {
-  var isPhonePlatform = usePhonePlatform();
-  var shareProviders = useShareProviders({
-    isPhonePlatform: isPhonePlatform
-  });
+function SharingMenu(_ref) {
+  var shareProviders = _ref.shareProviders;
   var shareUrl = useShareUrl();
 
   var _useI18n = useI18n(),
@@ -203,7 +202,6 @@ function SharingMenu() {
 
   function renderShareLinks(shareProviders) {
     return shareProviders.map(function (shareProvider) {
-      var Icon = shareProvider.icon;
       return /*#__PURE__*/React.createElement("div", {
         key: shareProvider.name,
         className: styles$4.shareLinkContainer
@@ -212,26 +210,21 @@ function SharingMenu() {
         href: shareProvider.url.replace('%{url}', shareUrl),
         target: '_blank',
         rel: "noopener noreferrer"
-      }, /*#__PURE__*/React.createElement(Icon, {
-        className: styles$4.shareIcon
+      }, /*#__PURE__*/React.createElement(ThemeIcon, {
+        name: shareProvider.iconName
       }), shareProvider.name));
     });
   }
-
-  if (shareProviders.length > 0) {
-    return /*#__PURE__*/React.createElement(Tooltip, {
-      horizontalOffset: -70,
-      arrowPos: 160,
-      content: renderShareLinks(shareProviders)
-    }, /*#__PURE__*/React.createElement("button", {
-      className: classNames(styles.contextIcon),
-      title: t('pageflow_scrolled.public.navigation.share')
-    }, /*#__PURE__*/React.createElement(ThemeIcon, {
-      name: "share"
-    })));
-  } else {
-    return null;
-  }
+  return /*#__PURE__*/React.createElement(Tooltip, {
+    horizontalOffset: -70,
+    arrowPos: 160,
+    content: renderShareLinks(shareProviders)
+  }, /*#__PURE__*/React.createElement("button", {
+    className: classNames(styles.contextIcon),
+    title: t('pageflow_scrolled.public.navigation.share')
+  }, /*#__PURE__*/React.createElement(ThemeIcon, {
+    name: "share"
+  })));
 }
 
 var styles$5 = {"button":"ToggleMuteButton-module_button__1ACmo","animate":"ToggleMuteButton-module_animate__pd1yK","pulse":"ToggleMuteButton-module_pulse__2UN7Q"};
@@ -502,9 +495,11 @@ function Scroller(_ref) {
   }
 }
 
-function DefaultNavigation(props) {
+function DefaultNavigation(_ref) {
   var _chapters$, _chapters$2, _classNames2;
 
+  var configuration = _ref.configuration;
+
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
       navExpanded = _useState2[0],
@@ -522,9 +517,13 @@ function DefaultNavigation(props) {
 
   var chapters = useChapters();
   var currentChapter = useCurrentChapter();
-  useScrollPosition(function (_ref) {
-    var prevPos = _ref.prevPos,
-        currPos = _ref.currPos;
+  var isPhonePlatform = usePhonePlatform();
+  var shareProviders = useShareProviders({
+    isPhonePlatform: isPhonePlatform
+  });
+  useScrollPosition(function (_ref2) {
+    var prevPos = _ref2.prevPos,
+        currPos = _ref2.currPos;
     var expand = currPos.y > prevPos.y || // Mobile Safari reports positive scroll position
     // during scroll bounce animation when scrolling
     // back to the top. Make sure navigation bar
@@ -532,9 +531,9 @@ function DefaultNavigation(props) {
     currPos.y >= 0;
     if (expand !== navExpanded) setNavExpanded(expand);
   }, [navExpanded]);
-  useScrollPosition(function (_ref2) {
-    var prevPos = _ref2.prevPos,
-        currPos = _ref2.currPos;
+  useScrollPosition(function (_ref3) {
+    var prevPos = _ref3.prevPos,
+        currPos = _ref3.currPos;
     var current = currPos.y * -1; // Todo: Memoize and update on window resize
 
     var total = document.body.clientHeight - window.innerHeight;
@@ -587,8 +586,9 @@ function DefaultNavigation(props) {
     }, renderChapterLinks(chapters))));
   }
 
-  return /*#__PURE__*/React.createElement("header", {
-    className: classNames(styles.navigationBar, (_classNames2 = {}, _defineProperty(_classNames2, styles.navigationBarExpanded, navExpanded || !mobileNavHidden), _defineProperty(_classNames2, styles.hasChapters, hasChapters), _classNames2))
+  var hideSharingButton = configuration.hideSharingButton || !shareProviders.length;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("header", {
+    className: classNames(styles.navigationBar, (_classNames2 = {}, _defineProperty(_classNames2, styles.navigationBarExpanded, navExpanded || !isPhonePlatform && configuration.fixedOnDesktop || !mobileNavHidden), _defineProperty(_classNames2, styles.hasChapters, hasChapters), _classNames2))
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.navigationBarContentWrapper
   }, hasChapters && /*#__PURE__*/React.createElement(HamburgerIcon, {
@@ -596,7 +596,11 @@ function DefaultNavigation(props) {
     mobileNavHidden: mobileNavHidden
   }), /*#__PURE__*/React.createElement(SkipLinks, null), /*#__PURE__*/React.createElement(Logo, null), renderNav(), /*#__PURE__*/React.createElement("div", {
     className: classNames(styles.contextIcons)
-  }, /*#__PURE__*/React.createElement(ToggleMuteButton, null), /*#__PURE__*/React.createElement(LegalInfoMenu, null), /*#__PURE__*/React.createElement(SharingMenu, null))), /*#__PURE__*/React.createElement("div", {
+  }, !configuration.hideToggleMuteButton && /*#__PURE__*/React.createElement(ToggleMuteButton, null), /*#__PURE__*/React.createElement(LegalInfoMenu, {
+    tooltipOffset: hideSharingButton ? -40 : 0
+  }), !hideSharingButton && /*#__PURE__*/React.createElement(SharingMenu, {
+    shareProviders: shareProviders
+  }))), /*#__PURE__*/React.createElement("div", {
     className: styles.progressBar,
     onMouseEnter: handleProgressBarMouseEnter
   }, /*#__PURE__*/React.createElement("span", {
@@ -604,7 +608,13 @@ function DefaultNavigation(props) {
     style: {
       width: readingProgress + '%'
     }
-  })));
+  }))), /*#__PURE__*/React.createElement(Widget, {
+    role: "defaultNavigationExtra",
+    props: {
+      navigationExpanded: navExpanded,
+      mobileNavigationVisible: !mobileNavHidden
+    }
+  }));
 }
 
 frontend.widgetTypes.register('defaultNavigation', {

data/lib/pageflow/ability_mixin.rb

@@ -95,7 +95,11 @@ module Pageflow
         Admin::EntryTabPolicy.new(user, tab).see?
       end
 
-      can :see_theming_admin_tab, Admin::Tab do |tab|
+      can :see_site_admin_tab, Admin::Tab do |tab|
+        Admin::AdminOnlyTabPolicy.new(user, tab).see?
+      end
+
+      can :see_account_admin_tab, Admin::Tab do |tab|
         Admin::AdminOnlyTabPolicy.new(user, tab).see?
       end
 
@@ -112,8 +116,8 @@ module Pageflow
           AccountPolicy.new(user, account).configure_folder_on?
         end
 
-        can :update_theming_on_entry_of, Account do |account|
-          AccountPolicy.new(user, account).update_theming_on_entry_of?
+        can :update_site_on_entry_of, Account do |account|
+          AccountPolicy.new(user, account).update_site_on_entry_of?
         end
 
         can :create, Entry do |entry|
@@ -180,8 +184,8 @@ module Pageflow
           EntryPolicy.new(user, entry).update_feature_configuration_on?
         end
 
-        can :update_theming_on, Entry do |entry|
-          EntryPolicy.new(user, entry).update_theming_on?
+        can :update_site_on, Entry do |entry|
+          EntryPolicy.new(user, entry).update_site_on?
         end
 
         can :use_files, Entry, EntryPolicy::Scope.new(user, Entry).resolve do |entry|
@@ -222,8 +226,12 @@ module Pageflow
           EntryPolicy.new(user, storyline.revision.entry).edit?
         end
 
-        can :edit, Theming do |theming|
-          ThemingPolicy.new(user, theming).edit?
+        can :read, Site do |site|
+          SitePolicy.new(user, site).read?
+        end
+
+        can :update, Site do |site|
+          SitePolicy.new(user, site).update?
         end
 
         can :create, EntryTemplate do |entry_template|
@@ -275,7 +283,7 @@ module Pageflow
         can :manage, [Entry, Revision]
         can :manage, Pageflow.config.file_types.map(&:model)
         can :manage, Folder
-        can :manage, Theming
+        can :manage, Site
         can :manage, EntryTemplate
         can :manage, ::User
       end

data/lib/pageflow/admin/attributes_table_rows.rb

@@ -12,7 +12,7 @@ module Pageflow
 
       # Insert an additional row into an attribute table.
       #
-      # @param resource_name [Symbol] Either :entry, :account or :theming.
+      # @param resource_name [Symbol] Either :entry, :account or :site.
       #
       # @param name [Symbol] Name of the attribute to display.
       #

data/lib/pageflow/admin/form_inputs.rb

@@ -11,7 +11,7 @@ module Pageflow
       # Register a proc which adds additional inputs to admin forms.
       #
       # @param resource_name [Symbol] A resource name like `:entry`,
-      #   `:account` or `:theming`
+      #   `:account` or `:site`
       # @param attribute_name [Symbol] The name of the additional
       #   attribute
       # @param options [Hash] Formtastic options

data/lib/pageflow/admin/tabs.rb

@@ -9,7 +9,7 @@ module Pageflow
       # Display additional tabs on admin resource pages.
       #
       # @param [Symbol] resource_name A resource name like `:entry`,
-      #   `:user` or `:account`
+      #   `:user`, `:account` or `:site`.
       # @param [Hash] options
       # @option options [Symbol] :name Unique identifier.
       # @option options [Arbre::Component] :component Component to

data/lib/pageflow/configuration/permissions.rb

@@ -6,7 +6,7 @@ module Pageflow
       def initialize
         @only_admins_may_update_features = false
         @only_admins_may_see_admin_boolean = false
-        @only_admins_may_update_theming = false
+        @only_admins_may_update_site = false
       end
 
       # Restrict access to features tabs to admins. Defaults to false.
@@ -18,10 +18,10 @@ module Pageflow
       # @since 12.1
       attr_accessor :only_admins_may_see_admin_boolean
 
-      # Restrict access to theming drop down on entry edit admin page
+      # Restrict access to site drop down on entry edit admin page
       # to admins. Defaults to false.
       # @since 12.1
-      attr_accessor :only_admins_may_update_theming
+      attr_accessor :only_admins_may_update_site
     end
   end
 end

data/lib/pageflow/configuration.rb

@@ -151,21 +151,21 @@ module Pageflow
     attr_accessor :editor_routing_constraint
 
     # Either a lambda or an object with a `call` method taking two
-    # parameters: An `ActiveRecord` scope of {Pageflow::Theming} records
+    # parameters: An `ActiveRecord` scope of {Pageflow::Site} records
     # and an {ActionDispatch::Request} object. Has to return the scope
-    # in which to find themings.
+    # in which to find sites.
     #
-    # Defaults to {CnameThemingRequestScope} which finds themings
+    # Defaults to {CnameSiteRequestScope} which finds sites
     # based on the request subdomain. Can be used to alter the logic
-    # of finding a theming whose home_url to redirect to when visiting
+    # of finding a site whose home_url to redirect to when visiting
     # the public root path.
     #
     # Example:
     #
-    #     config.theming_request_scope = lambda do |themings, request|
-    #       themings.where(id: Pageflow::Account.find_by_name!(request.subdomain).default_theming_id)
+    #     config.site_request_scope = lambda do |sites, request|
+    #       sites.where(id: Pageflow::Account.find_by_name!(request.subdomain).default_site_id)
     #     end
-    attr_accessor :theming_request_scope
+    attr_accessor :site_request_scope
 
     # Either a lambda or an object with a `call` method taking two
     # parameters: An `ActiveRecord` scope of `Pageflow::Entry` records
@@ -196,7 +196,7 @@ module Pageflow
     attr_accessor :public_entry_redirect
 
     # Either a lambda or an object with a `call` method taking a
-    # {Theming} as paramater and returing a hash of options used to
+    # {Site} as paramater and returing a hash of options used to
     # construct the url of a published entry.
     #
     # Can be used to change the host of the url under which entries
@@ -204,13 +204,13 @@ module Pageflow
     #
     # Example:
     #
-    #     config.public_entry_url_options = lambda do |theming|
-    #       {host: "#{theming.account.name}.example.com"}
+    #     config.public_entry_url_options = lambda do |site|
+    #       {host: "#{site.account.name}.example.com"}
     #     end
     attr_accessor :public_entry_url_options
 
     # Either a lambda or an object with a `call` method taking a
-    # {Theming} as paramater and returing a hash of options used to
+    # {Site} as paramater and returing a hash of options used to
     # construct the embed url of a published entry.
     attr_accessor :entry_embed_url_options
 
@@ -281,7 +281,7 @@ module Pageflow
     # @since 0.10
     attr_accessor :available_public_locales
 
-    # Array of sharing providers which can be configured on theming level.
+    # Array of sharing providers which can be configured on site level.
     # Defaults to `[:facebook, :twitter, :linked_in, :whats_app, :telegram, :email]`.
     # @since 14.1
     attr_accessor :available_share_providers
@@ -310,7 +310,7 @@ module Pageflow
 
     # Share provider defaults.
     #
-    # Default share providers for new themings.
+    # Default share providers for new sites.
     # Must be a subset or equal to `available_share_providers`
     # @since 14.1
     attr_accessor :default_share_providers
@@ -402,10 +402,10 @@ module Pageflow
       @thumbnail_styles = Defaults::THUMBNAIL_STYLES.dup
       @css_rendered_thumbnail_styles = Defaults::CSS_RENDERED_THUMBNAIL_STYLES.dup
 
-      @theming_request_scope = CnameThemingRequestScope.new
+      @site_request_scope = CnameSiteRequestScope.new
       @public_entry_request_scope = lambda { |entries, request| entries }
       @public_entry_redirect = ->(_entry, _request) { nil }
-      @public_entry_url_options = Pageflow::ThemingsHelper::DEFAULT_PUBLIC_ENTRY_OPTIONS
+      @public_entry_url_options = Pageflow::SitesHelper::DEFAULT_PUBLIC_ENTRY_OPTIONS
       @entry_embed_url_options = {protocol: 'https'}
 
       @transform_theme_customization_overrides = ->(overrides, _entry) { overrides }
@@ -515,9 +515,9 @@ module Pageflow
     end
 
     # @api private
-    def theming_url_options(theming)
+    def site_url_options(site)
       options = public_entry_url_options
-      options.respond_to?(:call) ? options.call(theming) : options
+      options.respond_to?(:call) ? options.call(site) : options
     end
 
     # @api private

data/lib/pageflow/entry_export_import/entry_serialization.rb

@@ -44,7 +44,7 @@ module Pageflow
       def create_entry(data, options)
         entry_data = data.except(*DEFAULT_REMOVAL_COLUMNS)
         entry_data['account_id'] = options[:account].id
-        entry_data['theming_id'] = options[:account].default_theming.id
+        entry_data['site_id'] = options[:account].default_site.id
         Entry.create!(entry_data.merge(skip_draft_creation: true))
       end
 

data/lib/pageflow/entry_type.rb

@@ -5,7 +5,7 @@ module Pageflow
   class EntryType
     # @api private
     attr_reader :name, :frontend_app, :editor_fragment_renderer, :configuration, :editor_app,
-                :theme_files
+                :theme_files, :web_app_manifest
 
     # @param name [String] A unique name.
     #
@@ -27,14 +27,18 @@ module Pageflow
     #   entry type and which Paperclip styles shall be processed:
     #   `{logo: {content_type: %r{^image/}, styles: {small:
     #   '300x300>'}}`.
+    #
+    # @param web_app_manifest [#call] Receives published entry and
+    #   returns JSON for webmanifest file.
     def initialize(name:, frontend_app:, editor_fragment_renderer:, configuration:, editor_app: nil,
-                   theme_files: {})
+                   theme_files: {}, web_app_manifest: nil)
       @name = name
       @frontend_app = frontend_app
       @editor_fragment_renderer = editor_fragment_renderer
       @configuration = configuration
       @editor_app = editor_app
       @theme_files = theme_files
+      @web_app_manifest = web_app_manifest
     end
   end
 end

data/lib/pageflow/primary_domain_entry_redirect.rb

@@ -5,20 +5,20 @@ module Pageflow
   # @since 12.4
   class PrimaryDomainEntryRedirect
     def call(entry, request)
-      theming = entry.theming
+      site = entry.site
 
-      if theming.cname.present? &&
-         !known_domains(theming).include?(request.host)
-        [request.protocol, theming.cname, request.fullpath].join
+      if site.cname.present? &&
+         !known_domains(site).include?(request.host)
+        [request.protocol, site.cname, request.fullpath].join
       end
     end
 
     private
 
-    def known_domains(theming)
+    def known_domains(site)
       [
-        theming.cname,
-        (theming.additional_cnames || '').split(',').map(&:strip)
+        site.cname,
+        (site.additional_cnames || '').split(',').map(&:strip)
       ].flatten
     end
   end