Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Tikui template to fix padding and title size issues #62

Merged
merged 1 commit into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tikuidoc-tikui",
"version": "6.0.0",
"version": "7.0.0",
"description": "Tikui documentation",
"main": "tikuidoc.json",
"files": [
Expand Down
5 changes: 3 additions & 2 deletions src/documentation/layout-atomic.pug
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ block title
title Tikui
block body
.tikui-template-page--header
.tikui-template-page--container
.tikui-template-page--header-container
block header
.tikui-template-page--body(data-navigable)
.tikui-template-page--container
block content
.tikui-template-page--container-content
block content
2 changes: 2 additions & 0 deletions src/documentation/quark/title/_title.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ $tikui-title-color-text: $tikui-color-text-dark !default;
color: $tikui-title-color-text;
font-family: $tikui-title-font-family;
font-weight: bold;
hyphens: auto;
overflow-wrap: anywhere;
}

@import 'title-brand';
Expand Down
32 changes: 27 additions & 5 deletions src/documentation/template/template-page/_template-page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ $tikui-template-page-nav-width: 340px !default;
position: fixed;
inset: 0;
flex-direction: column;
min-height: 0;

&--container {
&--header-container {
box-sizing: content-box;
flex-basis: 0;
flex-grow: 1;
margin: 0 auto;
padding: 0 $tikui-template-page-spacing;
width: auto;
Expand All @@ -27,17 +26,34 @@ $tikui-template-page-nav-width: 340px !default;

&--body {
display: flex;
flex-basis: 0;
flex-grow: 1;
background-color: $tikui-color-background;
padding: $tikui-template-page-spacing 0;
padding: 0;
min-height: 0;
overflow: auto;
}

&--container {
flex-basis: 0;
flex-grow: 1;
min-width: 0;
min-height: 0;
}

&--container-content {
box-sizing: content-box;
margin: 0 auto;
padding: $tikui-template-page-spacing;
width: auto;
max-width: $tikui-template-page-container-width;
}

&--nav {
box-sizing: content-box;
position: sticky;
top: 0;
padding: 0 $tikui-template-page-nav-padding;
padding: $tikui-template-page-spacing $tikui-template-page-nav-padding;
width: $tikui-template-page-nav-width;
overflow: auto;
}
Expand All @@ -59,11 +75,16 @@ $tikui-template-page-nav-width: 340px !default;
.tikui-template-page {
overflow: auto;

&--header-container,
&--container {
padding: 0 $tikui-template-page-small-spacing;
width: auto;
}

&--container-content {
padding: 0;
}

&--body {
display: block;
padding: $tikui-template-page-small-spacing 0;
Expand All @@ -72,6 +93,7 @@ $tikui-template-page-nav-width: 340px !default;

&--nav {
position: static;
padding: 0;
width: auto;
}
}
Expand Down