diff --git a/.gitignore b/.gitignore index 78d991c6..7ab0e2c3 100644 --- a/.gitignore +++ b/.gitignore @@ -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 \ No newline at end of file diff --git a/Makefile b/Makefile index 5077af9a..74c755ed 100644 --- a/Makefile +++ b/Makefile @@ -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)/ @@ -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 diff --git a/assets/doc-archives/1.0/overview/index.html b/assets/doc-archives/1.0/overview/index.html index 1034a996..d27de11c 100644 --- a/assets/doc-archives/1.0/overview/index.html +++ b/assets/doc-archives/1.0/overview/index.html @@ -402,13 +402,13 @@

Third-Party Plugins
Accounting
-/static/img/logos/subledger.png +/static/images/logos/subledger.png

Integration Assistance∵

Are you looking for a developer to help with Balanced integration? Check out these companies!

-/static/img/logos/workmob@2x.png -/static/img/logos/airpair@2x.png +/static/images/logos/workmob@2x.png +/static/images/logos/airpair@2x.png
diff --git a/assets/fonts/fonts/Proxima Nova Bold.eot b/assets/fonts/fonts/Proxima Nova Bold.eot new file mode 100755 index 00000000..ba0815b5 Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Bold.eot differ diff --git a/assets/fonts/fonts/Proxima Nova Bold.svg b/assets/fonts/fonts/Proxima Nova Bold.svg new file mode 100755 index 00000000..4df9e171 Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Bold.svg differ diff --git a/assets/fonts/fonts/Proxima Nova Bold.ttf b/assets/fonts/fonts/Proxima Nova Bold.ttf new file mode 100755 index 00000000..ed791c96 Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Bold.ttf differ diff --git a/assets/fonts/fonts/Proxima Nova Bold.woff b/assets/fonts/fonts/Proxima Nova Bold.woff new file mode 100755 index 00000000..c94f4bf0 Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Bold.woff differ diff --git a/assets/fonts/fonts/Proxima Nova Reg It.eot b/assets/fonts/fonts/Proxima Nova Reg It.eot new file mode 100755 index 00000000..8d76a923 Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Reg It.eot differ diff --git a/assets/fonts/fonts/Proxima Nova Reg It.svg b/assets/fonts/fonts/Proxima Nova Reg It.svg new file mode 100755 index 00000000..20ffc1fc Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Reg It.svg differ diff --git a/assets/fonts/fonts/Proxima Nova Reg It.ttf b/assets/fonts/fonts/Proxima Nova Reg It.ttf new file mode 100755 index 00000000..373271cd Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Reg It.ttf differ diff --git a/assets/fonts/fonts/Proxima Nova Reg It.woff b/assets/fonts/fonts/Proxima Nova Reg It.woff new file mode 100755 index 00000000..5b4149f0 Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Reg It.woff differ diff --git a/assets/fonts/fonts/Proxima Nova Reg.eot b/assets/fonts/fonts/Proxima Nova Reg.eot new file mode 100755 index 00000000..6ab17f7f Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Reg.eot differ diff --git a/assets/fonts/fonts/Proxima Nova Reg.svg b/assets/fonts/fonts/Proxima Nova Reg.svg new file mode 100755 index 00000000..27c8d8f7 Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Reg.svg differ diff --git a/assets/fonts/fonts/Proxima Nova Reg.ttf b/assets/fonts/fonts/Proxima Nova Reg.ttf new file mode 100755 index 00000000..9116940e Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Reg.ttf differ diff --git a/assets/fonts/fonts/Proxima Nova Reg.woff b/assets/fonts/fonts/Proxima Nova Reg.woff new file mode 100755 index 00000000..538f430b Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Reg.woff differ diff --git a/assets/fonts/fonts/Proxima Nova Sbold.eot b/assets/fonts/fonts/Proxima Nova Sbold.eot new file mode 100755 index 00000000..3400a92e Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Sbold.eot differ diff --git a/assets/fonts/fonts/Proxima Nova Sbold.svg b/assets/fonts/fonts/Proxima Nova Sbold.svg new file mode 100755 index 00000000..11a950a0 Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Sbold.svg differ diff --git a/assets/fonts/fonts/Proxima Nova Sbold.ttf b/assets/fonts/fonts/Proxima Nova Sbold.ttf new file mode 100755 index 00000000..a96b2719 Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Sbold.ttf differ diff --git a/assets/fonts/fonts/Proxima Nova Sbold.woff b/assets/fonts/fonts/Proxima Nova Sbold.woff new file mode 100755 index 00000000..45ad3b87 Binary files /dev/null and b/assets/fonts/fonts/Proxima Nova Sbold.woff differ diff --git a/assets/html/notfound.html b/assets/html/notfound.html new file mode 100644 index 00000000..c1b13d12 --- /dev/null +++ b/assets/html/notfound.html @@ -0,0 +1,54 @@ + + + + Balanced | Page Not Found + + + + +
+
+
+ +
+
+ +
+
+
+

404

+
+
+ +
+
+ +
+
+

Looks like we're caught in no man's land

+ +
+
+

Website

+ Homepage +
+
+

Dashboard

+ Sign in +
+
+

Documentation

+ Overview + API +
+
+
+
+ +
+
+
+
+
+ + diff --git a/assets/img/dropdown-arrow.png b/assets/images/dropdown-arrow.png similarity index 100% rename from assets/img/dropdown-arrow.png rename to assets/images/dropdown-arrow.png diff --git a/assets/img/glyphicons-halflings-white.png b/assets/images/glyphicons-halflings-white.png similarity index 100% rename from assets/img/glyphicons-halflings-white.png rename to assets/images/glyphicons-halflings-white.png diff --git a/assets/img/glyphicons-halflings.png b/assets/images/glyphicons-halflings.png similarity index 100% rename from assets/img/glyphicons-halflings.png rename to assets/images/glyphicons-halflings.png diff --git a/assets/img/icons.png b/assets/images/icons.png similarity index 100% rename from assets/img/icons.png rename to assets/images/icons.png diff --git a/assets/img/logos/airpair@2x.png b/assets/images/logos/airpair@2x.png similarity index 100% rename from assets/img/logos/airpair@2x.png rename to assets/images/logos/airpair@2x.png diff --git a/assets/img/logos/subledger.png b/assets/images/logos/subledger.png similarity index 100% rename from assets/img/logos/subledger.png rename to assets/images/logos/subledger.png diff --git a/assets/img/logos/workmob@2x.png b/assets/images/logos/workmob@2x.png similarity index 100% rename from assets/img/logos/workmob@2x.png rename to assets/images/logos/workmob@2x.png diff --git a/assets/img/more-icon-left.png b/assets/images/more-icon-left.png similarity index 100% rename from assets/img/more-icon-left.png rename to assets/images/more-icon-left.png diff --git a/assets/img/more-icon.png b/assets/images/more-icon.png similarity index 100% rename from assets/img/more-icon.png rename to assets/images/more-icon.png diff --git a/assets/less/base.less b/assets/less/base.less index f4bbf06b..dbda370e 100644 --- a/assets/less/base.less +++ b/assets/less/base.less @@ -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); } } } diff --git a/assets/less/boxes.less b/assets/less/boxes.less index e85c5234..3d4617bd 100644 --- a/assets/less/boxes.less +++ b/assets/less/boxes.less @@ -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; } } @@ -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; } \ No newline at end of file diff --git a/clients/rev1/java b/clients/rev1/java index 681ff6c9..618bfabd 160000 --- a/clients/rev1/java +++ b/clients/rev1/java @@ -1 +1 @@ -Subproject commit 681ff6c981cbe93b5cf15a88aa6a0c1777f516c6 +Subproject commit 618bfabd2b748ba5d2761f4f0c054f55ac978590 diff --git a/clients/rev1/php b/clients/rev1/php index eface5e9..7abbcbaa 160000 --- a/clients/rev1/php +++ b/clients/rev1/php @@ -1 +1 @@ -Subproject commit eface5e91a106935af484c25debb03deca58d285 +Subproject commit 7abbcbaa79e379460dc1f879664960b36e956aa8 diff --git a/clients/rev1/python b/clients/rev1/python index c29af43d..c38588f7 160000 --- a/clients/rev1/python +++ b/clients/rev1/python @@ -1 +1 @@ -Subproject commit c29af43d3ec5320a8d4320e807cb9ea5a53a9f36 +Subproject commit c38588f7e90e31066b259d2a4e8ed502fc16485a diff --git a/clients/rev1/ruby b/clients/rev1/ruby index cccbad19..527058ea 160000 --- a/clients/rev1/ruby +++ b/clients/rev1/ruby @@ -1 +1 @@ -Subproject commit cccbad19c146ca2587822411473ddb4556035b9f +Subproject commit 527058ea728b5e6366365dbaf4015307f3a47568 diff --git a/overview/rev1/overview/getting-started.rst b/overview/rev1/overview/getting-started.rst index 87842c7f..9c42480b 100644 --- a/overview/rev1/overview/getting-started.rst +++ b/overview/rev1/overview/getting-started.rst @@ -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/ @@ -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/workmob@2x.png + .. image:: //static/images/logos/workmob@2x.png :target: https://theworkmob.com/integrations/balancedpayments :height: 50px :width: 236px - .. image:: //static/img/logos/airpair@2x.png + .. image:: //static/images/logos/airpair@2x.png :target: http://www.airpair.com/balanced-payments :height: 50px :width: 187px