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.

Sign up for GitHub

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

Here are the Changes to the structure #2

Closed
wants to merge 9 commits into from
Closed

Here are the Changes to the structure #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7293a41
Merge remote-tracking branch 'mcneel/gh-pages' into gh-pages
scotttd Sep 16, 2015
c2d7c8c
Merge remote-tracking branch 'mcneel/gh-pages' into gh-pages
scotttd Sep 16, 2015
725c6b6
Wiorking on the underconstruction page.
scotttd Sep 22, 2015
2df174d
These are formatting changes based on the initial dump from Brian
scotttd Sep 23, 2015
42b3cbd
Used Dan's cleaner HTML code to without tags.
scotttd Sep 23, 2015
689fc1b
Changing Main formatting to work with help topics
scotttd Sep 23, 2015
a4885d7
Merge remote-tracking branch 'mcneel/gh-pages' into gh-pages
scotttd Sep 24, 2015
bad6d06
Revert "Delete flamingonxtdumpcommands.html file, added xflamingonxtc…
scotttd Sep 24, 2015
92a3c11
Revert "Revert "Delete flamingonxtdumpcommands.html file, added xflam…
Oct 2, 2015
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
12 changes: 6 additions & 6 deletions _layouts/toc-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<ul id="sidebar" class="nav nav-stacked fixed">

<!-- Find the h1 handle and title -->
{% if content contains '<h1 class="toc-title" id="' %}
{% assign splitAtFirstHeader = content | split:'<h1 class="toc-title" id="' %}
{% if content contains '<h1 id="' %}
{% assign splitAtFirstHeader = content | split:'<h1 id="' %}
{% assign firstSideOfFirstHeader = splitAtFirstHeader[1] %}
{% assign dividedMainTitle = firstSideOfFirstHeader | split:'<' %}
{% assign firstSideOfDividedMainTitle = dividedMainTitle[0] %}
Expand All @@ -22,8 +22,8 @@
<a href="#{{ mainTitleHandle }}">{{ mainTitleTitle }}</a>

<ul class="nav nav-stacked">
<!-- Find the h2 group and any h4 subgroups -->
{% assign groups = content | split:'<h2 class="toc-header" id="' %}
<!-- Find the h2 group and any h3 subgroups -->
{% assign groups = content | split:'<h2 id="' %}

{% for group in groups offset:1 %}
{% assign dividedGroup = group | split:'<' %}
Expand All @@ -34,9 +34,9 @@
<li>
<a href="#{{groupHandle}}">{{ groupTitle }}</a>

{% if group contains '<h3 class="toc-subheader" id="' %}
{% if group contains '<h3 id="' %}
<ul class="nav nav-stacked">
{% assign subgroups = group | split:'<h3 class="toc-subheader" id="' %}
{% assign subgroups = group | split:'<h3 id="' %}

{% for subgroup in subgroups offset:1 %}
{% assign dividedSubgroup = subgroup | split:'<' %}
Expand Down
13 changes: 10 additions & 3 deletions _sass/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,18 +219,25 @@
}

h3 {
font-size: 26px;
font-size: 20px;

@include media-query($on-laptop) {
font-size: 22px;
}
}

h4 {
font-size: 20px;
font-size: 16px;

@include media-query($on-laptop) {
font-size: 14px;
}
}
h5 {
font-size: 18px;

@include media-query($on-laptop) {
font-size: 18px;
font-size: 16px;
}
}
}
58 changes: 46 additions & 12 deletions css/bootstrap-override.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,53 @@ body {
.bs-callout-danger {
border-left-color: #ce4844;
}
/*
##############################################################################
## Main body styles
##############################################################################
*/

h1 {
background: #E6E6E6;
}
h2 {
background: white;
border-bottom:solid;
border-bottom-color:black;
border-bottom-width:1px;
margin-bottom: 3px;
}
h3 {
background: white;
margin-bottom: 0px;
}
h4 {
margin-bottom: 0px;
}
.fixed {
position: fixed;
}

blockquote {
border-color: white;
}

img {
margin-top: 5px;
}

ul {
list-style-type: circle;
}

.floatright img {
float: right;
margin-left: 15px;
}
.floatleft img {
float: left;
margin-right: 15px;
}
/*
##############################################################################
## Index.md Page
Expand Down Expand Up @@ -71,18 +117,6 @@ tbody.index_table tr td{
##############################################################################
*/

.toc-title {
background: white;
}
.toc-header {
background: white;
}
.toc-header .toc-subheader {
background: white;
}
.fixed {
position: fixed;
}


/* sidebar */
Expand Down
16 changes: 8 additions & 8 deletions en/flamingo/5/help/all-flamingo-topics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ layout: toc-page


# All Flamingo Topics
{: .toc-title }


## Environment
{: .toc-header }

[Environment](environment/environment-tab.html)


## Lighting
{: .toc-header }

[Lighting: Advanced](lighting/lighting-advanced-tab.html)

Expand All @@ -30,7 +30,7 @@ layout: toc-page


## Materials
{: .toc-header }

[Advanced Material Properties: Main](materials/advanced-material-properties-main.html)

Expand All @@ -50,21 +50,21 @@ layout: toc-page


## Object Properties
{: .toc-header }

[Decal Properties](objectproperties\properties-decal.html)

[Object properties](objectproperties\properties-object.html)


## Plants
{: .toc-header }

[Plants](plants/plants.html)


## Render
{: .toc-header }

[Automate Rendering](render/automate-rendering.html)

Expand All @@ -78,7 +78,7 @@ layout: toc-page


## Misc
{: .toc-header }

[Enter CD Key](general/enter-cd-key.html)

Expand Down
Loading