Skip to content

Commit

Permalink
Merge pull request #23 from wiemanboy/feature/fix-dm-menu
Browse files Browse the repository at this point in the history
Fix dm menu docs and release workflow
  • Loading branch information
wiemanboy authored Sep 20, 2024
2 parents a2e6558 + cd07b94 commit 11da984
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 65 deletions.
Binary file modified .github/assets/DmIcons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
103 changes: 49 additions & 54 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
@@ -1,60 +1,55 @@
name: Compile source code and release
env:
OUTPUT_BRANCH: release
OUTPUT: wiemantheme.theme.css
OUTPUT_BRANCH: release
OUTPUT: wiemantheme.theme.css

on:
push:
branches:
- master
push:
branches:
- master

jobs:
build-and-release:
runs-on: ubuntu-latest

steps:
- name: Checkout source code
uses: actions/checkout@v4

- name: Install dependencies
run: npm install

- name: Compile SCSS
run: npm run compile -- name="${{ github.event.repository.name }}" author="${{ github.repository_owner }}" description="${{ vars.DESCRIPTION }}" source="${{ github.repositoryUrl }}"

- name: Get version from package.json
id: get_version
run: |
VERSION=$(jq -r '.version' package.json)
echo "Version: $VERSION"
echo "::set-output name=result::$VERSION"
- name: Commit changes
run: |
git config --global user.name 'wiemanboy'
git config --global user.email '[email protected]'
git checkout -b $OUTPUT_BRANCH
rm -rf .github
rm -rf node_modules
rm -rf src
rm -rf .gitignore
rm -rf .prettierrc.json
rm -rf package.json
rm -rf package-lock.json
rm -rf README.md
rm -rf $OUTPUT.map
git add .
git commit -m "Compile SCSS"
git push -f origin $OUTPUT_BRANCH
- name: Create release
uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: "${{ secrets.TOKEN }}"
automatic_release_tag: ${{ steps.get_version.outputs.result }}
prerelease: false
title: "${{ github.event.repository.name }} v${{ steps.get_version.outputs.result }}"
files: ${{ env.OUTPUT }}
build:
runs-on: ubuntu-latest

steps:
- name: Checkout source code
uses: actions/checkout@v4

- name: Install dependencies
run: npm install

- name: Compile SCSS
run: npm run compile -- name="${{ github.event.repository.name }}" author="${{ github.repository_owner }}" description="${{ vars.DESCRIPTION }}" source="${{ github.repositoryUrl }}"

release:
runs-on: ubuntu-latest

steps:
- name: Get version from package.json
id: get_version
run: |
VERSION=$(jq -r '.version' package.json)
echo "Version: $VERSION"
echo "::set-output name=result::$VERSION"
- name: Commit changes
run: |
git config --global user.name ${{ github.triggering_actor }}.
git config --global user.email ${{ github.triggering_actor }}@gmail.com
git checkout -b $OUTPUT_BRANCH
find . -type f ! -name $OUTPUT -delete
git add .
git commit -m "Compile ${{ github.event.repository.name }} SCSS v${{ steps.get_version.outputs.result }} build #${{ github.run_number }}"
git push -f origin $OUTPUT_BRANCH
- name: Create release
uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: "${{ secrets.TOKEN }}"
automatic_release_tag: ${{ steps.get_version.outputs.result }}
prerelease: false
title: "${{ github.event.repository.name }} v${{ steps.get_version.outputs.result }}"
files: ${{ env.OUTPUT }}
22 changes: 18 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,38 @@ Initially made for personal use, I decided to make it available to the public fo

## Installation

If you're interested you can [download the latest release](https://github.com/wiemanboy/WiemanTheme/releases/).
If you're interested, you can [download the latest release](https://github.com/wiemanboy/WiemanTheme/releases/).
Alternatively, you can clone this file from the [release branch](https://github.com/wiemanboy/WiemanTheme/tree/release).

```bash
git clone --branch release --single-branch https://github.com/wiemanboy/WiemanTheme.git
```

If you are interested in editing or forking the theme, you can clone
the [master branch](https://github.com/wiemanboy/WiemanTheme/tree/master) and compile the stylesheet yourself by:
the [master branch](https://github.com/wiemanboy/WiemanTheme/tree/master) and compile the stylesheet yourself.

## Compiling the Stylesheet

To compile the stylesheet, you will need to have [Node.js](https://nodejs.org/en/) installed.

Installing the sass dependency:
First, install the dependencies:

```bash
npm install
```

And compiling the stylesheet:
Then the scss files can be compiled using the following command:

```bash
npm run compile
```

The info for the theme can be changed in the compile command:

```bash
npm run compile -- name="CustomName" author="you" description="Custom description" source="github link"
```

## Bugs and Suggestions

If you find any bugs or have any suggestions, feel free to open an issue or pull request.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wiemantheme",
"version": "2.1.5",
"version": "2.1.6",
"scripts": {
"compile": "sass src/Main.scss wiemantheme.theme.css && node updateInfo.js -- name=\"WiemanTheme\" author=\"Local\" description=\"Local build\" source=\"Locally build\"",
"fix": "npx prettier . --write"
Expand Down
19 changes: 13 additions & 6 deletions src/components/main/DmMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,18 @@
}
}

li:nth-child(2) {
li:nth-child(1) {
.linkButton_c91bad {
position: fixed;
translate: -10px -53px;
translate: -5px -53px;
background: none;
z-index: 9999;
width: 42px;
padding: 0;
}

.name_ec8679 {
display: none;
}
}
}
Expand All @@ -29,15 +36,15 @@
// move + button
.privateChannelRecipientsInviteButtonIcon_c47fa9 {
position: fixed;
translate: 104px -27px;
translate: 100px -28px;
padding: 5px;
z-index: 99999;
}

// move search bar to make space for above buttons
.searchBar_f0963d {
margin-left: 30px;
margin-right: 15px;
.searchBarComponent_f0963d {
font-size: 13.7px;
font-size: 12px;
text-align: center;
}
}

0 comments on commit 11da984

Please sign in to comment.