Skip to content
This repository has been archived by the owner on Jul 10, 2019. It is now read-only.

Fix for few grunt build blocking bugs #416

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ module.exports = function(grunt) {
handleFetch: handleFetch,
logger: grunt.log.writeln,
dynamicUrlToDependencies: {
'socket.io/socket.io.js': ['node_modules/socket.io/node_modules/socket.io-client/socket.io.js'],
'socket.io/socket.io.js': ['node_modules/socket.io-client/dist/socket.io.js'],
},
staticFileGlobs: [
rootDir + '/*.html',
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "whiteout-mail",
"version": "1.2.2",
"description": "Mail App with integrated OpenPGP encryption.",
"author": "Whiteout Networks",
"homepage": "https://whiteout.io",
Expand Down
2 changes: 2 additions & 0 deletions src/sass/blocks/basics/_mail-addresses.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@charset "UTF-8";

.mail-addresses {
position: relative;
margin-bottom: 0.2em;
Expand Down
2 changes: 1 addition & 1 deletion src/sass/lib/_scut.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,7 @@ $scut-swhitesquare: "\25ab";

$element-list: em, cite, i;
@each $el in $elements {
$element-list: append($element-list, unquote($el), comma)
$element-list: append($element-list, $el, comma)
}

font-style: italic;
Expand Down