Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

404 page #391

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

404 page #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
190c6fd
Rename img to images
kyungmin Apr 14, 2014
6db2556
Update strapped version to add 404 not found page
kyungmin Apr 14, 2014
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
3 changes: 0 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,5 @@ site/spec
site/*gen*.html
site/1.0
site/1.1
site/static/fonts/
site/static/less/strapped/
site/static/img/images/
assets/bower_components
assets/less/strapped
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ prep-dirs:
mkdir $(BUILD_DIR)/static
mkdir $(BUILD_DIR)/static/css
mkdir $(BUILD_DIR)/static/js
mkdir $(BUILD_DIR)/static/img
mkdir $(BUILD_DIR)/static/images

cp-static:
cp -r $(ASSET_DIR)/img/* $(BUILD_DIR)/static/img/
cp -r $(ASSET_DIR)/images/* $(BUILD_DIR)/static/images/

pkg-old-revisions:
cp -r $(ASSET_DIR)/doc-archives/* $(BUILD_DIR)/
Expand Down Expand Up @@ -86,10 +86,11 @@ overview-clean:

# static files
bowerize:
bower install --allow-root --config.interactive=false strapped#0.0.3
bower install --allow-root --config.interactive=false strapped#0.1.18
cp -r $(ASSET_DIR)/bower_components/strapped/static/less/. $(ASSET_DIR)/less/strapped/
cp -r $(ASSET_DIR)/bower_components/strapped/static/fonts $(BUILD_DIR)/static/fonts
cp -r $(ASSET_DIR)/bower_components/strapped/static/images/* $(BUILD_DIR)/static/img/
cp -r $(ASSET_DIR)/bower_components/strapped/static/images/* $(BUILD_DIR)/static/images/
cp -r $(ASSET_DIR)/html/notfound.html $(BUILD_DIR)/static/notfound.html

compile-less: $(wildcard $(ASSET_DIR)/less/*.less)
lessc $(ASSET_DIR)/less/base.less > $(BUILD_DIR)/static/css/styles.css
Expand Down
6 changes: 3 additions & 3 deletions assets/doc-archives/1.0/overview/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,13 +402,13 @@ <h2>Third-Party Plugins<a class="headerlink" href="#third-party-plugins" title="
<div class="section">
<div class="header3">
Accounting</div>
<a class="list-noindent reference external image-reference" href="http://subledger.com/blog/rent-my-bikes-demo/"><img alt="/static/img/logos/subledger.png" src="/static/img/logos/subledger.png" /></a>
<a class="list-noindent reference external image-reference" href="http://subledger.com/blog/rent-my-bikes-demo/"><img alt="/static/images/logos/subledger.png" src="/static/images/logos/subledger.png" /></a>
</div>
</section><section id="integration-assistance">
<h2>Integration Assistance<a class="headerlink" href="#integration-assistance" title="Permalink to this headline">∵</a></h2>
<p>Are you looking for a developer to help with Balanced integration? Check out these companies!</p>
<a class="logos-inline reference external image-reference" href="https://theworkmob.com/integrations/balancedpayments"><img alt="/static/img/logos/workmob&#64;2x.png" src="/static/img/logos/workmob&#64;2x.png" style="width: 236px; height: 50px;" /></a>
<a class="logos-inline reference external image-reference" href="http://www.airpair.com/balanced-payments"><img alt="/static/img/logos/airpair&#64;2x.png" src="/static/img/logos/airpair&#64;2x.png" style="width: 187px; height: 50px;" /></a>
<a class="logos-inline reference external image-reference" href="https://theworkmob.com/integrations/balancedpayments"><img alt="/static/images/logos/workmob&#64;2x.png" src="/static/images/logos/workmob&#64;2x.png" style="width: 236px; height: 50px;" /></a>
<a class="logos-inline reference external image-reference" href="http://www.airpair.com/balanced-payments"><img alt="/static/images/logos/airpair&#64;2x.png" src="/static/images/logos/airpair&#64;2x.png" style="width: 187px; height: 50px;" /></a>
</section></section>
</div>
</div>
Expand Down
Binary file added assets/fonts/fonts/Proxima Nova Bold.eot
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/fonts/Proxima Nova Bold.svg
View file
Open in desktop
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 assets/fonts/fonts/Proxima Nova Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/fonts/Proxima Nova Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/fonts/Proxima Nova Reg It.eot
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/fonts/Proxima Nova Reg It.svg
View file
Open in desktop
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 assets/fonts/fonts/Proxima Nova Reg It.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/fonts/Proxima Nova Reg It.woff
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/fonts/Proxima Nova Reg.eot
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/fonts/Proxima Nova Reg.svg
View file
Open in desktop
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 assets/fonts/fonts/Proxima Nova Reg.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/fonts/Proxima Nova Reg.woff
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/fonts/Proxima Nova Sbold.eot
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/fonts/Proxima Nova Sbold.svg
View file
Open in desktop
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 assets/fonts/fonts/Proxima Nova Sbold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/fonts/Proxima Nova Sbold.woff
View file
Open in desktop
Binary file not shown.
54 changes: 54 additions & 0 deletions assets/html/notfound.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<!DOCTYPE html>
<html>
<head>
<title>Balanced | Page Not Found</title>
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
<link rel="stylesheet" href="/static/css/styles.css">
</head>
<body>
<div class="container-fluid">
<div class="row">
<div class="site-header col-md-11 col-md-offset-1 col-xs-offset-1">
<a href="/" class="logo"><img src="/static/images/balanced_logo_large.png" alt="Balanced Logo" title="Balanced - Card processing, escrow, and payouts in one simple API"></a>
</div>
</div>

<div id="notfound">
<div class="row">
<div class="col-md-4 col-md-offset-1 col-xs-offset-1">
<h1>404</h1>
</div>
</div>

<div class="cloud-rest"></div>
<div class="cloud"></div>

<div class="row">
<div class="col-md-4 col-md-offset-1 col-xs-offset-1">
<p>Looks like we're caught in no man's land</p>

<div class="next-steps">
<div class="col-md-4 col-xs-4">
<h3>Website</h3>
<a href="https://www.balancedpayments.com/">Homepage</a>
</div>
<div class="col-md-4 col-xs-4">
<h3>Dashboard</h3>
<a href="https://dashboard.balancedpayments.com/">Sign in</a>
</div>
<div class="col-md-4 col-xs-4">
<h3>Documentation</h3>
<a href="https://docs.balancedpayments.com/1.1/overview/">Overview</a>
<a href="https://docs.balancedpayments.com/1.1/api/">API</a>
</div>
</div>
</div>
</div>

<div class="balloon green"></div>
<div class="balloon yellow"></div>
<div class="balloon red"></div>
</div>
</div>
</body>
</html>
0 assets/img/dropdown-arrow.png → assets/images/dropdown-arrow.png
View file
Open in desktop
File renamed without changes
0 assets/img/glyphicons-halflings-white.png → assets/images/glyphicons-halflings-white.png
View file
Open in desktop
File renamed without changes
0 assets/img/glyphicons-halflings.png → assets/images/glyphicons-halflings.png
View file
Open in desktop
File renamed without changes
0 assets/img/icons.png → assets/images/icons.png
View file
Open in desktop
File renamed without changes
0 assets/img/logos/[email protected] → assets/images/logos/[email protected]
View file
Open in desktop
File renamed without changes
0 assets/img/logos/subledger.png → assets/images/logos/subledger.png
View file
Open in desktop
File renamed without changes
0 assets/img/logos/[email protected] → assets/images/logos/[email protected]
View file
Open in desktop
File renamed without changes
0 assets/img/more-icon-left.png → assets/images/more-icon-left.png
View file
Open in desktop
File renamed without changes
0 assets/img/more-icon.png → assets/images/more-icon.png
View file
Open in desktop
File renamed without changes
5 changes: 2 additions & 3 deletions assets/less/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,12 @@ div.integration {
background-color: @white;
padding: 10px 20px 10px 20px;
border: 3px solid @black;

.fontStyle(@baseFontFamilyCondensedBold, 20px, @lettingSpacing: 0.1em);
.sl-md-b;
text-transform: uppercase;

a {
.sl-md-b;
color: @black;
.fontStyle(@baseFontFamilyCondensedBold, 20px, @lettingSpacing: 0.1em);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions assets/less/boxes.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
&.icon-arrow-left {
height: 50px;
width: 50px;
background: #0089a7 url(/static/img/more-icon-left.png) center no-repeat;
background: #0089a7 url(/static/images/more-icon-left.png) center no-repeat;
background-size: 60px 60px !important;
}

&.icon-arrow {
height: 50px;
width: 50px;
background: #0089a7 url(/static/img/more-icon.png) center no-repeat;
background: #0089a7 url(/static/images/more-icon.png) center no-repeat;
background-size: 60px 60px !important;
}
}
Expand Down Expand Up @@ -107,6 +107,6 @@ p.more-link a {
display: inline-block;
padding: 0 70px 0 0;
height: 70px;
background: #0089a7 url(/static/img/more-icon.png) right 50% no-repeat;
background: #0089a7 url(/static/images/more-icon.png) right 50% no-repeat;
background-size: 60px 60px !important;
}
2 changes: 1 addition & 1 deletion clients/rev1/java
Open in desktop
Submodule java updated 1 files
+0 −0 CHANGELOG.md
2 changes: 1 addition & 1 deletion clients/rev1/php
Open in desktop
Submodule php updated 9 files
+0 −1 .gitignore
+16 −0 CHANGELOG.md
+2 −2 composer.json
+593 −0 composer.lock
+1 −1 src/Balanced/BankAccount.php
+1 −0 src/Balanced/Bootstrap.php
+22 −0 src/Balanced/Dispute.php
+1 −1 src/Balanced/Settings.php
+58 −1 tests/Balanced/SuiteTest.php
2 changes: 1 addition & 1 deletion clients/rev1/python
Open in desktop
Submodule python updated 1 files
+11 −0 CHANGELOG.md
2 changes: 1 addition & 1 deletion clients/rev1/ruby
Open in desktop
Submodule ruby updated 2 files
+10 −9 lib/balanced/resources/order.rb
+20 −3 spec/balanced/resources/order_spec.rb
6 changes: 3 additions & 3 deletions overview/rev1/overview/getting-started.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ Third-Party Plugins

.. cssclass:: list-noindent

.. image:: //static/img/logos/subledger.png
.. image:: //static/images/logos/subledger.png
:target: http://subledger.com/blog/rent-my-bikes-demo/


Expand All @@ -219,12 +219,12 @@ Are you looking for a developer to help with Balanced integration? Check out the

.. cssclass:: logos-inline

.. image:: //static/img/logos/[email protected]
.. image:: //static/images/logos/[email protected]
:target: https://theworkmob.com/integrations/balancedpayments
:height: 50px
:width: 236px

.. image:: //static/img/logos/[email protected]
.. image:: //static/images/logos/[email protected]
:target: http://www.airpair.com/balanced-payments
:height: 50px
:width: 187px
Expand Down