supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #359 from thelounge/xpaw/simplify-base-theme

Browse Source 
Move Shout theme borders to example theme
This commit is contained in:
Jérémie Astori 2016-09-25 01:21:56 -04:00 committed by GitHub
commit 7b15235489
5 changed files with 57 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
client/css/style.css
View File

@ -324,7 +324,7 @@ button {
} }
#sidebar { #sidebar {
bottom: 52px; bottom: 48px;
left: 0; left: 0;
overflow: auto; overflow: auto;
overflow-x: hidden; overflow-x: hidden;
@ -506,15 +506,14 @@ button {
#footer { #footer {
background: rgba(0, 0, 0, .06); background: rgba(0, 0, 0, .06);
border-radius: 2px; bottom: 0;
bottom: 4px;
height: 45px; height: 45px;
left: 5px; left: 0;
font-size: 14px; font-size: 14px;
line-height: 45px; line-height: 45px;
position: absolute; position: absolute;
text-align: center; text-align: center;
width: 210px; width: 220px;
} }
#footer button.active { #footer button.active {
@ -547,11 +546,11 @@ button {
} }
#main { #main {
bottom: 4px; bottom: 0;
left: 220px; left: 220px;
position: absolute; position: absolute;
right: 5px; right: 0;
top: 4px; top: 0;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
-webkit-flex-direction: column; -webkit-flex-direction: column;
@ -601,20 +600,8 @@ button {
border-color: #79838c; 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 { #windows .window {
background: #fff; background: #fff;
border-radius: 2px;
bottom: 0; bottom: 0;
display: none; display: none;
left: 0; left: 0;
@ -1598,13 +1585,9 @@ button {
transform: translate3d(-180px, 0, 0); transform: translate3d(-180px, 0, 0);
} }
#sidebar { #sidebar,
left: -220px;
}
#footer { #footer {
left: -215px; left: -220px;
width: 215px;
} }
#sidebar .empty:before { #sidebar .empty:before {
@ -1612,8 +1595,7 @@ button {
} }
#main { #main {
left: 5px; left: 0;
right: 5px;
} }
#chat .chat { #chat .chat {

26
client/themes/crypto.css
View File

@ -34,16 +34,6 @@ a:hover,
border-bottom: none; border-bottom: none;
} }
#main {
right: 0;
bottom: 0;
top: 0;
}
#windows .window {
border-radius: 0;
}
.container { .container {
margin: 40px auto; margin: 40px auto;
} }
@ -68,11 +58,6 @@ a:hover,
background: #00ff0e; background: #00ff0e;
} }
#windows .window:before,
#windows .chan:before {
content: none;
}
#settings .opt { #settings .opt {
line-height: 20px; line-height: 20px;
font-size: 12px; font-size: 12px;
@ -111,11 +96,6 @@ a:hover,
line-height: 1.8; line-height: 1.8;
} }
#chat .chat,
#chat .sidebar {
top: 48px;
}
#chat .user { #chat .user {
color: black; color: black;
font-weight: bold; font-weight: bold;
@ -137,9 +117,3 @@ a:hover,
.tooltipped:after { .tooltipped:after {
font-family: Inconsolata-g, monospace; font-family: Inconsolata-g, monospace;
} }
@media (max-width: 768px) {
#main {
left: 0;
}
}

47
client/themes/example.css
View File

@ -9,3 +9,50 @@ body {
.signed-out #main { .signed-out #main {
left: 5px; 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;
}
}

38
client/themes/morning.css
View File

@ -59,34 +59,6 @@ body {
border-color: #2a323d; 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 */ /* User list */
#chat .user-mode { #chat .user-mode {
color: #fefefe; color: #fefefe;
@ -244,13 +216,3 @@ body {
#chat .toggle-content .body { #chat .toggle-content .body {
color: #99a2b4; color: #99a2b4;
} }
@media (max-width: 768px) {
#main {
left: 0;
}
#footer {
left: -220px;
width: 225px;
}
}

39
client/themes/zenburn.css
View File

@ -52,7 +52,6 @@ body {
#sidebar { #sidebar {
background: #2b2b2b; background: #2b2b2b;
bottom: 48px;
} }
#sidebar .chan .name:after { #sidebar .chan .name:after {
@ -86,34 +85,6 @@ body {
border-color: #333; 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 */ /* User list */
#chat .user-mode { #chat .user-mode {
color: #dcdccc; color: #dcdccc;
@ -271,13 +242,3 @@ body {
#chat .toggle-content .body { #chat .toggle-content .body {
color: #d2d39b; color: #d2d39b;
} }
@media (max-width: 768px) {
#main {
left: 0;
}
#footer {
left: -220px;
width: 225px;
}
}