Commit 4536fdf0 authored by JC Brand's avatar JC Brand

Merge branch 'master' of github.com:jcbrand/converse.js

parents b9c42af6 891f8afb
...@@ -2270,16 +2270,13 @@ body { ...@@ -2270,16 +2270,13 @@ body {
margin: 10% 0 0 0; margin: 10% 0 0 0;
color: #387592; } color: #387592; }
#conversejs #controlbox #login-dialog .converse-form, #conversejs #controlbox #register .converse-form { #conversejs #controlbox #login-dialog .converse-form, #conversejs #controlbox #register .converse-form {
margin-top: 4em; } margin: 4em 30% 0 30%; }
#conversejs #controlbox.fullscreen { #conversejs #controlbox.fullscreen {
width: 100%; } width: 100%; }
#conversejs #controlbox.fullscreen .controlbox-pane {
height: auto; }
#conversejs #controlbox.fullscreen .box-flyout { #conversejs #controlbox.fullscreen .box-flyout {
width: 100%; } width: 100%; }
#conversejs #controlbox .box-flyout { #conversejs #controlbox .box-flyout {
border: 0; border: 0;
background-color: white;
min-width: 250px; min-width: 250px;
width: 200px; width: 200px;
z-index: 1; z-index: 1;
......
...@@ -12,22 +12,18 @@ ...@@ -12,22 +12,18 @@
color: $blue; color: $blue;
} }
.converse-form { .converse-form {
margin-top: 4em; margin: 4em 30% 0 30%;
} }
} }
&.fullscreen { &.fullscreen {
width: 100%; width: 100%;
.controlbox-pane {
height: auto;
}
.box-flyout { .box-flyout {
width: 100%; width: 100%;
} }
} }
.box-flyout { .box-flyout {
border: 0; border: 0;
background-color: white;
min-width: $controlbox-width; min-width: $controlbox-width;
width: 200px; width: 200px;
z-index: 1; z-index: 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment