Skip to content

Commit a0feb4c

Browse files
committed
UX: adjust styles for sidebar, chat
1 parent 6d9ddf2 commit a0feb4c

File tree

7 files changed

+136
-6
lines changed

7 files changed

+136
-6
lines changed

.prettierrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

common/common.scss

+24-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
@import "topic";
88
@import "categories";
99
@import "select-kit";
10+
@import "sidebar";
11+
@import "chat";
1012

1113
// global
1214
.alert.alert-info {
@@ -24,6 +26,8 @@
2426
.group-form-bio,
2527
.user-preferences .warning,
2628
.select-kit.multi-select .multi-select-header,
29+
.dc-filter-input-container,
30+
.channel-members-view__search-input-container,
2731
input[type="text"],
2832
input[type="password"],
2933
input[type="datetime"],
@@ -64,7 +68,9 @@ input[type="color"] {
6468
.user-badges .btn,
6569
.signup-cta.alert.alert-info .btn:not(.btn-primary),
6670
.widget-button.btn.popup-menu-button.toggle-admin-menu.keyboard-target-admin-menu.no-text.btn-icon,
67-
.widget-button.btn.popup-menu-button.toggle-admin-menu.no-text.btn-icon {
71+
.widget-button.btn.popup-menu-button.toggle-admin-menu.no-text.btn-icon,
72+
.new-channel-btn,
73+
.topic-notifications-options .dropdown-select-box-header {
6874
@include btn(
6975
$text-color: $secondary,
7076
$bg-color: $night,
@@ -80,7 +86,7 @@ input[type="color"] {
8086
top: 3px;
8187
}
8288
padding: 0.75em 1em;
83-
border-radius: 25px/19px;
89+
border-radius: 25px;
8490
box-shadow: 0 4px 0 0 $dark_night;
8591
}
8692

@@ -99,13 +105,13 @@ input[type="color"] {
99105
top: 3px;
100106
}
101107
padding: 0.75em 1em;
102-
border-radius: 25px/19px;
108+
border-radius: 25px;
103109
box-shadow: 0 4px 0 0 darken($love, 25%);
104110
}
105111

106112
.btn-danger {
107113
padding: 0.75em 1em;
108-
border-radius: 25px/19px;
114+
border-radius: 25px;
109115
box-shadow: 0 4px 0 0 darken($love, 25%);
110116
transition: top 0.25s;
111117

@@ -190,6 +196,10 @@ input[type="color"] {
190196
margin-right: 0.25em;
191197
}
192198

199+
.timeline-footer-controls {
200+
flex-wrap: nowrap;
201+
}
202+
193203
#show-tag-info {
194204
font-size: 1.05em;
195205
}
@@ -570,6 +580,16 @@ div.menu-links-header .menu-links-row button:not(.active):hover {
570580
border-bottom: 1px solid var(--highlight-medium);
571581
}
572582

583+
.search-container .search-header {
584+
padding-top: 2em;
585+
padding-bottom: 2em;
586+
@include border-radius-large;
587+
}
588+
589+
#search-type-header {
590+
height: 100%;
591+
}
592+
573593
.search-advanced-title {
574594
margin: 0;
575595
}

scss/chat.scss

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
.chat-browse-view,
2+
.chat-tabs {
3+
.nav-pills > li > a {
4+
color: $water;
5+
}
6+
}
7+
8+
.has-full-page-chat:not(.discourse-sidebar) .full-page-chat,
9+
.full-page-chat .chat-full-page-header {
10+
border: none;
11+
}
12+
13+
.full-page-chat .chat-full-page-header {
14+
background: transparent;
15+
}

scss/composer.scss

+8-1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@
138138
padding: 0 1em;
139139
margin-bottom: 8px;
140140
}
141+
142+
.mini-tag-chooser .select-kit-header {
143+
border-color: $mud;
144+
}
141145
}
142146

143147
.open .grippie {
@@ -163,13 +167,16 @@
163167
.select-kit.dropdown-select-box.composer-actions .select-kit-header {
164168
background: $night;
165169
border-color: $night;
166-
border-radius: 25px/19px;
170+
border-radius: 25px;
167171
box-shadow: 0 4px 0 0 $dark_night;
168172
.d-icon {
169173
color: $secondary;
170174
opacity: 1;
171175
}
172176
}
177+
.composer-controls .d-icon {
178+
color: var(--secondary);
179+
}
173180
}
174181

175182
.d-editor-button-bar {

scss/header.scss

+38
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,44 @@ div.menu-links-header .menu-links-row li a.active {
138138
}
139139
}
140140

141+
.user-menu.revamped {
142+
.bottom-tabs,
143+
.menu-tabs-container {
144+
border: none;
145+
}
146+
.menu-tabs-container {
147+
padding-right: 0.75em;
148+
margin-left: 0.75em;
149+
padding-bottom: 0.75em;
150+
}
151+
.quick-access-panel {
152+
padding-right: 0;
153+
li:first-child {
154+
border-radius: 20px 20px 0 0;
155+
}
156+
}
157+
.tabs-list .btn {
158+
border-radius: 20px;
159+
margin-bottom: 0.25em;
160+
.d-icon {
161+
color: $sand;
162+
}
163+
&.active .d-icon {
164+
color: $sky;
165+
}
166+
&:hover {
167+
background: $light_gold;
168+
.d-icon {
169+
color: $sky;
170+
}
171+
}
172+
}
173+
174+
.tabs-list .btn .badge-notification {
175+
background: $water;
176+
}
177+
}
178+
141179
.menu-panel .d-icon {
142180
color: $primary-medium;
143181
}

scss/sidebar.scss

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
.header-sidebar-toggle button {
2+
border-radius: 100px;
3+
padding: 0.5em;
4+
5+
.d-icon {
6+
color: var(--secondary);
7+
}
8+
9+
&:focus,
10+
&:hover {
11+
.d-icon {
12+
color: var(--primary-medium) !important;
13+
}
14+
}
15+
}
16+
17+
.sidebar-wrapper {
18+
--d-sidebar-highlight-color: #{$light_gold};
19+
margin: 1.5em 0 1.5em 10px;
20+
21+
background: transparent;
22+
top: calc(var(--header-offset) + 1.5em);
23+
@include border-radius-large;
24+
25+
.has-sidebar-page & {
26+
box-shadow: 0 4px 0 1px $mud;
27+
border: 1px solid $mud;
28+
}
29+
}
30+
31+
.sidebar-footer-wrapper .sidebar-footer-container {
32+
border-color: transparent;
33+
}
34+
35+
.sidebar-section-link-wrapper .sidebar-section-link.active {
36+
background: $light_gold;
37+
}
38+
39+
.sidebar-section-link-wrapper .sidebar-section-link:focus,
40+
.sidebar-section-link-wrapper .sidebar-section-link:hover {
41+
background: $sand;
42+
}
43+
44+
.sidebar-footer-wrapper .sidebar-footer-container::before {
45+
background: linear-gradient(
46+
to bottom,
47+
rgba(var(--secondary-low-rgb), 0),
48+
rgba(var(--secondary-low-rgb), 1)
49+
);
50+
}

scss/topic.scss

-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@ pre > code,
357357

358358
nav.post-controls .post-admin-menu,
359359
.topic-admin-popup-menu {
360-
background: $sky;
361360
border: none;
362361
box-shadow: none;
363362
@include border-radius-small;

0 commit comments

Comments
 (0)