From 1dfa8361c5f45e15621604cfea5f917c11f0af70 Mon Sep 17 00:00:00 2001 From: Nostradamos Date: Wed, 23 Aug 2017 22:12:02 +0200 Subject: [PATCH 1/3] Fixed https://github.com/vector-im/riot-web/issues/4804 --- src/components/structures/LoginBox.js | 2 +- .../css/matrix-react-sdk/structures/_LoginBox.scss | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/structures/LoginBox.js b/src/components/structures/LoginBox.js index c9f8e87a10..7cacc14e8a 100644 --- a/src/components/structures/LoginBox.js +++ b/src/components/structures/LoginBox.js @@ -84,7 +84,7 @@ module.exports = React.createClass({ var self = this; return ( -
+
{ loginButton } { toggleCollapse }
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss index 92d8833bc6..624dd15f96 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss +++ b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss @@ -14,6 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ +.mx_LoginBox { + min-height: 24px; + height: unset !important; + padding-top: 13px !important; + padding-bottom: 14px !important; +} + .mx_LoginBox_loginButton_wrapper { text-align: center; width: 100%; @@ -21,13 +28,13 @@ limitations under the License. .mx_LoginBox_loginButton, .mx_LoginBox_registerButton { - margin-top: -8px; + margin-top: 3px; height: 40px; border: 0px; border-radius: 40px; margin-left: 4px; margin-right: 4px; - width: 80px; + min-width: 80px; background-color: $accent-color; color: $primary-bg-color; From 372692677646f5e72a29c6aaec691c561d8421cb Mon Sep 17 00:00:00 2001 From: Nostradamos Date: Fri, 25 Aug 2017 18:23:56 +0200 Subject: [PATCH 2/3] added padding-left/padding-right: 12px to login/register buttons --- src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss index 624dd15f96..ffb1df22c9 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss +++ b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss @@ -42,4 +42,6 @@ limitations under the License. cursor: pointer; font-size: 15px; + padding-left: 12px; + padding-right: 12px; } From 861b6a2c6c773e87db84e3296873d75855191c07 Mon Sep 17 00:00:00 2001 From: Nostradamos Date: Wed, 30 Aug 2017 22:25:09 +0200 Subject: [PATCH 3/3] Changed padding to 0px 11px and added word-break: break-word --- .../vector/css/matrix-react-sdk/structures/_LoginBox.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss index ffb1df22c9..7f6199c451 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss +++ b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss @@ -42,6 +42,6 @@ limitations under the License. cursor: pointer; font-size: 15px; - padding-left: 12px; - padding-right: 12px; + padding: 0 11px; + word-break: break-word; }