Skip to content

Commit b10ba02

Browse files
committed
Merge remote-tracking branch 'guoyunhe/make-icons-sharp'
* guoyunhe/make-icons-sharp: Make icons sharp Signed-off-by: David Aguilar <davvid@gmail.com>
2 parents 6cbdded + 131d31e commit b10ba02

File tree

8 files changed

+94
-177
lines changed

8 files changed

+94
-177
lines changed

share/git-cola/icons/README.md

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
1-
Git Cola Icons
2-
--------------
1+
# Git Cola Icons
2+
3+
## Guidelines
4+
5+
1. Size: 22x22px (the default action icon size of KDE and GNOME)
6+
2. Margin: 1px (20x20px drawing area)
7+
3. Colors: #000000 black, #ffffff white, #cc0000 red, #00dd26 green, #1961ff blue
8+
9+
## Copyright
10+
11+
### New icons
12+
13+
The following icons are created/re-created by [Guo Yunhe](https://guoyunhe.me/):
14+
15+
- a-z-order.svg
16+
- check.svg
17+
- circle-slash-red.svg
18+
- circle-slash.svg
19+
- desktop-download.svg
20+
- diff.svg
21+
22+
### Original icons
23+
324
The following icons are based on the based on the original .png icon designs
425
for git-cola's File Browser by Uri Okrent.
526

@@ -14,17 +35,17 @@ Copyright (C) 2015-2017 David Aguilar and contributors
1435
License: MIT
1536

1637

17-
Git Logo
18-
--------
38+
### Git Logo
39+
1940
Git Logo by Jason Long is licensed under the
2041
Creative Commons Attribution 3.0 Unported License.
2142
http://git-scm.com/downloads/logos
2243

2344
git-cola.svg is based on the original Git Logo.
2445

2546

26-
Octicons
27-
--------
47+
### Octicons
48+
2849
The following files are from Github's
2950
[octicons](https://github.com/github/octicons) icon set:
3051

@@ -67,8 +88,8 @@ x.svg
6788
Copyright (C) 2012-2015 GitHub
6889
License: [MIT](http://choosealicense.com/licenses/mit/)
6990

70-
Gnome Adwaita Icons
71-
-------------------
91+
### Gnome Adwaita Icons
92+
7293
The following files are from the Gnome project's
7394
[Adwaita icon theme](https://github.com/GNOME/adwaita-icon-theme):
7495

@@ -77,8 +98,8 @@ document-save-symbolic.svg
7798
Copyright (C) The Gnome Project
7899
License: [LGPL](https://github.com/GNOME/adwaita-icon-theme/blob/master/COPYING_LGPL)
79100

80-
Gnome High Contrast Icons
81-
-------------------------
101+
### Gnome High Contrast Icons
102+
82103
The following files are from the Gnome High Contrast Icon set:
83104

84105
zoom-fit-best.svg
@@ -88,8 +109,7 @@ zoom-out.svg
88109
License: LGPL v2+
89110

90111

91-
Flaticon.com Icons
92-
------------------
112+
### Flaticon.com Icons
93113

94114
The following files are designed by Freepik from http://www.flaticons.com/
95115

@@ -105,8 +125,7 @@ edit-copy.svg
105125
License: [Creative Commons BY 3.0](http://creativecommons.org/licenses/by/3.0/)
106126

107127

108-
Google Icons
109-
------------
128+
### Google Icons
110129

111130
The following files are by Google:
112131

share/git-cola/icons/a-z-order.svg

Lines changed: 2 additions & 101 deletions
Loading

share/git-cola/icons/check.svg

Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 52 deletions
Loading

share/git-cola/icons/circle-slash.svg

Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

share/git-cola/icons/diff.svg

Lines changed: 2 additions & 2 deletions
Loading

share/git-cola/icons/x.svg

Lines changed: 49 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)