From 02fcb181213b1d968b8a15682e2566a1668b3764 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Wed, 18 Sep 2013 20:45:58 +0200 Subject: [PATCH] implement read view --- Gruntfile.js | 15 ----------- src/js/controller/mail-list.js | 2 ++ src/sass/all.scss | 1 + src/sass/views/_navigation.scss | 1 + src/sass/views/_read.scss | 44 +++++++++++++++++++++++++++++++ src/tpl/read.html | 46 +++++++++++++-------------------- 6 files changed, 66 insertions(+), 43 deletions(-) create mode 100644 src/sass/views/_read.scss diff --git a/Gruntfile.js b/Gruntfile.js index 0a26164..fddab57 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -75,11 +75,6 @@ module.exports = function(grunt) { files: { 'dist/css/all.css': 'src/sass/all.scss' } - }, - oldSass: { - files: { - 'dist/css/style.css': 'src/css/style.scss' - } } }, autoprefixer: { @@ -107,10 +102,6 @@ module.exports = function(grunt) { files: ['src/sass/**/*.scss'], tasks: ['dist-css'] }, - oldSass: { - files: ['src/css/**/*.scss'], - tasks: ['sass:oldSass'] - }, js: { files: ['src/js/**/*.js'], tasks: ['copy:js'] @@ -125,12 +116,6 @@ module.exports = function(grunt) { } }, copy: { - oldSass: { - expand: true, - cwd: 'src/css/', - src: ['reset.css', 'icons.ttf'], - dest: 'dist/css/' - }, npm: { expand: true, flatten: true, diff --git a/src/js/controller/mail-list.js b/src/js/controller/mail-list.js index 589ad63..b1ba7bf 100644 --- a/src/js/controller/mail-list.js +++ b/src/js/controller/mail-list.js @@ -14,6 +14,8 @@ define(function(require) { $scope.select = function(email) { email.bodyDisplayParts = email.body.split('\n'); $scope.selected = email; + // set selected in parent scope ro it can be displayed in the read view + $scope.$parent.selected = $scope.selected; }; $scope.write = function(replyTo) { diff --git a/src/sass/all.scss b/src/sass/all.scss index 918d1ec..d39de27 100755 --- a/src/sass/all.scss +++ b/src/sass/all.scss @@ -21,3 +21,4 @@ // Views @import "views/navigation"; @import "views/mail-list"; +@import "views/read"; diff --git a/src/sass/views/_navigation.scss b/src/sass/views/_navigation.scss index b54e890..ba9ce68 100755 --- a/src/sass/views/_navigation.scss +++ b/src/sass/views/_navigation.scss @@ -21,6 +21,7 @@ height: 100px; width: 300px; margin: 0px; + padding: 0px; padding-top: 10px; color: #fff; diff --git a/src/sass/views/_read.scss b/src/sass/views/_read.scss new file mode 100644 index 0000000..c005392 --- /dev/null +++ b/src/sass/views/_read.scss @@ -0,0 +1,44 @@ +.view-read { + padding: 10px 15px; + color: $color-grey-dark; + + .headers { + p { + margin: 0px; + padding: 0px; + } + + .subject { + font-size: $font-size-bigger; + } + + .date { + color: $color-grey-light; + font-size: $font-size-small; + margin-top: 0.5em; + margin-bottom: 1.5em; + padding: 0px; + } + + .address { + padding: 0.2em 0; + } + } + + .seperator-line { + height: 1px; + color: $color-grey-lighter; + background-color: $color-grey-lighter; + margin-top: 1em; + margin-bottom: 1.5em; + } +} + +.controls { + float: right; + margin: 10px 15px; + + button { + margin-left: 7px; + } +} \ No newline at end of file diff --git a/src/tpl/read.html b/src/tpl/read.html index 871120f..58b5f27 100644 --- a/src/tpl/read.html +++ b/src/tpl/read.html @@ -1,39 +1,29 @@ -
-
-
-
+
+ + + +
-
-
-
- -
-
-
-
- -
-

{{selected.subject}}

-

{{selected.longDisplayDate}}

- -
-

From: {{selected.from[0].name || selected.from[0].address}}

-

To: {{t.address}}

+
+
+

{{selected.subject}}

+

{{selected.longDisplayDate}}

+

From: {{selected.from[0].name || selected.from[0].address}}

+

To: {{t.address}}

-

- CC: {{t.address}} +

+ CC: {{t.address}}

-
+

- -
- {{part}} + + {{part}}

-
-
\ No newline at end of file +
+ \ No newline at end of file