Skip to content

Commit 3736501

Browse files
authored
Merge branch 'main' into SSD-redesign
2 parents 0999edb + 241be59 commit 3736501

File tree

2,322 files changed

+180989
-131005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,322 files changed

+180989
-131005
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/workflows/gettext.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Gettext Updates
2+
3+
on:
4+
push:
5+
branches: [main]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-22.04
10+
container:
11+
image: ghcr.io/elementary/docker:next-unstable
12+
13+
steps:
14+
- name: Install git
15+
run: |
16+
apt-get update
17+
apt-get install git -y
18+
19+
- name: Clone repository
20+
uses: actions/checkout@v4
21+
with:
22+
token: ${{ secrets.GIT_USER_TOKEN }}
23+
24+
- name: Update Translation Files
25+
uses: elementary/actions/gettext-template@next
26+
env:
27+
GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
28+
GIT_USER_NAME: "elementaryBot"
29+
GIT_USER_EMAIL: "[email protected]"

.github/workflows/main.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- reopened
8+
- synchronize
49

510
jobs:
611
build:
712

813
runs-on: ubuntu-latest
9-
14+
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
version: [stable, unstable, development-target]
1019
container:
11-
image: elementary/docker:unstable
12-
20+
image: ghcr.io/elementary/docker:${{ matrix.version }}
21+
1322
steps:
14-
- uses: actions/checkout@v1
23+
- uses: actions/checkout@v4
1524
- name: Install Dependencies
1625
run: |
1726
apt update
1827
apt install -y librsvg2-bin meson x11-apps
1928
- name: Build
2029
run: |
2130
meson build
22-
ninja -C build
2331
ninja -C build install

.github/workflows/merge.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
3+
name: Merge
4+
5+
on:
6+
push:
7+
branches:
8+
- master
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-22.04
13+
container:
14+
image: ghcr.io/elementary/docker:next-unstable
15+
16+
steps:
17+
- name: Install git
18+
run: |
19+
apt-get update
20+
apt-get install git -y
21+
- name: Clone repository
22+
uses: actions/checkout@v4
23+
with:
24+
token: ${{ secrets.GIT_USER_TOKEN }}
25+
26+
- name: Update Translation Files
27+
uses: elementary/actions/gettext-template@next
28+
env:
29+
GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
30+
GIT_USER_NAME: "elementaryBot"
31+
GIT_USER_EMAIL: "[email protected]"

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ name: Release
22

33
on:
44
pull_request:
5-
branches: master
6-
types: closed
5+
branches: [main]
6+
types: [closed]
77
jobs:
88
release:
99
runs-on: ubuntu-latest
1010
if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
1111
steps:
12-
- uses: actions/checkout@v1
12+
- uses: actions/checkout@v4
1313
- uses: elementary/actions/release@master
1414
env:
1515
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
1616
GIT_USER_NAME: "elementaryBot"
1717
GIT_USER_EMAIL: "[email protected]"
1818
with:
19-
release_branch: 'juno'
19+
release_branch: 'noble'

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Contributing Icons
2-
It is recommended to use the free and open source [Inkscape](http://inkscape.org) vector editor to create elementary icons. Any and all icons must follow the elementary [Icon Design Guidelines](http://elementary.io/docs/human-interface-guidelines#iconography).
2+
It is recommended to use the free and open source [Inkscape](http://inkscape.org) vector editor to create elementary icons. Any and all icons must follow the elementary [Icon Design Guidelines](https://docs.elementary.io/hig/reference/iconography).
33

44
An elementary color palette is provided, it is recommended to copy it into your Inkscape settings before you get started.
55

README.md

Lines changed: 25 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,35 @@
1-
<div>
2-
<img title="Mail icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/internet-mail.svg" />
3-
<img title="RSS reader icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/internet-news-reader.svg" />
4-
<img title="Web browser icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/internet-web-browser.svg" />
5-
<img title="Photos icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/multimedia-photo-manager.svg" />
6-
<img title="Network error icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/network-error.svg" />
7-
<img title="Calendar icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/office-calendar.svg" />
8-
<img title="Warning icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/dialog-warning.svg" />
9-
<img title="Chat icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/internet-chat.svg" />
10-
<img title="Photos icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/multimedia-photo-manager.svg" />
11-
<img title="Videos icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/multimedia-video-player.svg" />
12-
<img title="Online Accounts icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/preferences-desktop-online-accounts.svg" />
13-
<img title="Terminal icon" src="http://elementary.io/images/docs/human-interface-guidelines/icons/64/utilities-terminal.svg" />
14-
</div>
15-
161
# elementary Icons
17-
18-
[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=27377189)](https://www.bountysource.com/trackers/27377189-elementary-icons)
2+
[![Translation status](https://l10n.elementary.io/widgets/desktop/-/icons-extra/svg-badge.svg)](https://l10n.elementary.io/engage/desktop/)
3+
4+
![Default App Icon](https://raw.githubusercontent.com/elementary/icons/main/apps/64/application-default-icon.svg)
5+
![Locale Preferences Icon](https://raw.githubusercontent.com/elementary/icons/main/categories/64/preferences-desktop-locale.svg)
6+
![Terminal App Icon](https://raw.githubusercontent.com/elementary/icons/main/apps/64/utilities-terminal.svg)
7+
![Dialog Password Icon](https://raw.githubusercontent.com/elementary/icons/main/status/48/dialog-password.svg)
8+
![Empty Battery Icon](https://raw.githubusercontent.com/elementary/icons/main/status/48/battery-empty.svg)
9+
![High Security Icon](https://raw.githubusercontent.com/elementary/icons/main/status/48/security-high.svg)
10+
![Revert Document Icon](https://raw.githubusercontent.com/elementary/icons/main/actions/24/document-revert.svg)
11+
![Flag Icon](https://raw.githubusercontent.com/elementary/icons/main/actions/24/edit-flag.svg)
12+
![Redo Icon](https://raw.githubusercontent.com/elementary/icons/main/actions/24/edit-redo.svg)
13+
![Down Arrow Icon](https://raw.githubusercontent.com/elementary/icons/main/actions/24/go-down.svg)
14+
![Reply All Icon](https://raw.githubusercontent.com/elementary/icons/main/actions/24/mail-reply-all.svg)
15+
![Stop Process Icon](https://raw.githubusercontent.com/elementary/icons/main/actions/24/process-stop.svg)
1916

2017
An original set of vector icons designed specifically for [elementary OS](http://elementary.io) and its desktop environment: Pantheon.
2118

22-
These icons are licensed openly under the terms of the [GNU General Public License](COPYING). Redistributing, forking, remixing, etc. are encouraged!
23-
24-
If you feel the desire to compensate the artists who maintain these icons for your usage, [please see this page](http://elementary.io/get-involved#funding) and thank you!
25-
26-
## Contributing Icons
27-
It is recommended to use the free and open source [Inkscape](http://inkscape.org) vector editor to create elementary icons. Any and all icons must follow the elementary [Icon Design Guidelines](http://elementary.io/docs/human-interface-guidelines#iconography).
28-
29-
An [elementary color palette](data/elementary.gpl) ([rendered version](https://elementary.io/docs/human-interface-guidelines#color)) is provided; it is recommended to copy it into your Inkscape settings before you get started.
30-
31-
```bash
32-
cp data/elementary.gpl ~/.config/inkscape/palettes/
33-
```
34-
35-
To contribute to the elementary icon set, open a pull request to this repository with your icon(s).
19+
## Building and Installation
3620

37-
It is strongly encouraged to vacuum all vectors with [Inkscape](http://inkscape.org). This keeps the repository lean, clean, and fast for everyone. For convenience, a git pre-commit hook is included. To install, run these commands from your local repository folder:
38-
```bash
39-
$ cp pre-commit .git/hooks/
40-
$ chmod +x .git/hooks/pre-commit
41-
```
21+
You'll need the following dependencies:
4222

43-
## Installation
44-
You need the [Meson](http://mesonbuild.com) build system to install it.
45-
Once you've installed it, run these commands in the root of the icon set.
46-
```bash
47-
$ meson build --prefix=/usr
48-
$ cd build
49-
$ sudo ninja install
50-
```
23+
* meson
24+
* rsvg
25+
* xcursorgen
5126

52-
## Not a Universal Icon Set
53-
Since this set is designed specifically for elementary OS, pull requests to add icons or symlinks that are specific to other desktop environments (such as `xfce-*` or `gnome-*` named icons) will be rejected.
27+
Run `meson` to configure the build environment and then `ninja` to build
5428

55-
Use of icon names in line with the [FreeDesktop.Org Icon Naming Specification](http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html) is encouraged.
29+
meson build --prefix=/usr
30+
cd build
31+
ninja
5632

57-
## Third-Party Brand Preservation
58-
elementary icons do not attempt to supply icons for third-party apps. Pull requests to add icons or symbolic links that would overwrite the branding of third-party apps will be rejected.
33+
To install, use `ninja install`
5934

35+
sudo ninja install

0 commit comments

Comments
 (0)