Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
d7cc4e4
addition of gemfile
NatashaRaime Oct 4, 2016
ed40a8d
created routes.
allisonhoke Oct 4, 2016
195b9e2
Created relationships between each class and migrated final schema.
allisonhoke Oct 4, 2016
b6589c6
WIP creating CSV read in seed file
allisonhoke Oct 4, 2016
774fe23
WIP
allisonhoke Oct 4, 2016
d79e3df
set up seed file to read CSVs into models
allisonhoke Oct 4, 2016
a9d2547
added action to routes for creation purposes
allisonhoke Oct 4, 2016
e74d65a
created market controller. created index and show action methods
allisonhoke Oct 5, 2016
61e0165
added views for index and show actions
allisonhoke Oct 5, 2016
04f6267
created market method to find all vendors for a specific market
allisonhoke Oct 5, 2016
f1f18db
WIP
allisonhoke Oct 5, 2016
88aded4
worked on style a little, added the welcome#index, beginning work on …
NatashaRaime Oct 5, 2016
e7ca3f5
some style added in
NatashaRaime Oct 5, 2016
ccd02a6
Merge branch 'b/nre+amh/master' of https://github.com/allisonhoke/Far…
NatashaRaime Oct 5, 2016
55734b6
deleted market controller and created markets controller
allisonhoke Oct 5, 2016
4d30c7e
added button to see all vendors
allisonhoke Oct 5, 2016
6073e2c
vendor controller methods, added some of the html.erb pages, also, no…
NatashaRaime Oct 5, 2016
6074f8e
Merge branch 'b/nre+amh/master' of https://github.com/allisonhoke/Far…
allisonhoke Oct 5, 2016
419b6b0
Merge branch 'b/nre+amh/master' of https://github.com/allisonhoke/Far…
NatashaRaime Oct 5, 2016
7ce87ab
deleted the singular controller files, added plural names
NatashaRaime Oct 5, 2016
eb6ae55
removed useless variable
allisonhoke Oct 5, 2016
3e635bf
tab in welcome index
NatashaRaime Oct 5, 2016
ac80d0c
working on views, index,show
NatashaRaime Oct 5, 2016
b2d0744
added update to routes that can be edited
allisonhoke Oct 5, 2016
858b517
created market edit html
allisonhoke Oct 5, 2016
cf81c5d
added edit action method
allisonhoke Oct 5, 2016
0f3256a
added button to edit
allisonhoke Oct 5, 2016
6b4e257
added missing commas
allisonhoke Oct 5, 2016
a06ee87
changed vendors controller name
NatashaRaime Oct 5, 2016
dba4d85
Merge branch 'b/nre+amh/master' of https://github.com/allisonhoke/Far…
NatashaRaime Oct 5, 2016
b9b25ab
adjusted show method to show all vendors on page
allisonhoke Oct 6, 2016
c571c8f
vendor index and welcome paths are all working at this point. Next: w…
NatashaRaime Oct 6, 2016
a80f3db
added view button
allisonhoke Oct 6, 2016
593ac57
added delete button
allisonhoke Oct 6, 2016
77fd1a3
fixed typo
allisonhoke Oct 6, 2016
026e1da
everything from welcome page working
allisonhoke Oct 6, 2016
1c28dd0
merging master to b/nre
NatashaRaime Oct 6, 2016
bc3d301
WIP
allisonhoke Oct 6, 2016
ad3eca2
More of the methods and file paths are working for vendor, working on…
NatashaRaime Oct 6, 2016
0d80e68
addition of products button from vendor and begin on products pages
NatashaRaime Oct 6, 2016
0a600c7
added actions for view and details when a user is viewing market info…
allisonhoke Oct 6, 2016
ba87d2c
made index action to render view
allisonhoke Oct 6, 2016
279f040
changed buttons to links
allisonhoke Oct 6, 2016
d63de44
changed buttons to links
allisonhoke Oct 6, 2016
2a053fd
added link to view all markets as user
allisonhoke Oct 6, 2016
d0a39eb
added routes for user to market/vendor view only
allisonhoke Oct 6, 2016
2f44ea7
created views for user to view only, no links to edit/create/destroy
allisonhoke Oct 6, 2016
4bbf798
changed path for markets
allisonhoke Oct 6, 2016
a903039
destroy method, link to vendors/products path
NatashaRaime Oct 6, 2016
dd431ec
commit new with changes to links from buttons
NatashaRaime Oct 6, 2016
2558462
thursday before class ended progress. more work with vendor and produ…
NatashaRaime Oct 7, 2016
a8163f0
made show, update files for all, & new file for vendor, need to route…
NatashaRaime Oct 7, 2016
71ac58d
Merge edits
NatashaRaime Oct 7, 2016
9d748dd
removed merge conflict syntax
allisonhoke Oct 7, 2016
f135fc7
added missing end
allisonhoke Oct 7, 2016
2c0a713
added update methods in controllers
NatashaRaime Oct 7, 2016
3c9bd90
Merge branch 'b/nre+amh/master' of https://github.com/allisonhoke/Far…
NatashaRaime Oct 7, 2016
7c3fa45
all edits are now working properly and saving
NatashaRaime Oct 7, 2016
0b23beb
update to show
NatashaRaime Oct 7, 2016
8bf4a4f
removed unnecessary link
allisonhoke Oct 7, 2016
c2780fa
created methods to calculate sales for each vendor
allisonhoke Oct 7, 2016
11d227f
adding styles in
NatashaRaime Oct 7, 2016
9b24cbd
Merge branch 'b/nre' into b/nre+amh/master
NatashaRaime Oct 7, 2016
1ef2f97
added logic to index to show individual products
allisonhoke Oct 7, 2016
c588874
adjusted logic in update method
allisonhoke Oct 7, 2016
9919206
fixed merge conflict
allisonhoke Oct 7, 2016
84b2cb1
added method to form
allisonhoke Oct 7, 2016
b4bae3a
created sales controller
allisonhoke Oct 7, 2016
73054a2
created sales views
allisonhoke Oct 7, 2016
dff8836
adjusted edit path
allisonhoke Oct 7, 2016
e8cd537
adjusted path
allisonhoke Oct 7, 2016
901f109
adjusted path for create and edit. added in product id param to creat…
allisonhoke Oct 7, 2016
f2ca981
adjusted path
allisonhoke Oct 7, 2016
380ce23
removed extraneous variable. fixed create redirect and render paths
allisonhoke Oct 7, 2016
9ba30aa
figured out how to add product id to new sale
allisonhoke Oct 7, 2016
54aaaf0
added form for new sale
allisonhoke Oct 7, 2016
868bae5
WIP figuring out month methods
allisonhoke Oct 7, 2016
4bcd604
WIP
allisonhoke Oct 7, 2016
bc49ddd
Re-tagged every show page so there is a cohesive flow to the site by …
NatashaRaime Oct 7, 2016
879fb74
Merge branch 'b/nre' into b/nre+amh/master-- with edits finished and …
NatashaRaime Oct 7, 2016
27adb16
working out creating a new vendor. WIP
allisonhoke Oct 7, 2016
d67e955
Merge branch 'b/nre+amh/master' of https://github.com/allisonhoke/Far…
allisonhoke Oct 7, 2016
128833a
added pg and rails_12 to gemfile
allisonhoke Oct 7, 2016
8498f3b
Add gemfile.lock
allisonhoke Oct 7, 2016
1a057e2
final styling
NatashaRaime Oct 7, 2016
07d6288
Merge branch 'b/nre+amh/master' of https://github.com/allisonhoke/Far…
allisonhoke Oct 7, 2016
28e56e1
fixed path arguments
allisonhoke Oct 8, 2016
e739c17
removed merge conflict syntax. added missing comma
allisonhoke Oct 8, 2016
f8d5430
fixed delete vendor path in show page and syntax in controller
allisonhoke Oct 8, 2016
3e3f9c6
added notes to identify areas that are not finished
allisonhoke Oct 8, 2016
f8121f2
removed unnecessary methods that belong in the model file
allisonhoke Oct 8, 2016
451898f
added notes to identify what was missing/was still in debug mode
allisonhoke Oct 8, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down Expand Up @@ -35,13 +34,22 @@ gem 'sdoc', '~> 0.4.0', group: :doc
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
end

group :development do
gem "pry-rails"
gem "binding_of_caller"
gem "better_errors"
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end

group :production do
gem 'pg'
gem 'rails_12factor'
end
24 changes: 24 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,15 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.3)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (9.0.6)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
Expand All @@ -67,6 +72,7 @@ GEM
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
Expand All @@ -76,7 +82,14 @@ GEM
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
pg (0.19.0)
pkg-config (1.1.7)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.4)
pry (>= 0.9.10)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -99,6 +112,11 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.7)
actionpack (= 4.2.7)
activesupport (= 4.2.7)
Expand All @@ -117,6 +135,7 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
slop (3.6.0)
spring (2.0.0)
activesupport (>= 4.2)
sprockets (3.7.0)
Expand Down Expand Up @@ -147,11 +166,16 @@ PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
coffee-rails (~> 4.1.0)
jbuilder (~> 2.0)
jquery-rails
pg
pry-rails
rails (= 4.2.7)
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
Expand Down
3 changes: 3 additions & 0 deletions app/assets/javascripts/markets.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/sales.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/vendor.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/welcome.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
120 changes: 120 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,123 @@
*= require_tree .
*= require_self
*/
@font-face {
font-family: Mathlete-Skinny;
src: url(mathlete/Mathlete-Skinny.otf);
}



.p{
position: relative;
text-align: left;
font-size: 1em;
color: aqua;
margin-bottom: 15px;
margin-left: 15px;

}

.img {
position: relative;
float: left;
width: 100px;
height: 100px;
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: cover;
}


a, a:visited{
color: violet;
font-family: Mathlete-Skinny;
font-size: 1em;
}

html, body { height: 100%; }

body {
position: absolute;
width: 100%;
height: 100%;
font-weight: 200;
font-size: 1.5em;
font-style: normal;
font-family: Mathlete-Skinny;
text-align: justify;
text-decoration: none;
list-style-type: none;
}

li a{
position: relative;
list-style-type: none;
text-decoration: none;
}

ul, menu, dir {
position: relative;
display: block;
-webkit-margin-end: 0px;
-webkit-padding-start: 0px;
}

.navigation {
position: relative;
z-index: 30;
display: block;
font-size: 2em;
list-style-type: none;
margin-left: 0;
margin-right: 0;
padding: 0;
overflow: hidden;
background-color: cyan;
float: left;
}

.link {
position: relative;
display: block;
font-size: 1em;
list-style-type: none;
text-decoration: none;
padding: 5px;
overflow: hidden;
color: grey;
background-color: honeydew;
}

.title {
display: block;
position: relative;
text-align: center;
color: thistle;
background: skyblue;
padding: 14px 16px;
font-family: Mathlete-Skinny;
font-size: 1em;
text-decoration: none;
}

.nav {
margin: 20px 16px;
position: relative;
display: block;
color: mediumorchid;
text-align: center;
padding: 14px 16px;
text-decoration: none;
}

.nav:hover {
background-color: papayawhip;
}

footer {
position: relative;
background-color: deepskyblue;
border-top: aqua thick;
margin-top: 200px;
}
Binary file added app/assets/stylesheets/bakery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/stylesheets/bread.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/stylesheets/chocolate.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
Copyright (c) 2011 TypeSETit, LLC (typesetit@att.net),
with Reserved Font Name "Alex Brush"

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL

-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.

The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the copyright statement(s).

"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.

"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.

5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
Copyright (c) 2010 by Typemade (hi@typemade.mx). All rights reserved.

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL

-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.

The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the copyright statement(s).

"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.

"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.

5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file not shown.
Binary file not shown.
Binary file not shown.
41 changes: 41 additions & 0 deletions app/assets/stylesheets/farfont/lekton/SIL Open Font License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL

-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.

The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the copyright statement(s).

"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.

"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.

5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions app/assets/stylesheets/farfont/mathlete 2/Mathlete.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
You&#39;re free to use this in commercial &amp; personal work, but please don&#39;t redistribute or resell this typeface in any way.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading