diff options
| author | Felix Hammerl <fhammerl@thoughtworks.com> | 2016-03-31 11:37:53 +0200 |
|---|---|---|
| committer | Felix Hammerl <fhammerl@thoughtworks.com> | 2016-04-13 17:10:58 +0200 |
| commit | f94200b27cb2234ad3aee66accecd69e4639b7ed (patch) | |
| tree | b9e4834b57b46d852cd5b60c27d075699b9af0d5 | |
| parent | 7989f4865fa2cdd53def927cbe2112b09f6f6587 (diff) | |
Issue #670: Move reply view to composeO
| -rw-r--r-- | web-ui/app/scss/_reply.scss | 37 | ||||
| -rw-r--r-- | web-ui/app/scss/style.scss | 1 | ||||
| -rw-r--r-- | web-ui/app/scss/views/_compose-view.scss | 41 |
3 files changed, 41 insertions, 38 deletions
diff --git a/web-ui/app/scss/_reply.scss b/web-ui/app/scss/_reply.scss deleted file mode 100644 index 622bdd5a..00000000 --- a/web-ui/app/scss/_reply.scss +++ /dev/null @@ -1,37 +0,0 @@ - -#reply-section { - padding-left: 30px; - .reply-container { - margin: 10px 0; - padding: 10px; - border: 1px dashed darken($contrast, 10%); - @include btn-transition; - } - - button { - margin: 0; - } - - #all-recipients { - color: $black; - } - - #all-recipients:focus { - background-color: darken($contrast, 10%) - } - - #reply-button, #reply-all-button, #forward-button { - text-align: center; - font-weight: 100; - font-size: 1.1em; - background: $white; - color: $medium_light_grey; - padding: 25px; - margin: 0; - @include border-radius(0); - &:hover { - background: darken($contrast, 5%); - cursor: pointer; - } - } -} diff --git a/web-ui/app/scss/style.scss b/web-ui/app/scss/style.scss index db9486fa..4468bd28 100644 --- a/web-ui/app/scss/style.scss +++ b/web-ui/app/scss/style.scss @@ -34,6 +34,5 @@ @import "others"; // TODO -@import "reply"; @import "styles"; diff --git a/web-ui/app/scss/views/_compose-view.scss b/web-ui/app/scss/views/_compose-view.scss index 2ed305c8..e4282564 100644 --- a/web-ui/app/scss/views/_compose-view.scss +++ b/web-ui/app/scss/views/_compose-view.scss @@ -318,3 +318,44 @@ display: block; } } + +#reply-section { + padding-left: 30px; + + .reply-container { + margin: 10px 0; + padding: 10px; + border: 1px dashed darken($contrast, 10%); + + @include btn-transition; + } + + button { + margin: 0; + } + + #all-recipients { + color: $black; + } + + #all-recipients:focus { + background-color: darken($contrast, 10%); + } + + #reply-button, #reply-all-button, #forward-button { + text-align: center; + font-weight: 100; + font-size: 1.1em; + background: $white; + color: $medium_light_grey; + padding: 25px; + margin: 0; + + @include border-radius(0); + + &:hover { + background: darken($contrast, 5%); + cursor: pointer; + } + } +} |