diff --git a/ClubSite/Assets/fonts/fonts-lato-raleway.css b/ClubSite/Assets/fonts/fonts-lato-raleway.css new file mode 100644 index 0000000..a592e78 --- /dev/null +++ b/ClubSite/Assets/fonts/fonts-lato-raleway.css @@ -0,0 +1,55 @@ +/* source: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Raleway:wght@700&display=swap */ +/* latin-ext */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url(/assets/fonts/lato/lato-300-latin-ext.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url(/assets/fonts/lato/lato-300-latin.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* latin-ext */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(/assets/fonts/lato/lato-400-latin-ext.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(/assets/fonts/lato/lato-400-latin.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* latin-ext */ +@font-face { + font-family: 'Raleway'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url(/assets/fonts/raleway/raleway-700-latin-ext.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Raleway'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url(/assets/fonts/raleway/raleway-700-latin.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} diff --git a/ClubSite/Assets/fonts/lato/Lato.zip b/ClubSite/Assets/fonts/lato/Lato.zip new file mode 100644 index 0000000..97a694a Binary files /dev/null and b/ClubSite/Assets/fonts/lato/Lato.zip differ diff --git a/ClubSite/Assets/fonts/lato/OFL.txt b/ClubSite/Assets/fonts/lato/OFL.txt new file mode 100644 index 0000000..98383e3 --- /dev/null +++ b/ClubSite/Assets/fonts/lato/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato" + +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/ClubSite/Assets/fonts/lato/lato-300-latin-ext.woff2 b/ClubSite/Assets/fonts/lato/lato-300-latin-ext.woff2 new file mode 100644 index 0000000..486d3ec Binary files /dev/null and b/ClubSite/Assets/fonts/lato/lato-300-latin-ext.woff2 differ diff --git a/ClubSite/Assets/fonts/lato/lato-300-latin.woff2 b/ClubSite/Assets/fonts/lato/lato-300-latin.woff2 new file mode 100644 index 0000000..aad98a3 Binary files /dev/null and b/ClubSite/Assets/fonts/lato/lato-300-latin.woff2 differ diff --git a/ClubSite/Assets/fonts/lato/lato-400-latin-ext.woff2 b/ClubSite/Assets/fonts/lato/lato-400-latin-ext.woff2 new file mode 100644 index 0000000..edb9fa6 Binary files /dev/null and b/ClubSite/Assets/fonts/lato/lato-400-latin-ext.woff2 differ diff --git a/ClubSite/Assets/fonts/lato/lato-400-latin.woff2 b/ClubSite/Assets/fonts/lato/lato-400-latin.woff2 new file mode 100644 index 0000000..ff60934 Binary files /dev/null and b/ClubSite/Assets/fonts/lato/lato-400-latin.woff2 differ diff --git a/ClubSite/Assets/fonts/raleway/OFL.txt b/ClubSite/Assets/fonts/raleway/OFL.txt new file mode 100644 index 0000000..fcfb505 --- /dev/null +++ b/ClubSite/Assets/fonts/raleway/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2010 The Raleway Project Authors (impallari@gmail.com), with Reserved Font Name "Raleway". + +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/ClubSite/Assets/fonts/raleway/Raleway.zip b/ClubSite/Assets/fonts/raleway/Raleway.zip new file mode 100644 index 0000000..c7d6bb6 Binary files /dev/null and b/ClubSite/Assets/fonts/raleway/Raleway.zip differ diff --git a/ClubSite/Assets/fonts/raleway/raleway-700-latin-ext.woff2 b/ClubSite/Assets/fonts/raleway/raleway-700-latin-ext.woff2 new file mode 100644 index 0000000..0d620b5 Binary files /dev/null and b/ClubSite/Assets/fonts/raleway/raleway-700-latin-ext.woff2 differ diff --git a/ClubSite/Assets/fonts/raleway/raleway-700-latin.woff2 b/ClubSite/Assets/fonts/raleway/raleway-700-latin.woff2 new file mode 100644 index 0000000..f507f64 Binary files /dev/null and b/ClubSite/Assets/fonts/raleway/raleway-700-latin.woff2 differ diff --git a/ClubSite/Assets/scss/_bs_custom.scss b/ClubSite/Assets/scss/_bs_custom.scss index 9cbc942..89790a0 100644 --- a/ClubSite/Assets/scss/_bs_custom.scss +++ b/ClubSite/Assets/scss/_bs_custom.scss @@ -49,7 +49,7 @@ $success: $green; $info: tint-color($primary, 50%); $warning: $orange; $danger: $red; -$light: $gray-300; +$light: $gray-400; $dark: $gray-800; // Reassign color vars to semantic color scheme diff --git a/ClubSite/Pages/_Layout.cshtml b/ClubSite/Pages/_Layout.cshtml index 1a87bcd..035c681 100644 --- a/ClubSite/Pages/_Layout.cshtml +++ b/ClubSite/Pages/_Layout.cshtml @@ -23,7 +23,7 @@ @await RenderSectionAsync("head", false) - + @await RenderSectionAsync("styles", false) diff --git a/ClubSite/gulpfile.js b/ClubSite/gulpfile.js index d3a26fb..4888212 100644 --- a/ClubSite/gulpfile.js +++ b/ClubSite/gulpfile.js @@ -29,7 +29,13 @@ gulp.task("min", })) .pipe(gulp.dest("wwwroot/assets/css/fontawesome")); gulp.src("node_modules/@fortawesome/fontawesome-free/webfonts/*") - .pipe(gulp.dest("wwwroot/assets/css/fontawesome/webfonts")); + .pipe(gulp.dest("wwwroot/assets/css/fontawesome/webfonts")); + gulp.src("assets/fonts/fonts-lato-raleway.css") + .pipe(gulp.dest("wwwroot/assets/fonts/")); + gulp.src("assets/fonts/lato/*.woff2") + .pipe(gulp.dest("wwwroot/assets/fonts/lato/")); + gulp.src("assets/fonts/raleway/*.woff2") + .pipe(gulp.dest("wwwroot/assets/fonts/raleway/")); done(); });