diff --git a/src/js/controller/mail-list.js b/src/js/controller/mail-list.js index b1ba7bf..adec3bf 100644 --- a/src/js/controller/mail-list.js +++ b/src/js/controller/mail-list.js @@ -18,23 +18,6 @@ define(function(require) { $scope.$parent.selected = $scope.selected; }; - $scope.write = function(replyTo) { - var replyToId = (replyTo) ? replyTo.uid : '', - url = 'index.html#/write/' + replyToId; - - if (window.chrome && chrome.app.window) { - chrome.app.window.create(url, { - 'bounds': { - 'width': 800, - 'height': 700 - } - }); - return; - } - - window.open(url, 'Compose Message', 'toolbar=no,width=800,height=700,left=500,top=200,status=no,scrollbars=no,resize=no'); - }; - if (false && window.chrome && chrome.identity) { fetchList($scope.folder, function(emails) { $scope.emails = emails; diff --git a/src/js/controller/navigation.js b/src/js/controller/navigation.js index 1d44d43..06fe5ee 100644 --- a/src/js/controller/navigation.js +++ b/src/js/controller/navigation.js @@ -11,6 +11,23 @@ define(function() { $scope.closeNav = function() { $scope.navOpen = false; }; + + $scope.write = function(replyTo) { + var replyToId = (replyTo) ? replyTo.uid : '', + url = 'index.html#/write/' + replyToId; + + if (window.chrome && chrome.app.window) { + chrome.app.window.create(url, { + 'bounds': { + 'width': 800, + 'height': 700 + } + }); + return; + } + + window.open(url, 'Compose Message', 'toolbar=no,width=800,height=700,left=500,top=200,status=no,scrollbars=no,resize=no'); + }; }; return NavigationCtrl; diff --git a/src/sass/_scaffolding.scss b/src/sass/_scaffolding.scss index 74e888a..8e8d003 100755 --- a/src/sass/_scaffolding.scss +++ b/src/sass/_scaffolding.scss @@ -30,6 +30,8 @@ textarea { font-family: inherit; font-size: inherit; line-height: inherit; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } // Basic layout diff --git a/src/sass/all.scss b/src/sass/all.scss index d39de27..f5edfc2 100755 --- a/src/sass/all.scss +++ b/src/sass/all.scss @@ -22,3 +22,4 @@ @import "views/navigation"; @import "views/mail-list"; @import "views/read"; +@import "views/write"; diff --git a/src/sass/views/_read.scss b/src/sass/views/_read.scss index c005392..9524ac0 100644 --- a/src/sass/views/_read.scss +++ b/src/sass/views/_read.scss @@ -1,4 +1,5 @@ .view-read { + margin: 0px; padding: 10px 15px; color: $color-grey-dark; diff --git a/src/sass/views/_write.scss b/src/sass/views/_write.scss new file mode 100644 index 0000000..cc77e87 --- /dev/null +++ b/src/sass/views/_write.scss @@ -0,0 +1,71 @@ +.view-write { + margin: 0px; + padding: 10px; + color: $color-grey-dark; + + .title { + text-align: center; + font-size: $font-size-bigger; + margin-bottom: 20px; + } + + input { + border: 0!important; + outline: 0px; + } + + button { + border: 0!important; + } + + .address-input { + width: 90%; + } + + .subject-box { + margin: 20px 0; + width: inherit; + border: 1px; + border-style: solid; + border-color: $color-grey-lighter; + height: em(44); + + .subject-line { + float: left; + padding: 10px; + width: 80%; + color: $color-grey; + } + + .subject { + font-weight: bold; + width: 100%; + } + + .btn-attachment { + float: right; + padding: em(7.5) em(7.5) em(4) em(7.5); + margin: em(5); + color: $color-grey-lightest; + background-color: $color-blue; + } + } + + *[contentEditable] { + outline: 0px; + } + + .encrypt-preview { + font-size: 0.9em; + margin-top: 3em; + font-family: monospace; + color: $color-grey-light; + word-wrap: break-word; + } + + .send-control { + position: absolute; + bottom: 10px; + right: 10px; + } +} \ No newline at end of file diff --git a/src/tpl/write.html b/src/tpl/write.html index 46f7313..2a5596b 100644 --- a/src/tpl/write.html +++ b/src/tpl/write.html @@ -1,4 +1,4 @@ -
\ No newline at end of file