summaryrefslogtreecommitdiff
path: root/web-ui
diff options
context:
space:
mode:
Diffstat (limited to 'web-ui')
-rw-r--r--web-ui/app/sandbox.html1
-rw-r--r--web-ui/app/scss/sandbox.scss7
-rw-r--r--web-ui/package.json2
-rw-r--r--web-ui/test/spec/mail_view/ui/compose_box.spec.js2
-rw-r--r--web-ui/test/spec/page/logout.spec.js3
5 files changed, 10 insertions, 5 deletions
diff --git a/web-ui/app/sandbox.html b/web-ui/app/sandbox.html
index 13a86f25..8325b0da 100644
--- a/web-ui/app/sandbox.html
+++ b/web-ui/app/sandbox.html
@@ -3,7 +3,6 @@
<head>
<meta charset="utf-8">
- <link href="css/opensans.css" rel="stylesheet" type="text/css">
<link href="css/sandbox.css" rel="stylesheet" type="text/css">
<!--usemin_start-->
diff --git a/web-ui/app/scss/sandbox.scss b/web-ui/app/scss/sandbox.scss
index 3cb4c441..3c1be358 100644
--- a/web-ui/app/scss/sandbox.scss
+++ b/web-ui/app/scss/sandbox.scss
@@ -1,5 +1,12 @@
$search-highlight: #FFEF29;
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Open Sans'), local('OpenSans'), url('/sandbox/fonts/OpenSans.woff') format('woff');
+}
+
body {
font-family: "Open Sans", "Microsoft YaHei", "Hiragino Sans GB", "Hiragino Sans GB W3", "微软雅黑", "Helvetica Neue", Arial, sans-serif;
font-size: 13px;
diff --git a/web-ui/package.json b/web-ui/package.json
index fae3fb19..652e7b0e 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -15,7 +15,7 @@
"karma-firefox-launcher": "0.1.7",
"karma-jasmine": "0.2.2",
"karma-junit-reporter": "0.2.2",
- "karma-phantomjs-launcher": "0.1.4",
+ "karma-phantomjs-launcher": "1.0.0",
"karma-requirejs": "0.2.2",
"karma-coverage": "0.2.7",
"minify": "^2.0.5",
diff --git a/web-ui/test/spec/mail_view/ui/compose_box.spec.js b/web-ui/test/spec/mail_view/ui/compose_box.spec.js
index 6d318815..26941156 100644
--- a/web-ui/test/spec/mail_view/ui/compose_box.spec.js
+++ b/web-ui/test/spec/mail_view/ui/compose_box.spec.js
@@ -137,7 +137,7 @@ describeComponent('mail_view/ui/compose_box', function () {
});
it('should show the subject label after the user starts typing', function() {
- input.val('test');
+ input.text('test');
input.trigger('keyup');
expect(input.hasClass('showfloatlabel')).toEqual(true);
diff --git a/web-ui/test/spec/page/logout.spec.js b/web-ui/test/spec/page/logout.spec.js
index a8b882b0..49f8b5e5 100644
--- a/web-ui/test/spec/page/logout.spec.js
+++ b/web-ui/test/spec/page/logout.spec.js
@@ -16,7 +16,7 @@ describeComponent('page/logout', function () {
var logout_form = this.component.$node.find('form')[0];
expect(logout_form).toExist();
expect(logout_form.action).toMatch('test/logout/url');
- expect(logout_form.method).toMatch('POST');
+ expect(logout_form.method).toMatch('post');
});
it('should not provide logout form if logout is disabled', function () {
@@ -75,4 +75,3 @@ describeComponent('page/logout', function () {
});
});
-