Skip to content

Commit

Permalink
Merge remote-tracking branch 'codersArmy/master'
Browse files Browse the repository at this point in the history
* codersArmy/master:
  0.16.6
  Replaced all imports of 'public/less/bootstrap-vars.less' with import of '/public/vendor/bootstrap/less/variables.less'
  0.16.5
  Using bootstraps' variables file at public/vendor/bootstrap/less/variables.less, instead of our static copy at public/less/bootstrap-vars.less
  added link to email trouble wiki page
  version bumped 0.16.4
  update deps
  version bumped 0.16.3
  Fixed HTML5 Validator Errors
  version bumped 0.16.2
  updated less variables file for bootstrap v3.3.5

# Conflicts:
#	package.json
#	public/less/bootstrap-vars.less
#	views/index.jade
  • Loading branch information
asbjornu committed Mar 3, 2016
2 parents f3b6abd + d6d6d7b commit ffc3643
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 883 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ secrets. If you have issues during installation related to `bcrypt` then [refer
to this wiki
page](https://github.com/jedireza/drywall/wiki/bcrypt-Installation-Trouble).

We use [`emailjs`](https://github.com/eleith/emailjs) for email transport. If
you have issues sending email [refer to this wiki
page](https://github.com/jedireza/drywall/wiki/Trouble-sending-email).


## Installation

Expand Down
4 changes: 2 additions & 2 deletions layouts/account.jade
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ html
div.container
div.navbar-header
a.navbar-brand(href='/account/')
img.navbar-logo(src='/media/logo-symbol-64x64.png')
img.navbar-logo(src='/media/logo-symbol-64x64.png', alt='Logo')
span.navbar-brand-label #{projectName}
button.navbar-toggle.collapsed(data-toggle='collapse', data-target='.my-navbar-collapse')
span.icon-bar
Expand Down Expand Up @@ -41,7 +41,7 @@ html
div.clearfix

div.ajax-spinner
img(src='/media/ajax-pulse.gif')
img(src='/media/ajax-pulse.gif', alt='Loading')

//if lte IE 9
script(src='/layouts/ie-sucks.min.js?#{cacheBreaker}')
Expand Down
4 changes: 2 additions & 2 deletions layouts/admin.jade
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ html
div.container
div.navbar-header
a.navbar-brand(href='/admin/')
img.navbar-logo(src='/media/logo-symbol-64x64.png')
img.navbar-logo(src='/media/logo-symbol-64x64.png', alt='Logo')
span.navbar-brand-label #{projectName}
button.navbar-toggle.collapsed(data-toggle='collapse', data-target='.my-navbar-collapse')
span.icon-bar
Expand Down Expand Up @@ -51,7 +51,7 @@ html
div.clearfix

div.ajax-spinner
img(src='/media/ajax-pulse.gif')
img(src='/media/ajax-pulse.gif', alt='Loading')

script(type='text/template', id='tmpl-_search')
div.dropdown
Expand Down
4 changes: 2 additions & 2 deletions layouts/default.jade
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ html
div.container
div.navbar-header
a.navbar-brand(href='/')
img.navbar-logo(src='/media/logo-symbol-64x64.png')
img.navbar-logo(src='/media/logo-symbol-64x64.png', alt='Logo')
span.navbar-brand-label #{projectName}
button.navbar-toggle.collapsed(data-toggle='collapse', data-target='.my-navbar-collapse')
span.icon-bar
Expand Down Expand Up @@ -47,7 +47,7 @@ html
div.clearfix

div.ajax-spinner
img(src='/media/ajax-pulse.gif')
img(src='/media/ajax-pulse.gif', alt='Loading')

//if lte IE 9
script(src='/layouts/ie-sucks.min.js?#{cacheBreaker}')
Expand Down
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"name": "Wetwall",
"version": "0.16.1",
"name": "Drywall",
"version": "0.16.6",
"private": true,
"scripts": {
"start": "grunt",
"test": "NODE_ENV=test mocha specs"
"test": "NODE_ENV=test mocha specs",
"update": "david update"
},
"dependencies": {
"async": "^1.5.0",
Expand Down Expand Up @@ -44,6 +45,7 @@
"chai": "^3.4.1",
"chai-as-promised": "^5.1.0",
"codecov": "^1.0.1",
"david": "^6.x.x",
"font-awesome": "^4.1.0",
"grunt": "^0.4.x",
"grunt-cli": "^0.1.13",
Expand Down
2 changes: 1 addition & 1 deletion public/less/bootstrap-build.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Core variables and mixins
@import "bootstrap-vars.less";
@import "../vendor/bootstrap/less/variables.less";
@import "../vendor/bootstrap/less/mixins.less";

// Reset
Expand Down
Loading

0 comments on commit ffc3643

Please sign in to comment.