Skip to content

Commit

Permalink
feat(logo): updated to latest atlas logo scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherpickering committed Dec 19, 2023
1 parent b139396 commit 43ffcd9
Show file tree
Hide file tree
Showing 13 changed files with 96 additions and 135 deletions.
11 changes: 10 additions & 1 deletion web/Pages/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,16 @@
<div class="container">
<div class="navbar-brand">
<a class="navbar-item" href="/">
<img src="@Cache.Get("logo")" width="133" height="40" alt="site logo" />
@if(!string.IsNullOrEmpty(Cache.Get<string>("logo")))
{
<img src="@Cache.Get("logo")" width="133" height="40" alt="site logo" />
} else {
<img class="logo" src="/img/atlas-a-logo.svg" width="35" height="35" alt="site logo" />
<h2 class="logo-text">
<span class="logo-text-slash">/</span>
library
</h2>
}
</a>
<a role="button"
class="navbar-burger"
Expand Down
11 changes: 10 additions & 1 deletion web/Pages/Shared/_footer.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,16 @@
<div class="container">
<div class="columns">
<div class="column is-one-third">
<img src="@Cache.Get("logo")" width="133" height="40" alt="site logo" />
<div class="is-flex">@if(!string.IsNullOrEmpty(Cache.Get<string>("logo")))
{
<img src="@Cache.Get("logo")" width="133" height="40" alt="site logo" />
} else {
<img class="logo" src="/img/atlas-a-logo.svg" width="35" height="35" alt="site logo" />
<h2 class="logo-text">
<span class="logo-text-slash">/</span>
library
</h2>
}</div>
<p class="mt-4 mb-2">
@Configuration["footer:subtitle"]
</p>
Expand Down
8 changes: 4 additions & 4 deletions web/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,14 @@ var signingCertificate in entityDescriptor.IdPSsoDescriptor.SigningCertificates
}
catch
{
cache.Set("logo", "/img/thinking-face-text-133x40.png");
cache.Set("logo_path", "wwwroot/img/thinking-face-text-133x40.png");
// cache.Set("logo", "/img/atlas-a-logo.svg");
// cache.Set("logo_path", "wwwroot/img/atlas-a-logo.svg");
}
}
else
{
cache.Set("logo", "/img/thinking-face-text-133x40.png");
cache.Set("logo_path", "wwwroot/img/thinking-face-text-133x40.png");
// cache.Set("logo", "/img/atlas-a-logo.svg");
// cache.Set("logo_path", "wwwroot/img/atlas-a-logo.svg");
}

// set version
Expand Down
2 changes: 1 addition & 1 deletion web/wwwroot/css/site.min.css

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions web/wwwroot/css/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -534,3 +534,36 @@ input.css-collapse {
.css-collapse:checked ~ div ~ .css-collapse-label::before {
content: 'show less';
}

.logo {
min-width: 35px;
min-height: 35px;
background-size: cover;
background-position: center center;
animation-duration: 0.125s;
display: block;
vertical-align: middle;
}

.logo-text {
transition-property: color, background-color, border-color,
text-decoration-color, fill, stroke;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 0.15s;
color: rgb(51 65 85);
font-weight: 500;
font-size: 1.5rem;
line-height: 2rem;
scroll-margin: 5rem;
margin: 0;

&:hover {
color: rgb(15 23 42);
}

.logo-text-slash {
color: rgb(203 213 225);
margin-left: 0.5rem;
margin-right: 0.5rem;
}
}
Binary file modified web/wwwroot/favicon.ico
Binary file not shown.
51 changes: 9 additions & 42 deletions web/wwwroot/font/inter/package.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,9 @@
{
"_from": "@fontsource/inter@^5.0.0",
"_id": "@fontsource/inter@5.0.16",
"_inBundle": false,
"_integrity": "sha512-qF0aH5UiZvCmneX5orJbVRoc2VTyLTV3X/7laMp03Qt28L+B9tFlZODOGUL64wDWc69YVdi1LeJB0cIgd51lvw==",
"_location": "/@fontsource/inter",
"_phantomChildren": {},
"_requested": {
"type": "range",
"registry": true,
"raw": "@fontsource/inter@^5.0.0",
"name": "@fontsource/inter",
"escapedName": "@fontsource%2finter",
"scope": "@fontsource",
"rawSpec": "^5.0.0",
"saveSpec": null,
"fetchSpec": "^5.0.0"
},
"_requiredBy": [
"#DEV:/"
],
"_resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.0.16.tgz",
"_shasum": "b858508cdb56dcbbf3166903122851e2fbd16b50",
"_spec": "@fontsource/inter@^5.0.0",
"_where": "C:\\Users\\Sean-Pickering\\Documents\\SeanSourceCode\\atlaslib\\library",
"author": {
"name": "Google Inc."
},
"bugs": {
"url": "https://github.com/fontsource/font-files/issues"
},
"bundleDependencies": false,
"deprecated": false,
"name": "@fontsource/inter",
"version": "5.0.16",
"description": "Self-host the Inter font in a neatly bundled NPM package.",
"homepage": "https://fontsource.org/fonts/inter",
"main": "index.css",
"publishConfig": {"access": "public"},
"keywords": [
"fontsource",
"font",
Expand All @@ -47,17 +18,13 @@
"typeface",
"variable"
],
"author": "Google Inc.",
"license": "OFL-1.1",
"main": "index.css",
"name": "@fontsource/inter",
"publishConfig": {
"access": "public"
},
"publishHash": "29f83684e243ab2f",
"homepage": "https://fontsource.org/fonts/inter",
"repository": {
"type": "git",
"url": "git+https://github.com/fontsource/font-files.git",
"url": "https://github.com/fontsource/font-files.git",
"directory": "fonts/google/inter"
},
"version": "5.0.16"
}
"publishHash": "29f83684e243ab2f"
}
8 changes: 8 additions & 0 deletions web/wwwroot/font/rasa/latin-ext-300.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/* rasa-latin-ext-300-normal */
@font-face {
font-family: 'Rasa';
font-style: normal;
font-display: swap;
font-weight: 300;
src: url(/font/rasa/files/rasa-latin-ext-300-normal.woff2) format('woff2'), url(/font/rasa/files/rasa-latin-ext-300-normal.woff) format('woff');
}
51 changes: 9 additions & 42 deletions web/wwwroot/font/rasa/package.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,9 @@
{
"_from": "@fontsource/rasa@^5.0.0",
"_id": "@fontsource/rasa@5.0.18",
"_inBundle": false,
"_integrity": "sha512-hYKxVZGbGQRv5k+8vZd/BN2+gFRu2a4ebCDqIxkB0ubbPKQ1BmakQYcmz59ju+AUD8+Q649gi4wzQFp4iJczYw==",
"_location": "/@fontsource/rasa",
"_phantomChildren": {},
"_requested": {
"type": "range",
"registry": true,
"raw": "@fontsource/rasa@^5.0.0",
"name": "@fontsource/rasa",
"escapedName": "@fontsource%2frasa",
"scope": "@fontsource",
"rawSpec": "^5.0.0",
"saveSpec": null,
"fetchSpec": "^5.0.0"
},
"_requiredBy": [
"#DEV:/"
],
"_resolved": "https://registry.npmjs.org/@fontsource/rasa/-/rasa-5.0.18.tgz",
"_shasum": "b2d2be0c29e64dc657c162ec374bfcf9b3092706",
"_spec": "@fontsource/rasa@^5.0.0",
"_where": "C:\\Users\\Sean-Pickering\\Documents\\SeanSourceCode\\atlaslib\\library",
"author": {
"name": "Google Inc."
},
"bugs": {
"url": "https://github.com/fontsource/font-files/issues"
},
"bundleDependencies": false,
"deprecated": false,
"name": "@fontsource/rasa",
"version": "5.0.18",
"description": "Self-host the Rasa font in a neatly bundled NPM package.",
"homepage": "https://fontsource.org/fonts/rasa",
"main": "index.css",
"publishConfig": {"access": "public"},
"keywords": [
"fontsource",
"font",
Expand All @@ -47,17 +18,13 @@
"typeface",
"variable"
],
"author": "Google Inc.",
"license": "OFL-1.1",
"main": "index.css",
"name": "@fontsource/rasa",
"publishConfig": {
"access": "public"
},
"publishHash": "afc800b4cafba8c2",
"homepage": "https://fontsource.org/fonts/rasa",
"repository": {
"type": "git",
"url": "git+https://github.com/fontsource/font-files.git",
"url": "https://github.com/fontsource/font-files.git",
"directory": "fonts/google/rasa"
},
"version": "5.0.18"
}
"publishHash": "afc800b4cafba8c2"
}
51 changes: 9 additions & 42 deletions web/wwwroot/font/source-code-pro/package.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,9 @@
{
"_from": "@fontsource/source-code-pro@^5.0.0",
"_id": "@fontsource/source-code-pro@5.0.16",
"_inBundle": false,
"_integrity": "sha512-ErErGXjKo9/fAJE49fyU8M6DuJUpdqR5YLM8jGJOC5ZcKIDSTQ5m+R3DTa0VYHAGGFbk2qLWVWD/r5sfCLA/jQ==",
"_location": "/@fontsource/source-code-pro",
"_phantomChildren": {},
"_requested": {
"type": "range",
"registry": true,
"raw": "@fontsource/source-code-pro@^5.0.0",
"name": "@fontsource/source-code-pro",
"escapedName": "@fontsource%2fsource-code-pro",
"scope": "@fontsource",
"rawSpec": "^5.0.0",
"saveSpec": null,
"fetchSpec": "^5.0.0"
},
"_requiredBy": [
"#DEV:/"
],
"_resolved": "https://registry.npmjs.org/@fontsource/source-code-pro/-/source-code-pro-5.0.16.tgz",
"_shasum": "5943c67cfec5493b0f1a5bc416e14ab7d5ebe760",
"_spec": "@fontsource/source-code-pro@^5.0.0",
"_where": "C:\\Users\\Sean-Pickering\\Documents\\SeanSourceCode\\atlaslib\\library",
"author": {
"name": "Google Inc."
},
"bugs": {
"url": "https://github.com/fontsource/font-files/issues"
},
"bundleDependencies": false,
"deprecated": false,
"name": "@fontsource/source-code-pro",
"version": "5.0.16",
"description": "Self-host the Source Code Pro font in a neatly bundled NPM package.",
"homepage": "https://fontsource.org/fonts/source-code-pro",
"main": "index.css",
"publishConfig": {"access": "public"},
"keywords": [
"fontsource",
"font",
Expand All @@ -47,17 +18,13 @@
"typeface",
"variable"
],
"author": "Google Inc.",
"license": "OFL-1.1",
"main": "index.css",
"name": "@fontsource/source-code-pro",
"publishConfig": {
"access": "public"
},
"publishHash": "701718a828c04410",
"homepage": "https://fontsource.org/fonts/source-code-pro",
"repository": {
"type": "git",
"url": "git+https://github.com/fontsource/font-files.git",
"url": "https://github.com/fontsource/font-files.git",
"directory": "fonts/google/source-code-pro"
},
"version": "5.0.16"
}
"publishHash": "701718a828c04410"
}
1 change: 1 addition & 0 deletions web/wwwroot/img/atlas-a-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion web/wwwroot/js/analytics.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/wwwroot/js/profile.min.js

Large diffs are not rendered by default.

0 comments on commit 43ffcd9

Please sign in to comment.