diff --git a/cadasta/core/static/css/_variables.scss b/cadasta/core/static/css/_variables.scss index 37226d2d6..ac8e22dce 100644 --- a/cadasta/core/static/css/_variables.scss +++ b/cadasta/core/static/css/_variables.scss @@ -21,7 +21,8 @@ $body-bg: #f2f4f7; //== Typography -$font-family-sans-serif: 'roboto', Helvetica, Arial, sans-serif; +$font-family-sans-serif: 'Roboto', Helvetica, Arial, 'Noto Sans Bengali', sans-serif; +$font-family-sans-serif-alt: 'Roboto Condensed', 'Roboto', Helvetica, 'Noto Sans Bengali', sans-serif; //== Header diff --git a/cadasta/core/static/css/main.css b/cadasta/core/static/css/main.css index 63b04fbcd..b031dcf1a 100644 --- a/cadasta/core/static/css/main.css +++ b/cadasta/core/static/css/main.css @@ -232,7 +232,7 @@ html { -webkit-tap-highlight-color: transparent; } body { - font-family: "roboto", Helvetica, Arial, sans-serif; + font-family: "Roboto", Helvetica, Arial, "Noto Sans Bengali", sans-serif; font-size: 14px; line-height: 1.42857; color: #595a5c; @@ -4263,7 +4263,7 @@ ul.resource-actions > li { /* =Leaflet popups -------------------------------------------------------------- */ .leaflet-container { - font-family: "roboto", Helvetica, Arial, sans-serif !important; + font-family: "Roboto", Helvetica, Arial, "Noto Sans Bengali", sans-serif !important; z-index: 1; } .leaflet-popup-content-wrapper { @@ -4354,6 +4354,12 @@ label[for="id_extents-location"] { font-weight: 300; font-style: normal; } +@font-face { + font-family: 'Noto Sans Bengali'; + src: url("/static/fonts/NotoSansBengali/NotoSansBengali-Regular.ttf") format("truetype"); + font-weight: 300; + font-style: normal; } + /* =Basics -------------------------------------------------------------- */ html { @@ -4385,7 +4391,7 @@ body, #cadasta { padding-bottom: 0; } } h1, h2 { - font-family: 'Roboto Condensed', sans-serif; } + font-family: "Roboto Condensed", "Roboto", Helvetica, "Noto Sans Bengali", sans-serif; } h3, h4, h5 { letter-spacing: -0.3px; } @@ -5313,7 +5319,8 @@ header { #project-single .page-header h1, #project-single .page-header h2, #organization-single .page-header h1, #organization-single .page-header h2 { - margin-left: 54px; } + margin-left: 54px; + padding-bottom: 8px; } #project-single .page-header .top-btn, #organization-single .page-header .top-btn { margin-top: 18px; } @@ -5466,7 +5473,7 @@ main.container-fluid { padding-bottom: 14px; text-shadow: none; } .content-single h3 { - font-family: 'Roboto Condensed', sans-serif; + font-family: "Roboto Condensed", "Roboto", Helvetica, "Noto Sans Bengali", sans-serif; text-transform: uppercase; opacity: 0.8; font-weight: 300; @@ -5532,7 +5539,7 @@ main.container-fluid { .content-single .detail section > p:first-child { padding-top: 20px; } .content-single .detail h4 { - font-family: 'Roboto Condensed', sans-serif; + font-family: "Roboto Condensed", "Roboto", Helvetica, "Noto Sans Bengali", sans-serif; text-transform: uppercase; opacity: 0.8; letter-spacing: 0; @@ -5980,11 +5987,11 @@ div.add-btn-btm { overflow-y: initial !important; } .modal h3.modal-title { - font-family: 'Roboto Condensed', sans-serif; + font-family: "Roboto Condensed", "Roboto", Helvetica, "Noto Sans Bengali", sans-serif; text-transform: uppercase; } .modal h4.step { - font-family: 'Roboto Condensed', sans-serif; + font-family: "Roboto Condensed", "Roboto", Helvetica, "Noto Sans Bengali", sans-serif; text-transform: uppercase; opacity: 0.8; font-weight: 300; diff --git a/cadasta/core/static/css/main.scss b/cadasta/core/static/css/main.scss index a2f4425d1..e1d52aa56 100644 --- a/cadasta/core/static/css/main.scss +++ b/cadasta/core/static/css/main.scss @@ -48,6 +48,13 @@ font-style: normal; } +@font-face { + font-family: 'Noto Sans Bengali'; + src: url('/static/fonts/NotoSansBengali/NotoSansBengali-Regular.ttf') format('truetype'); + font-weight: 300; + font-style: normal; +} + /* =Basics -------------------------------------------------------------- */ @@ -85,7 +92,7 @@ body, #cadasta { } h1, h2 { - font-family: 'Roboto Condensed', sans-serif; + font-family: $font-family-sans-serif-alt; } h3, h4, h5 { @@ -490,6 +497,7 @@ header { } h1, h2 { margin-left: 54px; + padding-bottom: 8px; } .top-btn { margin-top: 18px; @@ -674,7 +682,7 @@ main.container-fluid { text-shadow: none; } h3 { - font-family: 'Roboto Condensed', sans-serif; + font-family: $font-family-sans-serif-alt; text-transform: uppercase; opacity: 0.8; font-weight: 300; @@ -760,7 +768,7 @@ main.container-fluid { padding-top: 20px; } h4 { - font-family: 'Roboto Condensed', sans-serif; + font-family: $font-family-sans-serif-alt; text-transform: uppercase; opacity: 0.8; letter-spacing: 0; @@ -1358,11 +1366,11 @@ div.add-btn-btm { // add party link at bottom of table overflow-y: initial !important } h3.modal-title { - font-family: 'Roboto Condensed', sans-serif; + font-family: $font-family-sans-serif-alt; text-transform: uppercase; } h4.step { - font-family: 'Roboto Condensed', sans-serif; + font-family: $font-family-sans-serif-alt; text-transform: uppercase; opacity: 0.8; font-weight: 300; diff --git a/cadasta/core/static/fonts/NotoSansBengali/LICENSE_OFL.txt b/cadasta/core/static/fonts/NotoSansBengali/LICENSE_OFL.txt new file mode 100644 index 000000000..d952d62c0 --- /dev/null +++ b/cadasta/core/static/fonts/NotoSansBengali/LICENSE_OFL.txt @@ -0,0 +1,92 @@ +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/cadasta/core/static/fonts/NotoSansBengali/NotoSansBengali-Bold.ttf b/cadasta/core/static/fonts/NotoSansBengali/NotoSansBengali-Bold.ttf new file mode 100644 index 000000000..57bd9d42b Binary files /dev/null and b/cadasta/core/static/fonts/NotoSansBengali/NotoSansBengali-Bold.ttf differ diff --git a/cadasta/core/static/fonts/NotoSansBengali/NotoSansBengali-Regular.ttf b/cadasta/core/static/fonts/NotoSansBengali/NotoSansBengali-Regular.ttf new file mode 100644 index 000000000..320b43e3a Binary files /dev/null and b/cadasta/core/static/fonts/NotoSansBengali/NotoSansBengali-Regular.ttf differ