Selaa lähdekoodia

nav logo & outline styling, brand font "alegreya"

Christian Kahlau 4 vuotta sitten
vanhempi
commit
0e171d6763

BIN
docs/Alegreya-Font/Alegreya-Italic-VariableFont_wght.ttf


BIN
docs/Alegreya-Font/Alegreya-VariableFont_wght.ttf


+ 93 - 0
docs/Alegreya-Font/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2011 The Alegreya Project Authors (https://github.com/huertatipografica/Alegreya)
+
+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.

+ 75 - 0
docs/Alegreya-Font/README.txt

@@ -0,0 +1,75 @@
+Alegreya Variable Font
+======================
+
+This download contains Alegreya as both variable fonts and static fonts.
+
+Alegreya is a variable font with this axis:
+  wght
+
+This means all the styles are contained in these files:
+  Alegreya-VariableFont_wght.ttf
+  Alegreya-Italic-VariableFont_wght.ttf
+
+If your app fully supports variable fonts, you can now pick intermediate styles
+that aren’t available as static fonts. Not all apps support variable fonts, and
+in those cases you can use the static font files for Alegreya:
+  static/Alegreya-Regular.ttf
+  static/Alegreya-Medium.ttf
+  static/Alegreya-SemiBold.ttf
+  static/Alegreya-Bold.ttf
+  static/Alegreya-ExtraBold.ttf
+  static/Alegreya-Black.ttf
+  static/Alegreya-Italic.ttf
+  static/Alegreya-MediumItalic.ttf
+  static/Alegreya-SemiBoldItalic.ttf
+  static/Alegreya-BoldItalic.ttf
+  static/Alegreya-ExtraBoldItalic.ttf
+  static/Alegreya-BlackItalic.ttf
+
+Get started
+-----------
+
+1. Install the font files you want to use
+
+2. Use your app's font picker to view the font family and all the
+available styles
+
+Learn more about variable fonts
+-------------------------------
+
+  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
+  https://variablefonts.typenetwork.com
+  https://medium.com/variable-fonts
+
+In desktop apps
+
+  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
+  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
+
+Online
+
+  https://developers.google.com/fonts/docs/getting_started
+  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
+  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
+
+Installing fonts
+
+  MacOS: https://support.apple.com/en-us/HT201749
+  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
+  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
+
+Android Apps
+
+  https://developers.google.com/fonts/docs/android
+  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
+
+License
+-------
+Please read the full license text (OFL.txt) to understand the permissions,
+restrictions and requirements for usage, redistribution, and modification.
+
+You can use them freely in your products & projects - print or digital,
+commercial or otherwise.
+
+This isn't legal advice, please consider consulting a lawyer and see the full
+license for all details.

BIN
docs/Alegreya-Font/static/Alegreya-Black.ttf


BIN
docs/Alegreya-Font/static/Alegreya-BlackItalic.ttf


BIN
docs/Alegreya-Font/static/Alegreya-Bold.ttf


BIN
docs/Alegreya-Font/static/Alegreya-BoldItalic.ttf


BIN
docs/Alegreya-Font/static/Alegreya-ExtraBold.ttf


BIN
docs/Alegreya-Font/static/Alegreya-ExtraBoldItalic.ttf


BIN
docs/Alegreya-Font/static/Alegreya-Italic.ttf


BIN
docs/Alegreya-Font/static/Alegreya-Medium.ttf


BIN
docs/Alegreya-Font/static/Alegreya-MediumItalic.ttf


BIN
docs/Alegreya-Font/static/Alegreya-Regular.ttf


BIN
docs/Alegreya-Font/static/Alegreya-SemiBold.ttf


BIN
docs/Alegreya-Font/static/Alegreya-SemiBoldItalic.ttf


BIN
font/Alegreya-Italic-VariableFont_wght.ttf


BIN
font/Alegreya-VariableFont_wght.ttf


+ 69 - 10
scss/_navbar.scss

@@ -1,3 +1,4 @@
+@use 'sass:math';
 // Contents
 //
 // Navbar
@@ -26,6 +27,8 @@
   @include gradient-bg();
 
   margin-top: 1.5rem + $navbar-padding-y;
+  outline-offset: 0.5rem;
+  outline: 1px solid $light;
 
   // Because flex properties aren't inherited, we need to redeclare these first
   // few properties so that content nested within behave properly.
@@ -53,24 +56,55 @@
 //
 // Used for brand, project, or site names.
 
+@font-face {
+  font-family: 'Alegreya';
+  src: url(../font/Alegreya-VariableFont_wght.ttf);
+}
+
+@font-face {
+  font-family: 'Alegreya-Italic';
+  src: url(../font/Alegreya-Italic-VariableFont_wght.ttf);
+}
+
 .navbar-brand {
   &.navbar-brand-logo {
-    margin-left: $navbar-brand-margin-end;
+    margin-left: $navbar-brand-margin-end * 2;
     padding-left: 120px;
+    font-family: 'Alegreya', 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+    font-weight: bolder;
+    color: $primary !important;
+    font-size: 2rem;
 
     &::before {
+      content: ' ';
+      display: inline-block;
+      width: 120px;
+      height: 110px;
+      position: absolute;
+      left: 0;
+      margin-left: math.div($navbar-brand-margin-end, 2);
+      top: 50%;
+      transform: translate(0, -50%);
+      background-color: $body-bg;
+      border-radius: 50%;
+      border: math.div($navbar-brand-margin-end, 2) solid $body-bg;
+      box-sizing: content-box;
+    }
+
+    &::after {
       content: ' ';
       background-image: url('../img/hbbq_logo.png');
       display: inline-block;
+      position: absolute;
+      top: 50%;
+      left: 0;
       width: 120px;
       height: 120px;
+      transform: translate(0, -50%);
       background-size: contain;
       background-repeat: no-repeat;
       background-position: center;
-      position: absolute;
-      left: 0.5rem;
-      top: 50%;
-      transform: translate(0, -50%);
+      margin-left: $navbar-brand-margin-end;
       border-bottom-left-radius: 50%;
       border-bottom-right-radius: 50%;
       border-bottom-style: dotted;
@@ -107,9 +141,9 @@
     padding-left: 0;
   }
 
-  .dropdown-menu {
-    position: static;
-  }
+  // .dropdown-menu {
+  //   position: static;
+  // }
 }
 
 // Navbar text
@@ -135,6 +169,21 @@
   // For always expanded or extra full navbars, ensure content aligns itself
   // properly vertically. Can be easily overridden with flex utilities.
   align-items: center;
+
+  .navbar-nav {
+    align-items: flex-end;
+    flex-direction: row;
+    justify-content: space-between;
+
+    .nav-item {
+      padding-left: $navbar-brand-margin-end;
+
+      .nav-link {
+        padding-right: 0.5rem;
+        padding-left: 0.5rem;
+      }
+    }
+  }
 }
 
 // Button for toggling the navbar when in its collapsed state
@@ -142,13 +191,15 @@
   padding: $navbar-toggler-padding-y $navbar-toggler-padding-x;
   @include font-size($navbar-toggler-font-size);
   line-height: 1;
-  background-color: transparent; // remove default button style
-  border: $border-width solid transparent; // remove default button style
+  background-color: $white; // transparent; // remove default button style
+  opacity: 0.8;
+  border: 0; // $border-width solid transparent; // remove default button style
   @include border-radius($navbar-toggler-border-radius);
   @include transition($navbar-toggler-transition);
 
   &:hover {
     text-decoration: none;
+    opacity: 1;
   }
 
   &:focus {
@@ -229,6 +280,14 @@
   .navbar-brand {
     color: $navbar-light-brand-color;
 
+    @media (max-width: 992px) {
+      flex: 1;
+      font-size: calc(1.375rem + 1.5vw);
+      white-space: nowrap;
+      overflow-x: hidden;
+      text-overflow: ellipsis;
+    }
+
     &:hover,
     &:focus {
       color: $navbar-light-brand-hover-color;