mirror_html/nullboard
1
0
Fork 0
mirror of https://github.com/apankrat/nullboard.git synced 2025-08-11 15:44:56 +02:00
Code Issues Projects Releases Wiki Activity

switch to calc() for --lh

Browse Source
This commit is contained in:
Alex Pankratov
2021-04-07 13:56:10 +02:00
parent 19137f11be
commit 092a6175fa
1 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
nullboard.html
View File

@@ -128,9 +128,8 @@
html {
--ff: f-barlow, sans-serif;
--fs: 11; /* font-size */
--lh: 15; /* line-height */
--fs: 11; /* font-size */
--lh: calc( var(--fs) * 1.25 ); /* line-height */
--fs-head: 13.6; /* font-size of board heading */
--fs-nops: 9; /* font-size of the note ops */
--lw: calc(20 * var(--fs) + 30); /* .list width */
@@ -150,14 +149,6 @@
--lw: calc(20 * var(--fs) + 40); /* .list width */
}
/***/
html.f-maven-pro {
--ff: f-maven-pro, sans-serif;
--fs: 12;
--fs-head: 13;
--lw: calc(20 * var(--fs) + 47); /* .list width */
}
/***/
html.f-open-sans {
--ff: f-open-sans, sans-serif;
@@ -175,6 +166,14 @@
--lw: calc(22 * var(--fs) + 40); /* .list width */
}
/***/
html.f-maven-pro {
--ff: f-maven-pro, sans-serif;
--fs: 12;
--fs-head: 13;
--lw: calc(20 * var(--fs) + 47); /* .list width */
}
/***/
html, body, h1, textarea, input {
padding: 0;
@@ -3229,8 +3228,7 @@
if (conf.lineHeight)
setLineHeight(conf.lineHeight);
updateFontSize();
updateLineHeight();
updateVars();
}
function onFontLoaded(f, ok)
@@ -3274,30 +3272,32 @@
$list.removeClass('active');
$list.filter('[font="' + font + '"]').addClass('active');
updateFontSize();
updateLineHeight();
updateListWidth();
updateVars();
adjustLayout();
}
//
function getVar(name)
{
var v = $('html').css(name);
var m = v.match(/^\s*calc\((.*)\)$/);
if (m) v = eval(m[1]);
return parseFloat( v );
}
function getFontSize()
{
return parseFloat( $('html').css('--fs') );
return getVar('--fs');
}
function getLineHeight()
{
return parseFloat( $('html').css('--lh') );
return getVar('--lh');;
}
function getListWidth()
{
var lw = $('html').css('--lw');
var m = lw.match(/^\s*calc\((.*)\)$/);
if (m) lw = eval(m[1]);
console.log('getListWidth -> ', lw)
return parseInt( lw );
return parseInt( getVar('--lw') );
}
//
@@ -3322,13 +3322,20 @@ console.log('getListWidth -> ', lw)
return val;
}
function updateVars()
{
updateFontSize();
updateLineHeight();
updateListWidth();
}
//
function setFontSize(fs)
{
if (9 <= fs && fs <= 24)
{
$('html').css('--fs', fs + '').addClass('fs-set');
updateFontSize();
updateVars();
adjustLayout();
if (getLineHeight() < fs)
@@ -3339,11 +3346,13 @@ console.log('getListWidth -> ', lw)
function setLineHeight(lh)
{
lh = parseInt(10*lh) / 10.; // trim to a single decimal digit
var fs = getFontSize();
if (fs <= lh && lh <= 3*fs)
{
$('html').css('--lh', lh + '').addClass('lh-set');
updateLineHeight();
updateVars();
adjustLayout();
}
return getLineHeight();
@@ -3354,8 +3363,8 @@ console.log('getListWidth -> ', lw)
if (200 <= lw && lw <= 400)
{
$('html').css('--lw', lw + '').addClass('lw-set');
updateVars();
adjustLayout();
updateListWidth();
}
return getListWidth();
}
@@ -3712,7 +3721,7 @@ console.log('getListWidth -> ', lw)
//
$('.config .f-prefs .ui-lh .less').on('click', function(){
var lh = setLineHeight( getLineHeight() - 0.5 );
var lh = setLineHeight( getLineHeight() - 0.1 );
NB.storage.setLineHeight(lh);
return false;
});
@@ -3726,7 +3735,7 @@ console.log('getListWidth -> ', lw)
});
$('.config .f-prefs .ui-lh .more').on('click', function(){
var lh = setLineHeight( getLineHeight() + 0.5 );
var lh = setLineHeight( getLineHeight() + 0.1 );
NB.storage.setLineHeight(lh);
return false;
});