logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 95e6bccec5a3bb89ca6b1511f12eb0caf5a241a4
parent: 4ba4772e921ce0600e62e116bbc8e68686e51f32
Author: William Pitcock <nenolod@dereferenced.org>
Date:   Mon, 20 Aug 2018 18:06:29 +0000

Revert "Unify button styles and use min-width"

This reverts commit 8f7919388391742671ef0398e017383d7f0b2bc5.

Diffstat:

Msrc/App.scss2--
Msrc/components/login_form/login_form.vue5+++++
Msrc/components/post_status_form/post_status_form.vue4++++
Msrc/components/settings/settings.vue2++
4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/App.scss b/src/App.scss @@ -63,8 +63,6 @@ button{ box-shadow: 0px 0px 2px black; font-size: 14px; font-family: sans-serif; - min-width: 10em; - min-height: 2em; &:hover { box-shadow: 0px 0px 4px rgba(255, 255, 255, 0.3); diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue @@ -34,6 +34,11 @@ @import '../../_variables.scss'; .login-form { + .btn { + min-height: 28px; + width: 10em; + } + .error { text-align: center; } diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue @@ -107,6 +107,10 @@ padding: 0.5em; height: 32px; + button { + width: 10em; + } + p { margin: 0.35em; padding: 0.35em; diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue @@ -117,6 +117,8 @@ .btn { margin-top: 1em; + min-height: 28px; + width: 10em; } } .setting-list {