Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve styles in chat view (Issue #2375) #2379

Merged
merged 1 commit into from
Oct 1, 2023
Merged

Improve styles in chat view (Issue #2375) #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/components/Chat/ChatChannelList.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
themed color colored-background-fg
}
&.unjoined {
themed color shade2
themed color shade1
}
&.unread {
themed color primary
Expand Down Expand Up @@ -110,5 +110,11 @@
.joinable {
border-top: 0px solid transparent;
themed border-top-color shade3

input[type="search"] {
width: 100%;
margin: 1rem 0;
themed background bg
}
}
}
8 changes: 7 additions & 1 deletion src/components/Chat/ChatList.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,26 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
channel-utils-height=8.4rem;
channel-width=12rem;
channel-width=20%;
channel-max-width=25rem;
channel-min-width=12rem;

.ChatList {
display: flex;
flex-direction: column;
height: "calc(100vh - %s - %s)" % (navbar-height channel-utils-height);
overflow-y: auto;
width: channel-width;
max-width: channel-max-width;
min-width: channel-min-width;

.channel-container {
flex-basis: channel-width;
flex-shrink: 1;
flex-grow: 1;
width: channel-width;
max-width: channel-max-width;
min-width: channel-min-width;

border-right: 1px solid transparent;
themed border-right-color shade3
Expand Down
6 changes: 6 additions & 0 deletions src/components/Chat/ChatLog.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
border-bottom: 1px solid transparent;
themed border-bottom-color shade3
overflow: auto;
box-sizing: border-box;
padding: 1rem;

.GameList {
text-align: left;
Expand All @@ -45,6 +47,8 @@
flex-basis: 100%;
flex-grow: 1;
flex-shrink: 1;
box-sizing: border-box;
padding: 0 1rem;
overflow-y: scroll;
border-bottom: 1px solid transparent;
themed border-bottom-color shade3
Expand All @@ -58,6 +62,7 @@
@extend .monospace
font-size: 0.8rem;
font-style: normal !important;
margin-right: .5rem;
}

.third-person {
Expand Down Expand Up @@ -118,6 +123,7 @@
.date {
font-size: 8pt;
font-family: 'Source Code Pro', monospace;
text-align: left;
color: #666;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/components/Player/Player.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin-left: .25rem;
}

.Player-rank {
Expand Down
2 changes: 1 addition & 1 deletion src/ogs.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ light.fg = #202020
light.fg-increased-contrast = #000000
light.mix-base = #999
light.background-color = light.bg
light.card-background-color = lighten(light.bg, 20%)
light.card-background-color = darken(light.bg, 3%)
light.text-color = light.fg
light.text-color-active = darken(light.text-color, 50%)
light.spectator-text-color = #0A06A8
Expand Down
18 changes: 13 additions & 5 deletions src/views/ChatView/ChatView.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@


channel-utils-height=8.4rem;
channel-width=12rem;
channel-width=20%;
channel-max-width=25rem;
channel-min-width=12rem;

.ChatView {
position: fixed;
Expand All @@ -37,6 +39,8 @@ channel-width=12rem;
flex-shrink: 0;
flex-grow: 0;
width: channel-width;
max-width: channel-max-width;
min-width: channel-min-width;
//overflow-y: scroll;

display: flex;
Expand All @@ -46,16 +50,20 @@ channel-width=12rem;
flex-grow: 0;
flex-shrink: 0;
overflow-x: hidden;

box-sizing: border-box;
padding: 1rem;
themed background card-background-color;
}

.ChatChannelList {
border-right: 1px solid transparent;
themed border-right-color shade3
/* border-right: 1px solid transparent; */
/* themed border-right-color shade3 */
}

.ChatUsersList {
border-left: 1px solid transparent;
themed border-left-color shade3
/* border-left: 1px solid transparent; */
/* themed border-left-color shade3 */
}

.ChatLog {
Expand Down
Loading