diff --git a/client/css/style.css b/client/css/style.css index 113611e7..6c2958e7 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -324,7 +324,7 @@ button { } #sidebar { - bottom: 52px; + bottom: 48px; left: 0; overflow: auto; overflow-x: hidden; @@ -506,15 +506,14 @@ button { #footer { background: rgba(0, 0, 0, .06); - border-radius: 2px; - bottom: 4px; + bottom: 0; height: 45px; - left: 5px; + left: 0; font-size: 14px; line-height: 45px; position: absolute; text-align: center; - width: 210px; + width: 220px; } #footer button.active { @@ -547,11 +546,11 @@ button { } #main { - bottom: 4px; + bottom: 0; left: 220px; position: absolute; - right: 5px; - top: 4px; + right: 0; + top: 0; display: -webkit-flex; display: flex; -webkit-flex-direction: column; @@ -601,20 +600,8 @@ button { border-color: #79838c; } -#windows .window:before { - background: #f4f4f4; - background-image: linear-gradient(#f4f4f4, #ececec); - border-bottom: 1px solid #d7d7d7; - content: " "; - display: block; - height: 10px; - position: relative; - z-index: 10; -} - #windows .window { background: #fff; - border-radius: 2px; bottom: 0; display: none; left: 0; @@ -1598,13 +1585,9 @@ button { transform: translate3d(-180px, 0, 0); } - #sidebar { - left: -220px; - } - + #sidebar, #footer { - left: -215px; - width: 215px; + left: -220px; } #sidebar .empty:before { @@ -1612,8 +1595,7 @@ button { } #main { - left: 5px; - right: 5px; + left: 0; } #chat .chat { diff --git a/client/themes/crypto.css b/client/themes/crypto.css index d86c6070..61a7c31d 100644 --- a/client/themes/crypto.css +++ b/client/themes/crypto.css @@ -34,16 +34,6 @@ a:hover, border-bottom: none; } -#main { - right: 0; - bottom: 0; - top: 0; -} - -#windows .window { - border-radius: 0; -} - .container { margin: 40px auto; } @@ -68,11 +58,6 @@ a:hover, background: #00ff0e; } -#windows .window:before, -#windows .chan:before { - content: none; -} - #settings .opt { line-height: 20px; font-size: 12px; @@ -111,11 +96,6 @@ a:hover, line-height: 1.8; } -#chat .chat, -#chat .sidebar { - top: 48px; -} - #chat .user { color: black; font-weight: bold; @@ -137,9 +117,3 @@ a:hover, .tooltipped:after { font-family: Inconsolata-g, monospace; } - -@media (max-width: 768px) { - #main { - left: 0; - } -} diff --git a/client/themes/example.css b/client/themes/example.css index e318b675..d85df9fa 100644 --- a/client/themes/example.css +++ b/client/themes/example.css @@ -9,3 +9,50 @@ body { .signed-out #main { left: 5px; } + +#sidebar { + bottom: 52px; +} + +#footer { + border-radius: 2px; + bottom: 4px; + left: 5px; + width: 210px; +} + +#main { + bottom: 4px; + right: 5px; + top: 4px; +} + +#windows .window:before { + background: #f4f4f4; + background-image: linear-gradient(#f4f4f4, #ececec); + border-bottom: 1px solid #d7d7d7; + content: " "; + display: block; + height: 10px; + position: relative; + z-index: 10; +} + +#windows .window { + border-radius: 2px; +} + +@media (max-width: 768px) { + #sidebar { + left: -220px; + } + + #footer { + left: -215px; + width: 215px; + } + + #main { + left: 5px; + } +} diff --git a/client/themes/morning.css b/client/themes/morning.css index bc0b76fb..f6731ed8 100644 --- a/client/themes/morning.css +++ b/client/themes/morning.css @@ -59,34 +59,6 @@ body { border-color: #2a323d; } -/* Attach chat to window borders */ -#windows .window:before, -#windows .chan:before { - display: none; -} - -#footer { - left: 0; - bottom: 0; - width: 220px; - border-radius: 0; -} - -#main { - top: 0; - bottom: 0; - right: 0; -} - -#windows .window { - border-radius: 0; -} - -#chat .chat, -#chat .sidebar { - top: 48px; -} - /* User list */ #chat .user-mode { color: #fefefe; @@ -244,13 +216,3 @@ body { #chat .toggle-content .body { color: #99a2b4; } - -@media (max-width: 768px) { - #main { - left: 0; - } - #footer { - left: -220px; - width: 225px; - } -} diff --git a/client/themes/zenburn.css b/client/themes/zenburn.css index 88b5ce87..a75afab7 100644 --- a/client/themes/zenburn.css +++ b/client/themes/zenburn.css @@ -52,7 +52,6 @@ body { #sidebar { background: #2b2b2b; - bottom: 48px; } #sidebar .chan .name:after { @@ -86,34 +85,6 @@ body { border-color: #333; } -/* Attach chat to window borders */ -#windows .window:before, -#windows .chan:before { - display: none; -} - -#footer { - left: 0; - bottom: 0; - width: 220px; - border-radius: 0; -} - -#main { - top: 0; - bottom: 0; - right: 0; -} - -#windows .window { - border-radius: 0; -} - -#chat .chat, -#chat .sidebar { - top: 48px; -} - /* User list */ #chat .user-mode { color: #dcdccc; @@ -271,13 +242,3 @@ body { #chat .toggle-content .body { color: #d2d39b; } - -@media (max-width: 768px) { - #main { - left: 0; - } - #footer { - left: -220px; - width: 225px; - } -}