Skip to content

Commit

Permalink
Test: Update test_site expected folder
Browse files Browse the repository at this point in the history
  • Loading branch information
@Chng-Zhi-Xuan
Chng-Zhi-Xuan committed Feb 27, 2019
1 parent db08b98 commit a5d1882
Show file tree
Hide file tree
Showing 14 changed files with 541 additions and 675 deletions.
23 changes: 15 additions & 8 deletions test/functional/test_site/expected/bugs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@
<link rel="icon" href="/test_site/favicon.png">
</head>
<body>
<div id="app">
<div id="content-wrapper">
<div id="app">

<div id="flex-body">

<div id="content-wrapper">
<div>
<navbar placement="top" type="inverse" class="temp-navbar">
<a slot="brand" href="/" title="Home" class="navbar-brand">Markbind Test Site</a>
Expand All @@ -39,7 +42,8 @@ <h2 id="popover-initiated-by-trigger-honor-trigger-attribute">popover initiated
<div slot="content">
<div>
<p>Requirements gathering, requirements elicitation, requirements analysis, requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity of understanding what a software product should
do.</p>
do.
</p>
</div>
</div>
</popover>
Expand All @@ -53,7 +57,8 @@ <h2 id="support-multiple-inclusions-of-a-modal">Support multiple inclusions of a
<modal large="" title="Establishing Requirements" id="modal:bugRepro">
<div>
<p>Requirements gathering, requirements elicitation, requirements analysis, requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity of understanding what a software product should
do.</p>
do.
</p>
</div>
</modal>
</div>
Expand All @@ -64,7 +69,8 @@ <h2 id="support-multiple-inclusions-of-a-modal">Support multiple inclusions of a
<modal large="" title="Establishing Requirements" id="modal:bugRepro">
<div>
<p>Requirements gathering, requirements elicitation, requirements analysis, requirements capture are some of the terms commonly <strong>and</strong> interchangeably used to represent the activity of understanding what a software product should
do.</p>
do.
</p>
</div>
</modal>
</div>
Expand All @@ -75,13 +81,14 @@ <h2 id="remove-extra-space-in-links">Remove extra space in links<a class="fa fa-
<a href="https://github.com">link text</a>]</p>
</div>
</div>
<div id="flex-div"></div>
<footer>

</div>
<footer>
<div class="text-center">
Default footer
</div>
</footer>
</div>
</div>
</body>
<script src="../markbind/js/vue.min.js"></script>
<script src="../markbind/js/vue-strap.min.js"></script>
Expand Down
875 changes: 405 additions & 470 deletions test/functional/test_site/expected/index.html
View file

Large diffs are not rendered by default.

53 changes: 33 additions & 20 deletions test/functional/test_site/expected/markbind/css/markbind.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,41 @@ code.hljs.inline {
background-color: #fff;
}

/** Holy Grail Layout **/

/* #app is treated as the main container */
#app {
display: flex;
flex-direction: column;
min-height: 100vh;
}

#flex-body {
display: flex;
flex: 1;
}

/* placeholder */
header {

}

#content-wrapper {
flex: 1;
margin: 0 auto;
max-width: 1000px;
overflow-x: hidden;
padding: 0 20px;
transition: 0.4s;
width: 100%;
-webkit-transition: 0.4s;
}

/* Footer */

footer {
background-color: #f5f5f5;
color: dimgrey;
padding: 10px 0;
}

/* Bootstrap small(sm) responsive breakpoint */
Expand Down Expand Up @@ -111,24 +140,6 @@ code.hljs.inline {
}
}

/* Footer */

footer {
background-color: #f5f5f5;
color: dimgrey;
padding: 10px 0;
}

#app {
display: flex;
flex-direction: column;
min-height: 100vh;
}

#flex-div {
flex: 1;
}

/* Scrollbar */

.slim-scroll::-webkit-scrollbar {
Expand Down Expand Up @@ -159,7 +170,9 @@ footer {
border-radius: 20px;
}

/* Temporary Styles */
/* Temporary Anti-FOUC Styles */
/* By default, some VueStrap components break the layout of the page before Vue is mounted, */
/* so we apply temporary styles to fix the layout until Vue correctly updates the DOM. */

.temp-navbar {
display: flex;
Expand Down
24 changes: 4 additions & 20 deletions test/functional/test_site/expected/markbind/css/page-nav.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

#page-nav {
border-left: solid 1px lightgrey;
display: inline-block;
max-height: 80vh;
overflow: auto;
position: fixed;
right: 0;
display: block;
flex: 0 0 auto;
max-width: 300px;
transition: 0.4s;
width: 300px;
-webkit-transition: 0.4s;
Expand All @@ -27,13 +25,7 @@
color: black;
}

#page-nav-content-wrapper {
margin-right: 300px;
transition: 0.4s;
-webkit-transition: 0.4s;
}

/* Responsive site navigation */
/* Responsive page navigation */

/* Hides page navigation on screen widths smaller than 1300px */
@media screen and (max-width: 1299.98px) {
Expand All @@ -44,19 +36,11 @@
padding: 0;
width: 0px;
}

#page-nav-content-wrapper {
margin-right: 0;
}
}

/* Hide page navigation when printing */
@media print {

#page-nav-content-wrapper {
margin-right: 0;
}

#page-nav {
border: none;
display: none;
Expand Down
46 changes: 11 additions & 35 deletions test/functional/test_site/expected/markbind/css/site-nav.css
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,23 @@
/* Site navigation */

#flex-body {
display: flex;
flex: 1;
}

#page-content {
flex: 1;
margin-left: 300px;
overflow-x: hidden;
padding: 0;
transition: 0.4s;
-webkit-transition: 0.4s;
}

#site-nav {
background: white;
border-right: 1px solid lightgrey;
display: inline-block;
left: 0;
max-height: 80vh;
overflow: auto;
display: block;
flex: 0 0 auto;
padding-bottom: 20px;
padding-right: 20px;
padding-top: 20px;
position: fixed;
transition: 0.4s;
width: 300px;
z-index: 1;
-webkit-transition: 0.4s;
}

/* Standard style order for links, see CSS2�5.11.3:
.site-nav-content {
transition: 0.4s;
-webkit-transition: 0.4s;
}

/* Standard style order for links, see CSS2§5.11.3:
https://www.w3.org/TR/CSS2/selector.html#dynamic-pseudo-classes */
.site-nav__a:link,
.site-nav__a:visited,
Expand Down Expand Up @@ -159,7 +146,7 @@
#site-nav {
border: none;
opacity: 0;
overflow: hidden;
padding-right: 0;
width: 0;
}

Expand All @@ -169,10 +156,6 @@
width: 60px;
}

#page-content {
margin-left: 60px;
}

footer {
margin-left: 60px;
}
Expand Down Expand Up @@ -208,10 +191,6 @@
width: 0;
}

#page-content {
margin-left: 0;
}

footer {
margin-left: 0;
}
Expand All @@ -231,12 +210,9 @@
/* Hide site navigation when printing */
@media print {

#page-content {
margin-left: 0;
}

#site-nav {
border: none;
display: none;
}

}
8 changes: 0 additions & 8 deletions test/functional/test_site/expected/markbind/js/setup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,6 @@ function setupSiteNav() {
);
}

function setupPageNav() {
jQuery(window).on('activate.bs.scrollspy', (event, obj) => {
document.querySelectorAll(`a[href='${obj.relatedTarget}']`).item(0).scrollIntoView(false);
});
}

function setup() {
// eslint-disable-next-line no-unused-vars
const vm = new Vue({
Expand All @@ -105,7 +99,6 @@ function setup() {
},
});
setupSiteNav();
setupPageNav();
}

function setupWithSearch() {
Expand Down Expand Up @@ -134,7 +127,6 @@ function setupWithSearch() {
},
});
setupSiteNav();
setupPageNav();
}

if (enableSearch) {
Expand Down
45 changes: 0 additions & 45 deletions test/functional/test_site/expected/siteData.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,8 @@
"panel-with-heading": "Panel with heading | panel keyword",
"panel-without-heading-with-keyword": "Panel without heading with keyword",
"panel-with-heading-with-keyword": "Panel with heading with keyword | panel keyword",
"panel-without-src-header": "Panel without src header",
"panel-with-normal-src-header": "Panel with normal src header",
"panel-with-src-from-a-page-segment-header": "Panel with src from a page segment header",
"boilerplate-referencing": "Boilerplate referencing",
"referencing-specified-path-in-boilerplate": "Referencing specified path in boilerplate",
"outer-nested-panel": "Outer nested panel",
"outer-nested-panel-without-src": "Outer nested panel without src",
"panel-with-src-from-another-markbind-site-header": "Panel with src from another Markbind site header",
"unexpanded-panel-header": "Unexpanded panel header",
"keyword-should-be-tagged-to-this-heading-not-the-panel-heading": "Keyword should be tagged to this heading, not the panel heading | panel keyword",
"panel-without-src-content-heading": "Panel without src content heading",
"panel-normal-source-content-headings": "Panel normal source content headings",
"panel-source-segment-content-headings": "Panel source segment content headings",
"boilerplate-test-for-panel-heading": "boilerplate test for panel heading",
"heading-in-panel-boilerplate": "heading in panel boilerplate",
"nested-panel": "Nested panel",
"normal-panel-content-heading": "Normal panel content heading",
"inner-panel-header-without-src": "Inner panel header without src",
"panel-content-of-inner-nested-panel": "Panel content of inner nested panel",
"panel-content-of-outer-nested-panel": "Panel content of outer nested panel",
"feature-list": "Feature list",
"variables-that-reference-another-variable": "Variables that reference another variable",
"page-variable": "Page Variable",
"page-variable-with-html-and-md": "Page Variable with HTML and MD",
Expand Down Expand Up @@ -75,32 +56,6 @@
"focus-groups": "Focus groups",
"include-segment": "Include segment",
"dynamic-include": "Dynamic include",
"boilerplate-include": "Boilerplate include",
"nested-include": "Nested include",
"html-include": "HTML include",
"mbd-mbdf-include": "Mbd, Mbdf include",
"include-from-another-markbind-site": "Include from another Markbind site",
"trimmed-include": "Trimmed include",
"fragment-with-leading-spaces-and-newline": "Fragment with leading spaces and newline",
"include-with-custom-variables": "Include with custom variables",
"test-included-variable-as-include-attribute": "Test included variable as include attribute",
"test-included-variable": "Test included variable",
"test-included-variable-with-markdown": "Test included variable with markdown",
"test-included-variable-as-attribute": "Test included variable as attribute",
"test-included-variable-as-html-element": "Test included variable as html element",
"test-included-variable-overridden-by-variables-md": "Test included variable overridden by variables.md",
"test-included-variables-in-included-file": "Test included variables in included file",
"inner-included-variables-should-not-leak-into-other-files": "Inner included variables should not leak into other files",
"test-included-variable-with-global-variable": "Test included variable with global variable",
"test-included-variable-overridden-by-set": "Test included variable overridden by set",
"test-missing-variable-with-default": "Test missing variable with default",
"included-variables-should-not-leak-into-other-files": "Included variables should not leak into other files",
"panel-without-src": "Panel without src",
"panel-with-normal-src": "Panel with normal src",
"panel-with-src-from-a-page-segment": "Panel with src from a page segment",
"panel-with-boilerplate": "Panel with boilerplate",
"nested-panel-without-src": "Nested panel without src",
"panel-with-src-from-another-markbind-site": "Panel with src from another Markbind site",
"modal-with-panel-inside": "Modal with panel inside",
"unexpanded-panel": "Unexpanded panel",
"test-plugin-in-markbind-plugins": "Test plugin in markbind/plugins",
Expand Down
Loading

0 comments on commit a5d1882

Please sign in to comment.