Skip to content

Commit

Permalink
Update deprecated build code (#176)
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonPuglisi authored Nov 10, 2024
1 parent 60d7982 commit ea09e2a
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 37 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/deploy-app-engine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Deploy to GCP App Engine

on:
push:
branches:
- main
pull_request:

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "descent",
"version": "1.8.12",
"version": "1.8.13",
"description": "Elegant now playing display for Last.fm showing song metadata and local weather.",
"keywords": [
"descent",
Expand Down
24 changes: 13 additions & 11 deletions source/scss/_typography.scss
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
@use "variables";

/* Font families */

.font-default {
color: $primary-color-text;
color: variables.$primary-color-text;
font-family: 'Open Sans', Arial, sans-serif;
font-weight: 400;
}

.font-heading {
color: $primary-color-text;
color: variables.$primary-color-text;
font-family: 'Oswald', 'Open Sans', Arial, sans-serif;
font-weight: 700;
}

.font-subheading {
color: $primary-color-text;
color: variables.$primary-color-text;
font-family: 'Noto Serif', Georgia, serif;
font-weight: 400;
}

.font-code {
color: $primary-color-text;
color: variables.$primary-color-text;
font-family: 'Source Code Pro', monospace;
font-weight: 400;
}

/* Links */

a {
color: $primary-color-text;
color: variables.$primary-color-text;
opacity: .8;
text-decoration: none;
transition: opacity .2s linear;
Expand All @@ -54,18 +56,18 @@ input {
@extend .font-default;

background-color: transparent;
border-color: $primary-color-text;
border-color: variables.$primary-color-text;
border-radius: 0px;
border-style: none none solid none;
border-width: 0.1em;
box-shadow: 0em 0.15em $absolute-black;
color: $primary-color-text;
box-shadow: 0em 0.15em variables.$absolute-black;
color: variables.$primary-color-text;
font-size: 1em;
letter-spacing: 0.015em;
}

input::placeholder {
color: $primary-color-text;
color: variables.$primary-color-text;
opacity: 0.3;
}

Expand All @@ -92,9 +94,9 @@ b {
body {
@extend .font-default;

background-color: $black;
background-color: variables.$black;
}

::selection {
background: $primary-color-light;
background: variables.$primary-color-light;
}
6 changes: 5 additions & 1 deletion source/scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/* Sass imports */

@use 'sass:color';

/* Color palette */

$purple: #a497ff;
Expand All @@ -20,4 +24,4 @@ $primary-color: $purple;
$primary-color-light: $purple-light;
$primary-color-placeholder: $purple-gray;
$primary-color-text: $white;
$primary-color-dull: darken($primary-color-text, 30);
$primary-color-dull: color.adjust($primary-color-text, $lightness: -30%);
27 changes: 14 additions & 13 deletions source/scss/config.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* Sass imports */

@import 'reset';
@import 'variables';
@import 'typography';
@use 'sass:color';
@use 'reset';
@use 'variables';
@use 'typography';

/* Layout styles */

Expand Down Expand Up @@ -49,12 +50,12 @@ i.fas.fa-circle-notch {
/* Layout styles */

.selectGroup {
background-color: $gray;
border-color: $primary-color-text;
background-color: variables.$gray;
border-color: variables.$primary-color-text;
border-radius: 0.2em;
border-style: solid;
border-width: 0.1em;
box-shadow: 0.2em 0.3em darken($black, 10);
box-shadow: 0.2em 0.3em color.adjust(variables.$black, $lightness: -10%);
cursor: pointer;
display: inline-block;
margin: 0.7em 1.4em 0.7em 0;
Expand All @@ -63,18 +64,18 @@ i.fas.fa-circle-notch {
}

.selectGroup:hover, .selectGroup:active {
background-color: $primary-color-light;
box-shadow: 0.15em 0.2em darken($black, 10);
color: $black;
background-color: variables.$primary-color-light;
box-shadow: 0.15em 0.2em color.adjust(variables.$black, $lightness: -10%);
color: variables.$black;
}

.selectGroup.selected {
background-color: $primary-color;
box-shadow: 0.15em 0.2em darken($black, 10);
background-color: variables.$primary-color;
box-shadow: 0.15em 0.2em color.adjust(variables.$black, $lightness: -10%);
}

.selectGroup.selected:hover, .selectGroup.selected:active {
color: $primary-color-text;
color: variables.$primary-color-text;
}

.selectGroupsLoading {
Expand All @@ -90,7 +91,7 @@ i.fas.fa-circle-notch {
}

.coordinateNotice, .scrobbleNotice {
color: $primary-color-dull;
color: variables.$primary-color-dull;
padding: 0 0 0.5em 0;
font-size: 0.85em;
}
6 changes: 3 additions & 3 deletions source/scss/landing.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* Sass imports */

@import 'reset';
@import 'variables';
@import 'typography';
@use 'reset';
@use 'variables';
@use 'typography';

/* Layout styles */

Expand Down
12 changes: 6 additions & 6 deletions source/scss/now.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* Sass imports */

@import 'reset';
@import 'variables';
@import 'typography';
@use 'reset';
@use 'variables';
@use 'typography';

/* Typography styles */

Expand All @@ -22,7 +22,7 @@ h2 {
}

.apparent {
color: $light-gray;
color: variables.$light-gray;
font-size: 0.75em;
}

Expand All @@ -39,7 +39,7 @@ h2 {
}

.scrobbles, .detailedScrobbles {
color: $light-gray;
color: variables.$light-gray;
font-size: 0.6em;
margin-bottom: 0.3em;
}
Expand Down Expand Up @@ -68,7 +68,7 @@ h2 {
}

.container {
background-color: $background-mask;
background-color: variables.$background-mask;
display: flex;
flex-direction: column;
height: calc(100vh - 4em);
Expand Down

0 comments on commit ea09e2a

Please sign in to comment.