Răsfoiți Sursa

Sort iconshock icons into directory and add credit

James Allen 12 ani în urmă
părinte
comite
5ea231dea6

+ 30 - 0
services/web/README.md

@@ -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#)
+
+

+ 4 - 4
services/web/app/views/templates.jade

@@ -208,13 +208,13 @@
 			.pdfjs-list-view
 			.btn-group
 				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
-					img(src="/img/fit-to-width.png")
+					img(src="/img/iconshock/fit-to-width.png")
 				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
-					img(src="/img/zoom-in.png")
+					img(src="/img/iconshock/zoom-in.png")
 			.progress.progress-info
 				.bar
 				span Loading

+ 3 - 0
services/web/public/img/iconshock/README.txt

@@ -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

+ 0 - 0
services/web/public/img/fit-to-height.png → services/web/public/img/iconshock/fit-to-height.png


+ 0 - 0
services/web/public/img/fit-to-width.png → services/web/public/img/iconshock/fit-to-width.png


+ 0 - 0
services/web/public/img/save.png → services/web/public/img/iconshock/save.png


+ 0 - 0
services/web/public/img/zoom-in.png → services/web/public/img/iconshock/zoom-in.png


+ 0 - 0
services/web/public/img/zoom-out.png → services/web/public/img/iconshock/zoom-out.png