Make fork official

NabuCasa · Jun 21, 2021 · 4c85629 · 4c85629
1 parent 9fc0996
commit 4c85629
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,9 +5,11 @@ name: CI
 
 on:
   push:
-    branches: [main, fork]
+    branches:
+      - main
   pull_request:
-    branches: [main, fork]
+    branches:
+      - main
 
 jobs:
   build:

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - fork
 
 jobs:
   update_release_draft:

diff --git a/README.md b/README.md
@@ -10,6 +10,4 @@ A Web Serial package for updating your ESP bootloader via the browser.
 
 ## Fork
 
-This is a fork of [Adafruit WebSerial ESPTool](https://github.com/adafruit/Adafruit_WebSerial_ESPTool). Their repository is a single-use website. This fork converts the code into a reusable package.
-
-The changes of this fork are part of [an open pull request](https://github.com/adafruit/Adafruit_WebSerial_ESPTool/pull/10) upstream. If accepted in a way that it's usable for our projects, we can retire this project.
+This is a fork of [Adafruit WebSerial ESPTool](https://github.com/adafruit/Adafruit_WebSerial_ESPTool). At the time fo the fork, their repository was a single-use website. This fork converted the code into a reusable package and published it to NPM.
diff --git a/css/style.css b/css/style.css
@@ -34,7 +34,8 @@
   color: #000;
 }
 
-button, .firmware {
+button,
+.firmware {
   height: 25px;
   font-size: 16px;
   border-radius: 15px;
@@ -54,7 +55,10 @@ p {
   margin: 0;
 }
 
-input, select, button, label {
+input,
+select,
+button,
+label {
   font-weight: 600;
   outline: none;
 }
@@ -75,12 +79,6 @@ div.clear {
   clear: both;
 }
 
-.Adafruit-Logo {
-  width: 115px;
-  height: 40px;
-  object-fit: contain;
-}
-
 .main {
   overflow-x: hidden;
   overflow-y: auto;
@@ -125,7 +123,8 @@ div.clear {
   height: calc(100vh - 330px);
 }
 
-#commands, #log {
+#commands,
+#log {
   transition: height 0.5s;
 }
 
@@ -144,7 +143,7 @@ div.clear {
   font-size: 16px;
   overflow-x: hidden;
   overflow-x: auto;
-  transition : color 0.1s linear;
+  transition: color 0.1s linear;
   padding: 0 50px;
   border: 20px solid #000;
   -ms-overflow-style: none;
@@ -310,12 +309,12 @@ div.clear {
 }
 
 .firmware > input {
-	width: 0.1px;
-	height: 0.1px;
-	opacity: 0;
-	overflow: hidden;
-	position: absolute;
-	z-index: -1;
+  width: 0.1px;
+  height: 0.1px;
+  opacity: 0;
+  overflow: hidden;
+  position: absolute;
+  z-index: -1;
 }
 
 .firmware {

diff --git a/index.html b/index.html
@@ -46,9 +46,7 @@
   </head>
   <body>
     <header class="header">
-      <div class="left">
-        <!-- <img src="assets/adafruit-logo.svg" class="Adafruit-Logo" /> -->
-      </div>
+      <div class="left"></div>
       <div class="right">
         <select id="baudRate"></select>
         <button id="butConnect" type="button">Connect</button>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esp-web-flasher",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "description": "Flash ESP devices using WebSerial",
   "main": "dist/index.js",
   "repository": "https://github.com/nabucasa/ESP-Web-flasher",