Sort iconshock icons into directory and add credit

This commit is contained in:
James Allen 2014-02-13 18:18:05 +00:00
parent 6eff979e2a
commit 5ea231dea6
8 changed files with 37 additions and 4 deletions

30
services/web/README.md Normal file
View file

@ -0,0 +1,30 @@
web-sharelatex
==============
web-sharelatex is the front-end web service of the open-source web-based collaborative LaTeX editor,
ShareLaTeX. It serves all the HTML pages, CSS and javascript to the client. web-sharelatex also contains
a lot of logic around creating and editing projects, and account management.
The rest of the ShareLaTeX stack, along with information about contributing can be found in the
[sharelatex/sharelatex](https://github.com/sharelatex/sharelatex) repository.
License and Credits
-------------------
### Code
All code is currently proprietary but will soon be licensed under a copyleft license.
#### Silk icon set 1.3
We gratefully acknowledge [Mark James](http://www.famfamfam.com/lab/icons/silk/) for
releasing his Silk icon set under the Creative Commons Attribution 2.5 license. Some
of these icons are used within ShareLaTeX inside the `public/img/silk` directory
### IconShock icons
We gratefully acknowledge [IconShock](http://www.iconshock.com) for use of the icons
in the `public/img/iconshock` directory found via
[findicons.com](http://findicons.com/icon/498089/height?id=526085#)

View file

@ -208,13 +208,13 @@
.pdfjs-list-view .pdfjs-list-view
.btn-group .btn-group
button.btn.btn-info.js-fit-height button.btn.btn-info.js-fit-height
img(src="/img/fit-to-height.png") img(src="/img/iconshock/fit-to-height.png")
button.btn.btn-info.js-fit-width button.btn.btn-info.js-fit-width
img(src="/img/fit-to-width.png") img(src="/img/iconshock/fit-to-width.png")
button.btn.btn-info.js-zoom-out button.btn.btn-info.js-zoom-out
img(src="/img/zoom-out.png") img(src="/img/iconshock/zoom-out.png")
button.btn.btn-info.js-zoom-in button.btn.btn-info.js-zoom-in
img(src="/img/zoom-in.png") img(src="/img/iconshock/zoom-in.png")
.progress.progress-info .progress.progress-info
.bar .bar
span Loading span Loading

View file

@ -0,0 +1,3 @@
Icons by IconShock (www.iconshock.com) for via findicons.com http://findicons.com/icon/498089/height?id=526085#
Licensed under the Creative Commons Attribution (by) license

View file

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View file

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View file

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB