f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-02 08:32:41 +00:00
Code Wiki Activity

Merge branch 'scrollbar' of https://github.com/5e-Cleric/homebrewery into scrollbar

Browse Source
This commit is contained in:
Víctor Losada Hernández
2024-03-08 10:13:06 +01:00
parent d0000cee11 846b3b9d02
commit b4fec32320
7 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/homebrew/brewRenderer/brewRenderer.jsx
View File

@@ -20,9 +20,9 @@ const PAGE_HEIGHT = 1056;
const INITIAL_CONTENT = dedent` const INITIAL_CONTENT = dedent`
<!DOCTYPE html><html><head> <!DOCTYPE html><html><head>
<link href="//use.fontawesome.com/releases/v6.5.1/css/all.css" rel="stylesheet" /> <link href="//use.fontawesome.com/releases/v6.5.1/css/all.css" rel="stylesheet" type="text/css" />
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" /> <link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
<link href='/homebrew/bundle.css' rel='stylesheet' /> <link href='/homebrew/bundle.css' type="text/css" rel='stylesheet' />
<base target=_blank> <base target=_blank>
</head><body style='overflow: hidden'><div></div></body></html>`; </head><body style='overflow: hidden'><div></div></body></html>`;
@@ -211,11 +211,11 @@ const BrewRenderer = (props)=>{
<RenderWarnings /> <RenderWarnings />
<NotificationPopup /> <NotificationPopup />
</div> </div>
<link href={`/themes/${rendererPath}/Blank/style.css`} rel='stylesheet'/> <link href={`/themes/${rendererPath}/Blank/style.css`} type="text/css" rel='stylesheet'/>
{baseThemePath && {baseThemePath &&
<link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} rel='stylesheet'/> <link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} type="text/css" rel='stylesheet'/>
} }
<link href={`/themes/${rendererPath}/${themePath}/style.css`} rel='stylesheet'/> <link href={`/themes/${rendererPath}/${themePath}/style.css`} type="text/css" rel='stylesheet'/>
{/* Apply CSS from Style tab and render pages from Markdown tab */} {/* Apply CSS from Style tab and render pages from Markdown tab */}
{state.isMounted {state.isMounted

26
client/homebrew/navbar/navbar.less
View File

@@ -240,18 +240,23 @@
.navDropdownContainer { .navDropdownContainer {
position : relative; position : relative;
.navDropdown { .navDropdown {
position : absolute; position: absolute;
top : 28px; top: 28px;
left : 0px; right: 0px;
z-index : 10000; z-index: 10000;
width : 100%; width: max-content;
max-height : calc(100vh - 28px); min-width:100%;
overflow : hidden auto; max-height: calc(100vh - 28px);
overflow: hidden auto;
display: flex;
flex-direction: column;
align-items: flex-end;
.navItem { .navItem {
position : relative; position : relative;
display : block; display : flex;
justify-content : space-between;
align-items : center;
width : 100%; width : 100%;
padding : 8px 5px;
border : 1px solid #888888; border : 1px solid #888888;
border-bottom : 0; border-bottom : 0;
animation-name : glideDropDown; animation-name : glideDropDown;
@@ -266,7 +271,8 @@
position : relative; position : relative;
box-sizing : border-box; box-sizing : border-box;
display : block; display : block;
max-height : ~'calc(100vh - 28px)'; max-width : 15em;
max-height : ~'calc(100vh - 28px)';
padding : 8px 5px 13px; padding : 8px 5px 13px;
overflow : hidden auto; overflow : hidden auto;
color : white; color : white;

4
client/homebrew/pages/basePages/listPage/listPage.jsx
View File

@@ -262,8 +262,8 @@ const ListPage = createClass({
render : function(){ render : function(){
return <div className='listPage sitePage'> return <div className='listPage sitePage'>
{/*<style>@layer V3_5ePHB, bundle;</style>*/} {/*<style>@layer V3_5ePHB, bundle;</style>*/}
<link href='/themes/V3/Blank/style.css' rel='stylesheet'/> <link href='/themes/V3/Blank/style.css' type="text/css" rel='stylesheet'/>
<link href='/themes/V3/5ePHB/style.css' rel='stylesheet'/> <link href='/themes/V3/5ePHB/style.css' type="text/css" rel='stylesheet'/>
{this.props.navItems} {this.props.navItems}
{this.renderSortOptions()} {this.renderSortOptions()}
{this.renderTagsOptions()} {this.renderTagsOptions()}

6
client/homebrew/pages/printPage/printPage.jsx
View File

@@ -96,11 +96,11 @@ const PrintPage = createClass({
return <div> return <div>
<Meta name='robots' content='noindex, nofollow' /> <Meta name='robots' content='noindex, nofollow' />
<link href={`/themes/${rendererPath}/Blank/style.css`} rel='stylesheet'/> <link href={`/themes/${rendererPath}/Blank/style.css`} type="text/css" rel='stylesheet'/>
{baseThemePath && {baseThemePath &&
<link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} rel='stylesheet'/> <link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} type="text/css" rel='stylesheet'/>
} }
<link href={`/themes/${rendererPath}/${themePath}/style.css`} rel='stylesheet'/> <link href={`/themes/${rendererPath}/${themePath}/style.css`} type="text/css" rel='stylesheet'/>
{/* Apply CSS from Style tab */} {/* Apply CSS from Style tab */}
{this.renderStyle()} {this.renderStyle()}
<div className='pages' ref='pages' lang={this.state.brew.lang}> <div className='pages' ref='pages' lang={this.state.brew.lang}>

4
client/template.js
View File

@@ -12,9 +12,9 @@ const template = async function(name, title='', props = {}){
<html> <html>
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1, height=device-height, interactive-widget=resizes-visual" /> <meta name="viewport" content="width=device-width, initial-scale=1, height=device-height, interactive-widget=resizes-visual" />
<link href="//use.fontawesome.com/releases/v6.5.1/css/all.css" rel="stylesheet" /> <link href="//use.fontawesome.com/releases/v6.5.1/css/all.css" rel="stylesheet" type="text/css" />
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" /> <link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
<link href=${`/${name}/bundle.css`} rel='stylesheet' /> <link href=${`/${name}/bundle.css`} type="text/css" rel='stylesheet' />
<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" /> <link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
${ogMetaTags} ${ogMetaTags}
<meta name="twitter:card" content="summary"> <meta name="twitter:card" content="summary">

2
shared/naturalcrit/codeEditor/codeEditor.jsx
View File

@@ -436,7 +436,7 @@ const CodeEditor = createClass({
render : function(){ render : function(){
return <> return <>
<link href={`../homebrew/cm-themes/${this.props.editorTheme}.css`} rel='stylesheet' /> <link href={`../homebrew/cm-themes/${this.props.editorTheme}.css`} type="text/css" rel='stylesheet' />
<div className='codeEditor' ref='editor' style={this.props.style}/> <div className='codeEditor' ref='editor' style={this.props.style}/>
</>; </>;
} }

2
shared/naturalcrit/nav/nav.jsx
View File

@@ -104,7 +104,7 @@ const Nav = {
}); });
return ( return (
<div className={`navDropdownContainer ${props.className}`} <div className={`navDropdownContainer ${props.className ?? ''}`}
ref={myRef} ref={myRef}
onMouseEnter = { props.trigger.includes('hover') ? ()=>handleDropdown(true) : undefined } onMouseEnter = { props.trigger.includes('hover') ? ()=>handleDropdown(true) : undefined }
onMouseLeave = { props.trigger.includes('hover') ? ()=>handleDropdown(false) : undefined } onMouseLeave = { props.trigger.includes('hover') ? ()=>handleDropdown(false) : undefined }