Skip to content

Commit

Permalink
Merge branch 'feature/popup-rewrites'
Browse files Browse the repository at this point in the history
  • Loading branch information
kepi committed May 29, 2022
2 parents 2c5bb26 + d4c33f1 commit 0228abd
Show file tree
Hide file tree
Showing 25 changed files with 7,730 additions and 7,162 deletions.
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ inc/jPicker/images/Thumbs.db
.idea/*
dist
node_modules
yarn-error.log
.log/*
size-plugin.json
# yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
1 change: 1 addition & 0 deletions .prod.size.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"timestamp":1653589573028,"files":[{"filename":"popup.js","previous":9893,"size":3315,"diff":-6578},{"filename":"options.js","previous":479,"size":479,"diff":0},{"filename":"plus.js","previous":367,"size":367,"diff":0},{"filename":"background.js","previous":2592,"size":2599,"diff":7},{"filename":"edropper2.js","previous":4723,"size":4724,"diff":1},{"filename":"debug_tab.js","previous":221,"size":221,"diff":0},{"filename":"options2.js","previous":1039,"size":0,"diff":-1039},{"filename":"vendor.js","previous":49802,"size":0,"diff":-49802}]},{"timestamp":1616630487979,"files":[{"filename":"popup.js","previous":3315,"size":9893,"diff":6578},{"filename":"options.js","previous":479,"size":479,"diff":0},{"filename":"plus.js","previous":367,"size":367,"diff":0},{"filename":"background.js","previous":2644,"size":2592,"diff":-52},{"filename":"edropper2.js","previous":4196,"size":4723,"diff":527},{"filename":"debug_tab.js","previous":221,"size":221,"diff":0},{"filename":"options2.js","previous":0,"size":1039,"diff":1039},{"filename":"vendor.js","previous":0,"size":49802,"diff":49802}]},{"timestamp":1616425384505,"files":[{"filename":"popup.js","previous":3309,"size":3315,"diff":6},{"filename":"options.js","previous":479,"size":479,"diff":0},{"filename":"plus.js","previous":367,"size":367,"diff":0},{"filename":"background.js","previous":2644,"size":2644,"diff":0},{"filename":"edropper2.js","previous":4196,"size":4196,"diff":0},{"filename":"debug_tab.js","previous":221,"size":221,"diff":0}]},{"timestamp":1616376693932,"files":[{"filename":"popup.js","previous":0,"size":3309,"diff":3309},{"filename":"options.js","previous":0,"size":479,"diff":479},{"filename":"plus.js","previous":0,"size":367,"diff":367},{"filename":"background.js","previous":0,"size":2644,"diff":2644},{"filename":"edropper2.js","previous":0,"size":4196,"diff":4196},{"filename":"debug_tab.js","previous":0,"size":221,"diff":221}]}]
546 changes: 546 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

786 changes: 786 additions & 0 deletions .yarn/releases/yarn-3.2.1.cjs

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.2.1.cjs
40 changes: 22 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,32 @@
"url": "https://github.com/kepi/chromeEyeDropper.git"
},
"devDependencies": {
"@types/chrome": "0.0.133",
"@types/jest": "^26.0.21",
"@typescript-eslint/eslint-plugin": "^4.18.0",
"@typescript-eslint/parser": "^4.18.0",
"bestzip": "^2.1.5",
"copy-webpack-plugin": "^8.0.0",
"eslint": "^7.22.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-prettier": "^3.1.3",
"jest": "^26.6.3",
"prettier": "^2.0.4",
"@types/chrome": "0.0.188",
"@types/jest": "^27.5.1",
"@typescript-eslint/eslint-plugin": "^5.26.0",
"@typescript-eslint/parser": "^5.26.0",
"bestzip": "^2.2.1",
"copy-webpack-plugin": "^11.0.0",
"eslint": "^8.16.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.0.0",
"jest": "^28.1.0",
"prettier": "^2.6.2",
"replace-in-file-webpack-plugin": "^1.0.6",
"rimraf": "^3.0.2",
"size-plugin": "^2.0.2",
"ts-jest": "^26.5.4",
"ts-loader": "^8.0.18",
"typescript": "^4.2.3",
"webpack": "^5.27.1",
"webpack-cli": "^4.5.0",
"webpack-merge": "^5.7.3"
"ts-jest": "^28.0.3",
"ts-loader": "^9.3.0",
"typescript": "^4.7.2",
"webpack": "^5.72.1",
"webpack-cli": "^4.9.2",
"webpack-merge": "^5.8.0"
},
"packageManager": "[email protected]",
"dependencies": {
"color": "^3.1.3"
"@ctrl/tinycolor": "^3.4.1",
"hint.css": "^2.7.0",
"medium-style-confirm": "^0.4.6",
"simple-color-picker": "^1.0.5"
}
}
18 changes: 9 additions & 9 deletions public/button-about.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div id="tab-about-content" class="content-page tc">
<h1 class="black-90">Credits</h1>

<p><em class="text-muted">Version @versionname</em></p>
<p><em class="text-muted">Version @versionname</em> (<a class="ed-external link" href="#" data-url="https://eyedropper.org/changelog">changelog</a>)</p>

<div class="cf">
<div class="fl w-50 tc">
<h3>Author</h3>
<div>
<a class="ed-external link" href="#" data-url="http://kepi.cz/">
<a class="ed-external link" href="#" data-url="https://kepi.cz/">
<img class="dib br-100 br1 v-mid" src="/inc/kepi.jpg" />
<span class="dib ml2">Ondra Kudlík (Kepi)</span>
</a>
Expand Down Expand Up @@ -45,12 +45,12 @@ <h3>Eye Dropper is using these awesome libraries</h3>

<ul class="list pl0">
<li>
<a class="ed-external link" href="#" data-url="https://github.com/tovic/color-picker"
>Color Picker</a
<a class="ed-external link" href="#" data-url="https://github.com/superguigui/simple-color-picker"
>simple-color-picker</a
>
by
<a class="ed-external link" href="#" data-url="https://github.com/tovic"
>Taufik Nurrohman (tovic)</a
<a class="ed-external link" href="#" data-url="https://guillaumegouessan.com"
>Guillaume Gouessan (superguigui)</a
>
</li>
<li>
Expand All @@ -69,10 +69,10 @@ <h3>Eye Dropper is using these awesome libraries</h3>
<a
class="ed-external link"
href="#"
data-url="https://bitbucket.org/bcronin/pusher.color.git"
>pusher.color.js</a
data-url="https://github.com/scttcper/tinycolor"
>tinycolor</a
>
by PusherTech
by Scott Cooper
</li>
<li>
<a
Expand Down
Loading

0 comments on commit 0228abd

Please sign in to comment.