diff --git a/README.md b/README.md index 2478b8b..d9188bf 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# Приключения - +## v1.1.0.2 +Изменено общее форматирование ## v1.1.0.1 Исправлено форматирование для модуля Угроза под Отари ## v1.1.0.0 diff --git a/helper-scripts b/helper-scripts index 383c6e9..a457525 160000 --- a/helper-scripts +++ b/helper-scripts @@ -1 +1 @@ -Subproject commit 383c6e975d82def8b66e888c03d2959bc4d30061 +Subproject commit a457525145ba1d5ad3b1762c40056b6316099b21 diff --git a/src/styles/common.css b/src/styles/common.css index 3a6676d..7fd7977 100644 --- a/src/styles/common.css +++ b/src/styles/common.css @@ -1,34 +1 @@ -@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,300;1,400;1,500;1,600;1,700;1,800&display=swap'); - -/* HEADERS */ -h1,h2,h3,h4,h5{ - font-family: 'AlegreyaSC Regular'; -} -/* -h2{ - font-family: 'AlegreyaSC Regular'; - font-weight: bold; -} - -h4,h5{ - font-family: 'AlegreyaSC Regular'; - text-indent: 20px; -} */ -/* PARAGRAPHS */ -p { - text-indent: 20px; - margin-bottom: 0; - padding-bottom: 0; - font-stretch: wider; -} - -/* p + p { - text-indent: 20px; - margin-top: 0; - padding-top: 0; -} */ - -/* TABLES */ -table, th, td, tr { - border-style : none; -} \ No newline at end of file +@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,300;1,400;1,500;1,600;1,700;1,800&display=swap'); \ No newline at end of file diff --git a/src/styles/core.css b/src/styles/core.css index 51d57d4..fa2a54a 100644 --- a/src/styles/core.css +++ b/src/styles/core.css @@ -1,5 +1,4 @@ .core-page { - padding :50; font-family : 'Mookmania Regular'; } @@ -9,35 +8,36 @@ border-image : url(https://static.kdiva.ru/foundry-main/images/note%2Dborder.png) 14 stretch; border-image-outset : 6px 0px; border-image-width : 11px; - padding-left : 10px; - padding-bottom : 1px; - margin : 7px; font-family : 'Open Sans', sans-serif; + font-size : small; + padding : 10px; + margin-top : 20px; + margin-bottom : 10px; } -.core-page .note h5{ - font-size: medium; - padding-top: 20; - margin-bottom: -10px; +.core-page .note h4{ + font-size : medium; + font-family : 'Open Sans', sans-serif; } .core-page .note p{ - font-size: small; - margin-right: 20; - margin-bottom: 20; + text-indent : 0px; + margin : auto; +} + +.core-page .note p + p{ + text-indent : 20px; } .core-page .descriptive { background-color : #fffdec; border-image : url(https://static.kdiva.ru/foundry-main/images/descriptive%2Dborder%2Dcommon.png) 12 stretch; - border-image-outset : 4px; - border-image-width : 11px; - padding-left : 10px; - padding-right : 10px; - padding-bottom : 10px; - padding-top : 1px; - margin : 7px; + border-image-outset : 6px; + border-image-width : 10px; font-family : 'Open Sans', sans-serif; + margin-top : 20px; + margin-bottom : 20px; + font-size : small; } .core-page .class-block p{ @@ -47,4 +47,4 @@ /* TABLES */ .core-page tr:nth-child(odd) td { background-color : #d0e4c0; -} +} \ No newline at end of file