Skip to content

Commit

Permalink
Merge pull request #9 from ful1e5/dev
Browse files Browse the repository at this point in the history
🚀 GoogleDot v1.1.1
  • Loading branch information
ful1e5 authored Mar 29, 2021
2 parents afd6197 + 58a2cb7 commit 17c14ed
Show file tree
Hide file tree
Showing 19 changed files with 439 additions and 396 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ jobs:
- name: Compressing UNIX theme
run: |
tar -cvzf GoogleDot-Blue.tar.gz themes/GoogleDot-Blue
tar -cvzf GoogleDot-Black.tar.gz themes/GoogleDot-Blue
tar -cvzf GoogleDot-Black.tar.gz themes/GoogleDot-Black
tar -cvzf GoogleDot-White.tar.gz themes/GoogleDot-White
- name: Uploading `bitmaps` artifact
uses: actions/upload-artifact@v2
Expand All @@ -76,6 +77,12 @@ jobs:
name: GoogleDot-Black
path: GoogleDot-Black.tar.gz

- name: Uploading `GoogleDot-White` UNIX Theme artifact
uses: actions/upload-artifact@v2
with:
name: GoogleDot-White
path: GoogleDot-White.tar.gz

- name: Uploading `GoogleDot-Blue` Windows Theme artifact
uses: actions/upload-artifact@v2
with:
Expand All @@ -87,3 +94,9 @@ jobs:
with:
name: GoogleDot-Black-Windows
path: themes/GoogleDot-Black-Windows/*

- name: Uploading `GoogleDot-White` Windows Theme artifact
uses: actions/upload-artifact@v2
with:
name: GoogleDot-White-Windows
path: themes/GoogleDot-White-Windows/*
21 changes: 20 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [unreleased]

## [v1.1.1] - 29 Mar 2021

### Added

- **GoogleDot White** version added
- Clean `builder` cache on every build (supported in `Makefile`)
- Dynamic build using **Make variables** inside `builder/Makefile`
- **2-Space** format for `bitmapper`
- Sphinx `reST` docstring in `builder/gbpkg`

### Changed

- GoogleDot logo updated with white split
- Preview section updated in **[README.md](./README.md)**
- gbpkg supports **clickgen v1.1.9**
- Install `gbpkg` builder python package as user
- Removed python3 `virtualenv` commands from `builder/Makefile`

## [v1.1.0] - 08 Mar 2021

### Added
Expand Down Expand Up @@ -49,7 +67,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Logo and badges
- CI/CD Pipelines

[unreleased]: https://github.com/ful1e5/Google_Cursor/compare/v1.1.0...main
[unreleased]: https://github.com/ful1e5/Google_Cursor/compare/v1.1.1...main
[v1.1.1]: https://github.com/ful1e5/Google_Cursor/compare/v1.1.0...v1.1.1
[v1.1.0]: https://github.com/ful1e5/Google_Cursor/compare/v1.0.1...v1.1.0
[v1.0.1]: https://github.com/ful1e5/Google_Cursor/compare/v1.0.0...v1.0.1
[v1.0.0]: https://github.com/ful1e5/Google_Cursor/tree/v1.0.0
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ root_dest := $(root)/$(theme)
all: clean render build

unix: clean render bitmaps
@cd builder && make build_unix
@cd builder && make build_unix clean

windows: clean render bitmaps
@cd builder && make build_windows
@cd builder && make build_windows clean

.PHONY: all

Expand All @@ -24,7 +24,7 @@ render: bitmapper svg
@cd bitmapper && $(MAKE)

build: bitmaps
@cd builder && $(MAKE)
@cd builder && make build clean

.ONESHELL:
SHELL:=/bin/bash
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center">
<img src="https://imgur.com/iiTtLiJ.png" width="120" alt="GoogleDot" />
<img src="https://i.imgur.com/kiQMiUy.png" width="120" alt="GoogleDot" />
</p>

<p align="center">
Expand Down Expand Up @@ -114,7 +114,13 @@ Cursor theme inspired on **google material design** for `Windows` and `Linux` wi
<p align="center">
<img title="GoogleDot Black" src="https://i.imgur.com/9ZlC1gD.png">
</br>
<sub>BlackBlue GoogleDot Cursors 🍭</sub>
<sub>Black GoogleDot Cursors 🍭</sub>
</p>

<p align="center">
<img title="GoogleDot White" src="https://i.imgur.com/67KgJ3s.png">
</br>
<sub>White GoogleDot Cursors 🍭</sub>
</p>

### Manual Install
Expand Down
60 changes: 30 additions & 30 deletions bitmapper/package.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
{
"name": "google_cursor",
"version": "1.1.0",
"description": "🍭 Cursor theme inspired on Google",
"main": "index.js",
"repository": "[email protected]:ful1e5/Google_Cursor.git",
"author": "Kaiz Khatri",
"license": "GPL-3.0",
"private": true,
"scripts": {
"clean": "rm -rf bitmaps themes",
"dev": "nodemon src/index.ts",
"watch": "nodemon --inspect src/index.ts",
"py_install": "pip install -r requirements.txt",
"render": "npx ts-node src/index.ts",
"build": "python build.py",
"compile": "yarn clean && yarn render && yarn build"
},
"devDependencies": {
"@types/pixelmatch": "^5.2.2",
"@types/pngjs": "^3.4.2",
"@types/puppeteer": "^5.4.2",
"nodemon": "^2.0.7",
"ts-node": "^9.1.1",
"typescript": "^4.1.3"
},
"dependencies": {
"pixelmatch": "^5.2.1",
"pngjs": "^6.0.0",
"puppeteer": "^5.5.0"
}
"name": "google_cursor",
"version": "1.1.1",
"description": "🍭 Cursor theme inspired on Google",
"main": "index.js",
"repository": "[email protected]:ful1e5/Google_Cursor.git",
"author": "Kaiz Khatri",
"license": "GPL-3.0",
"private": true,
"scripts": {
"clean": "rm -rf bitmaps themes",
"dev": "nodemon src/index.ts",
"watch": "nodemon --inspect src/index.ts",
"py_install": "pip install -r requirements.txt",
"render": "npx ts-node src/index.ts",
"build": "python build.py",
"compile": "yarn clean && yarn render && yarn build"
},
"devDependencies": {
"@types/pixelmatch": "^5.2.2",
"@types/pngjs": "^3.4.2",
"@types/puppeteer": "^5.4.2",
"nodemon": "^2.0.7",
"ts-node": "^9.1.1",
"typescript": "^4.1.3"
},
"dependencies": {
"pixelmatch": "^5.2.1",
"pngjs": "^6.0.0",
"puppeteer": "^5.5.0"
}
}
39 changes: 23 additions & 16 deletions bitmapper/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,36 @@
import { Colors } from "./core/types";

interface Config {
themeName: string;
color: Colors;
themeName: string;
color: Colors;
}

const black = "#000000";
const blue = "#4285F4";
const white = "#FFFFFF";

const config: Config[] = [
{
themeName: "GoogleDot-Blue",
color: {
base: blue,
outline: white,
},
},
{
themeName: "GoogleDot-Black",
color: {
base: black,
outline: white,
},
},
{
themeName: "GoogleDot-Blue",
color: {
base: blue,
outline: white,
},
},
{
themeName: "GoogleDot-Black",
color: {
base: black,
outline: white,
},
},
{
themeName: "GoogleDot-White",
color: {
base: white,
outline: black,
},
},
];

export { config };
Loading

0 comments on commit 17c14ed

Please sign in to comment.