[forge-commits] [forge/website] 63b5ee: #49 Applied .flex CSS to addon boxes (shown in fir...

[George Gastaldi]

  Branch: refs/heads/nodejs
  Home:   https://github.com/forge/website
  Commit: 63b5eef8124fc5fe76938faded5d23f873d93e21
      https://github.com/forge/website/commit/63b5eef8124fc5fe76938faded5d23f873d93e21
  Author: visuale <james at visuale.net>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M addons.html
    M css/forge.css
    M css/forge_addons.css
    M css/forge_documentation.css

  Log Message:
  -----------
  #49 Applied .flex CSS to addon boxes (shown in first section with label 'Test Section')


  Commit: 507140e64cad8b2b0e9e35c11d0b5e668c41cb0a
      https://github.com/forge/website/commit/507140e64cad8b2b0e9e35c11d0b5e668c41cb0a
  Author: visuale <james at visuale.net>
  Date:   2015-05-28 (Thu, 28 May 2015)

  Changed paths:
    M css/forge_documentation.css
    M documentation.html

  Log Message:
  -----------
  #49 Updated documentation boxes to show in a flex-built grid.


  Commit: 34fce730e956f2ee24832da441090e4318ce928d
      https://github.com/forge/website/commit/34fce730e956f2ee24832da441090e4318ce928d
  Author: visuale <james at visuale.net>
  Date:   2015-05-28 (Thu, 28 May 2015)

  Changed paths:
    M addons.html
    M css/forge.css
    M css/forge_addons.css
    M css/forge_documentation.css
    M documentation.html

  Log Message:
  -----------
  Closes #51


  Commit: b7a8f0bdb8e3ab690cafd030a40881898d7d85d3
      https://github.com/forge/website/commit/b7a8f0bdb8e3ab690cafd030a40881898d7d85d3
  Author: George Gastaldi <gegastaldi at gmail.com>
  Date:   2015-05-29 (Fri, 29 May 2015)

  Changed paths:
    M app/css/forge.css
    M app/css/forge_addons.css
    M app/css/forge_documentation.css
    M app/views/addons.html
    M app/views/documentation.html

  Log Message:
  -----------
  Merge branch 'master' into nodejs

Conflicts:
	addons.html
	app/css/forge.css
	app/css/forge_addons.css
	app/css/forge_documentation.css
	documentation.html


Compare: https://github.com/forge/website/compare/0c7d32392db2...b7a8f0bdb8e3