From ffe87e4e9c6c27935906cf2dda2cfa6024feaab1 Mon Sep 17 00:00:00 2001 From: Evan Morikawa Date: Mon, 22 Jun 2015 17:12:26 -0700 Subject: [PATCH] fix(build): fix tello issue and less linter issue --- build/Gruntfile.coffee | 1 + build/package.json | 2 +- internal_packages/message-list/stylesheets/message-list.less | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee index d676a7549..1d46f637a 100644 --- a/build/Gruntfile.coffee +++ b/build/Gruntfile.coffee @@ -243,6 +243,7 @@ module.exports = (grunt) -> 'unique-headings': false 'universal-selector': false 'vendor-prefix': false + 'duplicate-properties': false # doesn't place nice with mixins src: [ 'static/**/*.css' ] diff --git a/build/package.json b/build/package.json index b12d785a1..21a2278a1 100644 --- a/build/package.json +++ b/build/package.json @@ -42,7 +42,7 @@ "rimraf": "~2.2.2", "runas": "~1.0.1", "s3": "^4.3", - "tello": "git+https://github.com/nylas/tello.git", + "tello": "git+https://github.com/nylas/tello.git#built", "temp": "~0.8.1", "underscore": "^1.8", "underscore.string": "^3.0", diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less index 52ab46822..7cfa8065a 100644 --- a/internal_packages/message-list/stylesheets/message-list.less +++ b/internal_packages/message-list/stylesheets/message-list.less @@ -234,7 +234,7 @@ border-right: 1px solid @border-color-divider; border-left: 1px solid @border-color-divider; background-color: darken(@background-primary, 2%); - box-shadow: 0px 1px 1px rgba(0,0,0,0.1) + box-shadow: 0 1px 1px rgba(0,0,0,0.1) } }