Merge branch 'develop' into feature/mobile-first-less

thisissoon · Jan 18, 2016 · 6b9c696 · 6b9c696
2 parents 1ca7b06 + 9e50710
commit 6b9c696
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/app/less/default/core/type.less b/app/less/default/core/type.less
@@ -0,0 +1,8 @@
+//
+// Typography
+// --------------------------------------------------
+
+body {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
diff --git a/app/less/main.less b/app/less/main.less
@@ -35,6 +35,7 @@
 // Import less files specifically for app here
 
 @import "default/core/variables.less";
+@import "default/core/type.less";
 
 
 // Import less files for large desktop devices

diff --git a/tests/e2e/protractor.saucelabs.conf.js b/tests/e2e/protractor.saucelabs.conf.js
@@ -67,14 +67,12 @@ exports.config = {
     'appiumVersion': '1.4.11',
     'deviceOrientation': 'portrait'
   },{
-    'browserName': 'Safari',
+    'browserName': 'iphone',
     'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
     'build': process.env.TRAVIS_BUILD_NUMBER,
-    'name':  pkg.name + ' (Safari: iOS 8.2) Build: ' + process.env.TRAVIS_BUILD_NUMBER,
-    'platformVersion': '8.2',
-    'platformName': 'iOS',
+    'name':  pkg.name + ' (Safari: iOS) Build: ' + process.env.TRAVIS_BUILD_NUMBER,
+    'platform': 'OS X 10.10',
     'deviceName': 'iPhone 6',
-    'appiumVersion': '1.3.7',
     'deviceOrientation': 'portrait'
   }],