diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss index 146e4745d..5b01b1b87 100644 --- a/stylesheets/_conversation.scss +++ b/stylesheets/_conversation.scss @@ -1,6 +1,6 @@ .conversation-title { display: block; - line-height: $button-height; + line-height: 36px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -212,10 +212,6 @@ font-size: smaller; } -.new-group-update { - .container { height: calc(100% - #{$button-height} - 85px); } -} - .private .entry .avatar, .private .sender, .outgoing .sender { diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss index 9e7b881e5..18f29d6b9 100644 --- a/stylesheets/_global.scss +++ b/stylesheets/_global.scss @@ -83,9 +83,11 @@ button.back { .header-buttons { &.left { float: left; + padding-left: 10px; } &.right { float: right; + padding-right: 10px; } height: 0; @@ -121,9 +123,8 @@ button.back { right: 0; margin: 0; padding: 0; - border: solid 1px $blue; background-color: white; - box-shadow: -2px 2px 2px 0px rgba(0,0,0, 0.2); + box-shadow: 0 0 1px 1px rgba(0,0,0, 0.2); li { display: block; diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss index f64effd8c..183291549 100644 --- a/stylesheets/_index.scss +++ b/stylesheets/_index.scss @@ -84,7 +84,7 @@ input.search { padding: 0; margin: 0; outline: 0; - height: $button-height; + height: 36px; width: 100%; padding: 10px; border: solid 1px $grey_l; diff --git a/stylesheets/_variables.scss b/stylesheets/_variables.scss index a7855036a..50ab66218 100644 --- a/stylesheets/_variables.scss +++ b/stylesheets/_variables.scss @@ -30,7 +30,7 @@ $roboto: Roboto, 'Helvetica Neue', Arial, Helvetica, sans-serif; $roboto-light: Roboto-Light, 'Helvetica Neue', Arial, Helvetica, sans-serif; $header-height: 64px; -$button-height: 36px; +$button-height: 24px; $header-color: $blue; $bubble-border-radius: 20px; diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css index 2306a51d7..8f7bf1bad 100644 --- a/stylesheets/manifest.css +++ b/stylesheets/manifest.css @@ -53,9 +53,9 @@ body { .conversation-header button, .title-bar button { - width: 36px; - height: 36px; - line-height: 36px; + width: 24px; + height: 24px; + line-height: 24px; padding: 0; border: 0; outline: 0; } @@ -94,9 +94,11 @@ button.back { .header-buttons { height: 0; } .header-buttons.left { - float: left; } + float: left; + padding-left: 10px; } .header-buttons.right { - float: right; } + float: right; + padding-right: 10px; } .header-buttons .vertical-align { height: 64px; vertical-align: middle; @@ -115,8 +117,8 @@ button.back { position: relative; float: right; } .menu .hamburger { - width: 36px; - height: 36px; + width: 24px; + height: 24px; vertical-align: middle; -webkit-mask: url("/images/menu.svg") no-repeat center; -webkit-mask-size: 100%; @@ -135,9 +137,8 @@ button.back { right: 0; margin: 0; padding: 0; - border: solid 1px #2090ea; background-color: white; - box-shadow: -2px 2px 2px 0px rgba(0, 0, 0, 0.2); } + box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.2); } .menu .menu-list li { display: block; white-space: nowrap; @@ -471,7 +472,7 @@ input[type=text]:active, input[type=text]:focus, input[type=search]:active, inpu .socket-status { float: right; - line-height: 36px; } + line-height: 24px; } .socket-status * { display: inline; padding-left: 20px; @@ -788,9 +789,6 @@ input.search { .group-update { font-size: smaller; } -.new-group-update .container { - height: calc(100% - 36px - 85px); } - .private .entry .avatar, .private .sender, .outgoing .sender {