renamed tree and inline modules to ModeText & ModeConnections

This commit is contained in:
Bachir Soussi Chiadmi
2018-02-10 16:48:29 +01:00
parent 89d9aa6aca
commit d834e2db12
8 changed files with 97 additions and 14067 deletions
+58 -141
View File
@@ -1,17 +1,15 @@
/*! normalize.css v6.0.0 | MIT License | github.com/necolas/normalize.css */ /*! normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css */
/* Document /* Document
========================================================================== */ ========================================================================== */
/** /**
* 1. Correct the line height in all browsers. * 1. Correct the line height in all browsers.
* 2. Prevent adjustments of font size after orientation changes in * 2. Prevent adjustments of font size after orientation changes in iOS.
* IE on Windows Phone and in iOS.
*/ */
html { html {
line-height: 1.15; /* 1 */ line-height: 1.15; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */
} }
@@ -19,16 +17,11 @@ html {
========================================================================== */ ========================================================================== */
/** /**
* Add the correct display in IE 9-. * Remove the margin in all browsers.
*/ */
article, body {
aside, margin: 0;
footer,
header,
nav,
section {
display: block;
} }
/** /**
@@ -44,25 +37,6 @@ h1 {
/* Grouping content /* Grouping content
========================================================================== */ ========================================================================== */
/**
* Add the correct display in IE 9-.
* 1. Add the correct display in IE.
*/
figcaption,
figure,
main { /* 1 */
display: block;
}
/**
* Add the correct margin in IE 8.
*/
figure {
margin: 1em 40px;
}
/** /**
* 1. Add the correct box sizing in Firefox. * 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE. * 2. Show the overflow in Edge and IE.
@@ -88,17 +62,15 @@ pre {
========================================================================== */ ========================================================================== */
/** /**
* 1. Remove the gray background on active links in IE 10. * Remove the gray background on active links in IE 10.
* 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
*/ */
a { a {
background-color: transparent; /* 1 */ background-color: transparent;
-webkit-text-decoration-skip: objects; /* 2 */
} }
/** /**
* 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 1. Remove the bottom border in Chrome 57-
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/ */
@@ -108,15 +80,6 @@ abbr[title] {
text-decoration: underline dotted; /* 2 */ text-decoration: underline dotted; /* 2 */
} }
/**
* Prevent the duplicate application of `bolder` by the next rule in Safari 6.
*/
b,
strong {
font-weight: inherit;
}
/** /**
* Add the correct font weight in Chrome, Edge, and Safari. * Add the correct font weight in Chrome, Edge, and Safari.
*/ */
@@ -138,23 +101,6 @@ samp {
font-size: 1em; /* 2 */ font-size: 1em; /* 2 */
} }
/**
* Add the correct font style in Android 4.3-.
*/
dfn {
font-style: italic;
}
/**
* Add the correct background and color in IE 9-.
*/
mark {
background-color: #ff0;
color: #000;
}
/** /**
* Add the correct font size in all browsers. * Add the correct font size in all browsers.
*/ */
@@ -188,44 +134,19 @@ sup {
========================================================================== */ ========================================================================== */
/** /**
* Add the correct display in IE 9-. * Remove the border on images inside links in IE 10.
*/
audio,
video {
display: inline-block;
}
/**
* Add the correct display in iOS 4-7.
*/
audio:not([controls]) {
display: none;
height: 0;
}
/**
* Remove the border on images inside links in IE 10-.
*/ */
img { img {
border-style: none; border-style: none;
} }
/**
* Hide the overflow in IE.
*/
svg:not(:root) {
overflow: hidden;
}
/* Forms /* Forms
========================================================================== */ ========================================================================== */
/** /**
* Remove the margin in Firefox and Safari. * 1. Change the font styles in all browsers.
* 2. Remove the margin in Firefox and Safari.
*/ */
button, button,
@@ -233,7 +154,10 @@ input,
optgroup, optgroup,
select, select,
textarea { textarea {
margin: 0; font-family: inherit; /* 1 */
font-size: 100%; /* 1 */
line-height: 1.15; /* 1 */
margin: 0; /* 2 */
} }
/** /**
@@ -257,16 +181,14 @@ select { /* 1 */
} }
/** /**
* 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` * Correct the inability to style clickable types in iOS and Safari.
* controls in Android 4.
* 2. Correct the inability to style clickable types in iOS and Safari.
*/ */
button, button,
html [type="button"], /* 1 */ [type="button"],
[type="reset"], [type="reset"],
[type="submit"] { [type="submit"] {
-webkit-appearance: button; /* 2 */ -webkit-appearance: button;
} }
/** /**
@@ -292,6 +214,14 @@ button:-moz-focusring,
outline: 1px dotted ButtonText; outline: 1px dotted ButtonText;
} }
/**
* Correct the padding in Firefox.
*/
fieldset {
padding: 0.35em 0.75em 0.625em;
}
/** /**
* 1. Correct the text wrapping in Edge and IE. * 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE. * 2. Correct the color inheritance from `fieldset` elements in IE.
@@ -309,17 +239,15 @@ legend {
} }
/** /**
* 1. Add the correct display in IE 9-. * Add the correct vertical alignment in Chrome, Firefox, and Opera.
* 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/ */
progress { progress {
display: inline-block; /* 1 */ vertical-align: baseline;
vertical-align: baseline; /* 2 */
} }
/** /**
* Remove the default vertical scrollbar in IE. * Remove the default vertical scrollbar in IE 10+.
*/ */
textarea { textarea {
@@ -327,8 +255,8 @@ textarea {
} }
/** /**
* 1. Add the correct box sizing in IE 10-. * 1. Add the correct box sizing in IE 10.
* 2. Remove the padding in IE 10-. * 2. Remove the padding in IE 10.
*/ */
[type="checkbox"], [type="checkbox"],
@@ -357,10 +285,9 @@ textarea {
} }
/** /**
* Remove the inner padding and cancel buttons in Chrome and Safari on macOS. * Remove the inner padding in Chrome and Safari on macOS.
*/ */
[type="search"]::-webkit-search-cancel-button,
[type="search"]::-webkit-search-decoration { [type="search"]::-webkit-search-decoration {
-webkit-appearance: none; -webkit-appearance: none;
} }
@@ -379,12 +306,10 @@ textarea {
========================================================================== */ ========================================================================== */
/* /*
* Add the correct display in IE 9-. * Add the correct display in Edge, IE 10+, and Firefox.
* 1. Add the correct display in Edge, IE, and Firefox.
*/ */
details, /* 1 */ details {
menu {
display: block; display: block;
} }
@@ -396,30 +321,19 @@ summary {
display: list-item; display: list-item;
} }
/* Scripting /* Misc
========================================================================== */ ========================================================================== */
/** /**
* Add the correct display in IE 9-. * Add the correct display in IE 10+.
*/
canvas {
display: inline-block;
}
/**
* Add the correct display in IE.
*/ */
template { template {
display: none; display: none;
} }
/* Hidden
========================================================================== */
/** /**
* Add the correct display in IE 10-. * Add the correct display in IE 10.
*/ */
[hidden] { [hidden] {
@@ -822,17 +736,19 @@ header {
color: #000; } color: #000; }
.sticky-clone-wrapper { .sticky-clone-wrapper {
padding-top: 5em; padding-top: 6em;
padding-bottom: 1em;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
z-index: 4; z-index: 4;
width: 100%;
background-color: white; } background-color: white; }
.sticky-clone-wrapper h1.part-title { .sticky-clone-wrapper h1.part-title {
font-size: 1.6em; } font-size: 1.6em; }
body.inline .sticky-clone-wrapper h1.part-title { body.mode-connections .sticky-clone-wrapper h1.part-title {
margin: 0 0 0 70px; } margin: 0 0 0 70px; }
body.tree .sticky-clone-wrapper h1.part-title { body.mode-text .sticky-clone-wrapper h1.part-title {
margin: 0 0 0 70px; } margin: 0 0 0 70px; }
main#content { main#content {
@@ -849,13 +765,13 @@ main#content {
section.intro { section.intro {
margin-left: 70px; } margin-left: 70px; }
main#content.inline h1.part-title { main#content.mode-text h1.part-title {
margin: 1em 0 0 70px; } margin: 1em 0 0 70px; }
main#content.inline h2.title, main#content.inline h4.filet { main#content.mode-text h2.title, main#content.mode-text h4.filet {
margin: 1em 0 0 70px; } margin: 1em 0 0 70px; }
main#content.inline section.enonce { main#content.mode-text section.enonce {
width: 450px; width: 450px;
margin: 1em 0 1em 70px; margin: 1em 0 1em 70px;
overflow-x: visible; overflow-x: visible;
@@ -863,38 +779,38 @@ main#content.inline section.enonce {
font-size: 16px; font-size: 16px;
font-kerning: auto; font-kerning: auto;
line-height: 1.4; } line-height: 1.4; }
main#content.inline section.enonce h2 { main#content.mode-text section.enonce h2 {
font-size: 1em; font-size: 1em;
font-weight: 300; font-weight: 300;
margin: 0; margin: 0;
cursor: pointer; } cursor: pointer; }
main#content.inline section.enonce h3 { main#content.mode-text section.enonce h3 {
font-size: 0.9em; font-size: 0.9em;
font-weight: 300; font-weight: 300;
margin: 0; margin: 0;
cursor: pointer; } cursor: pointer; }
main#content.inline section.enonce div.text { main#content.mode-text section.enonce div.text {
font-size: 1.3em; } font-size: 1.3em; }
main#content.inline section.enonce div.text div.paragraph { main#content.mode-text section.enonce div.text div.paragraph {
margin-bottom: 1em; } margin-bottom: 1em; }
main#content.inline section.enonce div.text div.paragraph div.opened-link { main#content.mode-text section.enonce div.text div.paragraph div.opened-link {
display: inline; } display: inline; }
main#content.inline section.enonce div.text div.paragraph a.link, main#content.inline section.enonce div.text div.paragraph span.link.text { main#content.mode-text section.enonce div.text div.paragraph a.link, main#content.mode-text section.enonce div.text div.paragraph span.link.text {
font-weight: 600; font-weight: 600;
text-decoration: none; text-decoration: none;
color: inherit; } color: inherit; }
main#content.inline section.enonce div.text div.paragraph span.link.text:after { main#content.mode-text section.enonce div.text div.paragraph span.link.text:after {
content: ':'; } content: ':'; }
main#content.inline section.enonce div.text div.paragraph section.enonce, main#content.inline section.enonce div.text div.paragraph section.item { main#content.mode-text section.enonce div.text div.paragraph section.enonce, main#content.mode-text section.enonce div.text div.paragraph section.item {
padding-left: 2em; padding-left: 2em;
border-left: 1px solid #999; } border-left: 1px solid #999; }
main#content.inline section.enonce div.text div.paragraph img { main#content.mode-text section.enonce div.text div.paragraph img {
float: left; } float: left; }
main#content.tree h1.part-title { main#content.mode-connections h1.part-title {
margin: 0 0 0 70px; } margin: 0 0 0 70px; }
main#content.tree h2.title, main#content.tree h4.filet { main#content.mode-connections h2.title, main#content.mode-connections h4.filet {
margin: 0 0 0 70px; } margin: 0 0 0 70px; }
.dot { .dot {
@@ -977,7 +893,8 @@ main#content.tree h2.title, main#content.tree h4.filet {
footer { footer {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
background-color: white; } background-color: white;
width: 100%; }
footer > * { footer > * {
margin-left: 1em; } margin-left: 1em; }
+1 -13877
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+5 -5
View File
@@ -19,8 +19,8 @@ var m = require('mithril');
// var _helpers = require('modules/helpers'); // var _helpers = require('modules/helpers');
var _dbs = require('./modules/dbs'); var _dbs = require('./modules/dbs');
var _Inline = require('./modules/inline'); var _ModeText = require('./modules/ModeText');
var _Tree = require('./modules/tree'); var _ModeConnections = require('./modules/ModeConnections');
function init(){ function init(){
@@ -29,9 +29,9 @@ function init(){
console.log("Init _dbs.data_byid", _dbs.data_byid); console.log("Init _dbs.data_byid", _dbs.data_byid);
console.log("Init _dbs.data_strct", _dbs.data_strct); console.log("Init _dbs.data_strct", _dbs.data_strct);
m.route.prefix(""); m.route.prefix("");
m.route(document.body, "/lat/inline", { m.route(document.body, "/lat/text", {
"/:lang/inline": _Inline, "/:lang/text": _ModeText,
"/:lang/tree": _Tree, "/:lang/connections": _ModeConnections
}); });
}); });
}; };
+8 -5
View File
@@ -131,17 +131,19 @@ header{
.sticky-clone-wrapper{ .sticky-clone-wrapper{
padding-top: $header_height; padding-top: $header_height+1em;
padding-bottom: 1em;
position: fixed; position: fixed;
top:0; left: 0; top:0; left: 0;
z-index: 4; z-index: 4;
width:100%;
background-color: white; background-color: white;
h1.part-title{ h1.part-title{
font-size: 1.6em; font-size: 1.6em;
body.inline &{ body.mode-connections &{
margin: 0 0 0 $margin_left; margin: 0 0 0 $margin_left;
} }
body.tree &{ body.mode-text &{
margin:0 0 0 $margin_left; margin:0 0 0 $margin_left;
} }
} }
@@ -181,7 +183,7 @@ section.intro{
// / // __ \/ / / / __ \/ _ \ // / // __ \/ / / / __ \/ _ \
// _/ // / / / /___/ / / / / __/ // _/ // / / / /___/ / / / / __/
// /___/_/ /_/_____/_/_/ /_/\___/ // /___/_/ /_/_____/_/_/ /_/\___/
main#content.inline{ main#content.mode-text{
h1.part-title{ h1.part-title{
margin: 1em 0 0 $margin_left; margin: 1em 0 0 $margin_left;
} }
@@ -259,7 +261,7 @@ main#content.inline{
// / / / ___/ _ \/ _ \ // / / / ___/ _ \/ _ \
// / / / / / __/ __/ // / / / / / __/ __/
// /_/ /_/ \___/\___/ // /_/ /_/ \___/\___/
main#content.tree{ main#content.mode-connections{
h1.part-title{ h1.part-title{
margin:0 0 0 $margin_left; margin:0 0 0 $margin_left;
@@ -385,4 +387,5 @@ footer{
bottom: 0; bottom: 0;
background-color: white; background-color: white;
>*{margin-left: 1em;} >*{margin-left: 1em;}
width: 100%;
} }
@@ -343,24 +343,21 @@ var _Intro = {
} }
// ______ // ______ __ _
// /_ __/_______ ___ // / ____/___ ____ ____ ___ _____/ /_(_)___ ____ _____
// / / / ___/ _ \/ _ \ // / / / __ \/ __ \/ __ \/ _ \/ ___/ __/ / __ \/ __ \/ ___/
// / / / / / __/ __/ // / /___/ /_/ / / / / / / / __/ /__/ /_/ / /_/ / / / (__ )
// /_/ /_/ \___/\___/ // \____/\____/_/ /_/_/ /_/\___/\___/\__/_/\____/_/ /_/____/
module.exports = { module.exports = {
// oninit : function(vn){
// this.lang = vn.attrs.lang;
// },
oncreate: function(vn){ oncreate: function(vn){
document.body.classList.add('tree'); document.body.classList.add('mode-connections');
_Ui.init(); _Ui.init();
}, },
view: function(vn){ view: function(vn){
console.log('_Tree view', vn.attrs.lang); console.log('_ModeConnections view', vn.attrs.lang);
return [ return [
m(_Header), m(_Header),
m('main', {id:"content", 'class':'tree'}, _dbs.data[vn.attrs.lang].map(function(p){ m('main', {id:"content", 'class':'mode-connections'}, _dbs.data[vn.attrs.lang].map(function(p){
if(p.id == 'intro'){ if(p.id == 'intro'){
return m(_Intro,p); return m(_Intro,p);
}else{ }else{
@@ -372,15 +369,3 @@ module.exports = {
]; ];
} }
} }
// function(){
// switch(_dbs.lang){
// case 'fr':
// return "Hello dots !";
// break;
// case 'bra':
// return '"Hola dots !"'
// break;
// }
// }
@@ -197,7 +197,7 @@ var _Item = {
onclick: function(e){ onclick: function(e){
vn.state.active = vn.state.active ? 0 : 1; vn.state.active = vn.state.active ? 0 : 1;
} }
}, this.type), }, m.trust(markdown.renderInline(this.type))),
// create text node // create text node
m(_Text, {'text':this.text, 'id':this.id}) m(_Text, {'text':this.text, 'id':this.id})
] ]
@@ -323,24 +323,25 @@ var _Intro = {
} }
} }
// ____ __ _
// / _/___ / / (_)___ ___ // ______ __
// / // __ \/ / / / __ \/ _ \ // /_ __/__ _ __/ /_
// _/ // / / / /___/ / / / / __/ // / / / _ \| |/_/ __/
// /___/_/ /_/_____/_/_/ /_/\___/ // / / / __/> </ /_
// /_/ \___/_/|_|\__/
module.exports = { module.exports = {
// oninit : function(vn){ // oninit : function(vn){
// this.lang = vn.attrs.lang; // this.lang = vn.attrs.lang;
// }, // },
oncreate: function(vn){ oncreate(vn){
document.body.classList.add('inline'); document.body.classList.add('mode-text');
_Ui.init(); _Ui.init();
}, },
view: function(vn){ view(vn){
console.log('_Inline view', vn.attrs.lang); console.log('_ModeText view', vn.attrs.lang);
return [ return [
m(_Header), m(_Header),
m('main', {id:"content", 'class':'inline'}, _dbs.data[vn.attrs.lang].map(function(p){ m('main', {id:"content", 'class':'mode-text'}, _dbs.data[vn.attrs.lang].map(function(p){
console.log("MAP _dbs", p); console.log("MAP _dbs", p);
if(p.id == 'intro'){ if(p.id == 'intro'){
return m(_Intro,p); return m(_Intro,p);
+4 -4
View File
@@ -69,15 +69,15 @@ var _RouteMenu = {
m('h3', 'Mode'), m('h3', 'Mode'),
m('ul', [ m('ul', [
m('li', m('a', { m('li', m('a', {
'href':'/'+lang+'/inline'+path[3], 'href':`/${lang}/text${path[3]}`,
oncreate : m.route.link, oncreate : m.route.link,
onupdate : m.route.link onupdate : m.route.link
}, "inline")), }, "Text")),
m('li', m('a', { m('li', m('a', {
'href':'/'+lang+'/tree'+path[3], 'href':`/${lang}/connections${path[3]}`,
oncreate : m.route.link, oncreate : m.route.link,
onupdate : m.route.link onupdate : m.route.link
}, "tree")), }, "Connections")),
]) ])
]); ]);
} }