Merge branch 'master' into SupportSDK5

smirko-dev · Oct 2, 2021 · b31c059 · b31c059
2 parents 96551e3 + 53fcf21
commit b31c059
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/CodeQL.yml b/.github/workflows/CodeQL.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: '41 16 * * 4'
 

diff --git a/.github/workflows/FitbitBuild.yml b/.github/workflows/FitbitBuild.yml
@@ -5,9 +5,9 @@ name: FitbitBuild
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
   workflow_dispatch:
 
 jobs:

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![](https://img.shields.io/badge/Fitbit%20App%20Gallery-%2300B0B9?style=flat&logo=fitbit&logoColor=white)](https://gallery.fitbit.com/details/ae441b73-2660-407f-b796-a98d1d0583a0)
 ![languages](https://img.shields.io/badge/languages-JavaScript%20|%20CSS-blue)
 ![platform](https://img.shields.io/badge/platforms-Ionic%20|%20Versa%20|%20Versa%202%20|%20Versa%20Lite%20|%20Vers%203%20|%20Sense-silver)
-![version](https://img.shields.io/badge/version-%201.5.0-green)
+![version](https://img.shields.io/badge/version-%201.5.1-green)
 [![](https://img.shields.io/github/license/smirko-dev/fitbit-clockface.svg)](https://github.com/smirko-dev/fitbit-clockface/blob/master/LICENSE)
 [![FitbitBuild Actions Status](https://github.com/smirko-dev/fitbit-clockface/workflows/FitbitBuild/badge.svg)](https://github.com/smirko-dev/fitbit-clockface/actions)
 [![CodeQL Actions Status](https://github.com/smirko-dev/fitbit-clockface/workflows/CodeQL/badge.svg)](https://github.com/smirko-dev/fitbit-clockface/actions)

diff --git a/package.sdk4.json b/package.sdk4.json
@@ -1,9 +1,9 @@
 {
   "name": "compactclock",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "license": "MIT",
   "devDependencies": {
-    "@fitbit/sdk": "~4.2.0",
+    "@fitbit/sdk": "~4.3.0",
     "@fitbit/sdk-cli": "^1.7.3"
   },
   "bugs": {

diff --git a/resources/styles.sdk4.css b/resources/styles.sdk4.css
@@ -24,7 +24,7 @@
 
 #dateLabel {
   font-size: 20;
-  font-family: Colfax-Light;
+  font-family: Colfax-Regular;
   text-length: 32;
   text-anchor: start;
   x: 0%;
@@ -34,7 +34,7 @@
 
 #appointmentsLabel {
   font-size: 28;
-  font-family: Colfax-Light;
+  font-family: Colfax-Regular;
   text-length: 128;
   text-anchor: start;
   x: 0%;
@@ -45,7 +45,7 @@
 
 #batteryLabel {
   font-size: 20;
-  font-family: Colfax-Light;
+  font-family: Colfax-Regular;
   text-length: 32;
   text-anchor: start;
   x: 85%;
@@ -55,7 +55,7 @@
 
 #activityLabel {
   font-size: 28;
-  font-family: Colfax-Light;
+  font-family: Colfax-Regular;
   text-length: 32;
   text-anchor: start;
   x: 35%+30;