diff options
Diffstat (limited to 'web-ui/app/scss')
| -rw-r--r-- | web-ui/app/scss/_colors.scss | 4 | ||||
| -rw-r--r-- | web-ui/app/scss/_compose.scss | 8 | ||||
| -rw-r--r-- | web-ui/app/scss/_mixins.scss | 18 | ||||
| -rw-r--r-- | web-ui/app/scss/_read.scss | 7 | ||||
| -rw-r--r-- | web-ui/app/scss/main.scss | 11 | ||||
| -rw-r--r-- | web-ui/app/scss/styles.scss | 3 |
6 files changed, 34 insertions, 17 deletions
diff --git a/web-ui/app/scss/_colors.scss b/web-ui/app/scss/_colors.scss index 4a1eba33..320a8d1a 100644 --- a/web-ui/app/scss/_colors.scss +++ b/web-ui/app/scss/_colors.scss @@ -34,5 +34,5 @@ $error: #D93C38; $attention: #F6A41C; $success: #50BA5B; -$will_be_encrypted: #41cd60; -$wont_be_encrypted: #F6A40A; +$will_be_encrypted: $success; +$wont_be_encrypted: $attention; diff --git a/web-ui/app/scss/_compose.scss b/web-ui/app/scss/_compose.scss index c026b866..acff745d 100644 --- a/web-ui/app/scss/_compose.scss +++ b/web-ui/app/scss/_compose.scss @@ -24,7 +24,8 @@ // COMPOSE PANE #compose-box, #draft-box, #reply-box { - margin: 0 0 50px 10px; + margin: 5px 0 50px 30px; + padding: 0; .input-container { border-bottom: 1px solid #DDD; padding: 1px; @@ -44,7 +45,6 @@ &#subject { font-size: 1.6875rem; line-height: 1.4; - margin-top: 26px; } } textarea { @@ -85,6 +85,10 @@ } } + button.close-mail-button { + margin: 1px; + } + @include recipients; } diff --git a/web-ui/app/scss/_mixins.scss b/web-ui/app/scss/_mixins.scss index 2ce4999a..e1f06425 100644 --- a/web-ui/app/scss/_mixins.scss +++ b/web-ui/app/scss/_mixins.scss @@ -133,7 +133,7 @@ input { display: inline; font-size: 1em; - padding: 2px 5px; + padding: 1px 5px; width: 120px; margin: 0; } @@ -202,11 +202,27 @@ &.selected { border: 1px solid #666666; } + + &:before { + font-family: FontAwesome; + padding-right: 4px; + + } &.encrypted { border-bottom-color: $will_be_encrypted; + + &:before { + color: $will_be_encrypted; + content: "\f023 "; + } } &.not-encrypted { border-bottom-color: $wont_be_encrypted; + + &:before { + color: $wont_be_encrypted; + content: "\f13e "; + } } background-color: #F5F5F5; border: 1px solid #D9D9D9; diff --git a/web-ui/app/scss/_read.scss b/web-ui/app/scss/_read.scss index 7235df72..d621f672 100644 --- a/web-ui/app/scss/_read.scss +++ b/web-ui/app/scss/_read.scss @@ -32,6 +32,13 @@ height: 27px; margin-right: 3px; } + + .full-view-header { + display:inline-block; + padding-top: 5px; + width:95%; + flex-shrink:1; + } } h3 { margin-bottom: 0; diff --git a/web-ui/app/scss/main.scss b/web-ui/app/scss/main.scss index f4ce2c4b..ed9b90c4 100644 --- a/web-ui/app/scss/main.scss +++ b/web-ui/app/scss/main.scss @@ -26,17 +26,6 @@ header#main { padding: 0; } -.tip-msg { - padding: 10px; - margin: 8px 20px -25px 20px; - background: $warning; - color: darken($warning, 50%); - font-size: 0.9em; - i { - margin-right: 5px; - } -} - .text-right { text-align: right; } diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index 6dd82c4e..4f2a56ee 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -344,7 +344,8 @@ section { visibility: hidden; opacity: 0; transition-duration: 500ms; - height: 220px; + height: 100%; + max-height: 220px; overflow: auto; background-color: lighten($navigation_background,1); |