Skip to content

Commit 672a37b

Browse files
authored
Merge pull request #4 from kabbala/font-size_config
added font-size config property
2 parents 10011dd + 24a5da2 commit 672a37b

File tree

5 files changed

+14
-2
lines changed

5 files changed

+14
-2
lines changed

css/basic.less

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ body {
2020
padding: 0;
2121
}
2222
body {
23-
font: normal 87.5%/1.4 Arial, sans-serif;
24-
/* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */
23+
font-size: @ini_font_size;
24+
line-height: @ini_line_height;
25+
font-style: normal;
26+
font-family: Arial, sans-serif;
2527
-webkit-text-size-adjust: 100%;
2628
}
2729

lang/en/lang.php

+2
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@
1111
$lang['__tablet_width__'] = 'Below screensizes of this width, the site switches to tablet mode';
1212
$lang['__phone_width__'] = 'Below screensizes of this width, the site switches to phone mode';
1313
$lang['__theme_color__'] = 'Theme color of the web app';
14+
$lang['__font_size__'] = 'The base font size';
15+
$lang['__line_height__'] = 'The base font line height';

lang/ja/lang.php

+2
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@
1313
$lang['__sidebar_width__'] = 'サイドバーがある場合、サイドバーの幅(任意の長さの単位を使用可能: % px em 他)';
1414
$lang['__tablet_width__'] = 'タブレットモードにサイトを切替える、画面幅';
1515
$lang['__phone_width__'] = '携帯電話モードにサイトを切替える、画面幅';
16+
$lang['__font_size__'] = 'フォントサイズ';
17+
$lang['__line_height__'] = '行の高さ';

lang/ko/lang.php

+2
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@
1313
$lang['__sidebar_width__'] = '사이드바가 있다면, 그것의 너비 (아무 길이 단위나 될 수 있음: %, px, em, ...)';
1414
$lang['__tablet_width__'] = '사이트를 태블릿 모드로 전환할 화면 너비';
1515
$lang['__phone_width__'] = '사이트를 폰 모드로 전환할 화면 너비';
16+
$lang['__font_size__'] = '글자 크기';
17+
$lang['__line_height__'] = '줄 간격';

style.ini

+4
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,7 @@ __tablet_width__ = "800px" ; @ini_tablet_width
8888
__phone_width__ = "480px" ; @ini_phone_width
8989

9090
__theme_color__ = "#008800" ; @_ini_theme_color: theme_color of the web app
91+
92+
__font_size__ = "87.5%"
93+
; default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px
94+
__line_height__ = "1.4"

0 commit comments

Comments
 (0)