mirror of https://github.com/zulip/zulip.git
stream settings: Correct alignment of filter streams div.
The div containing options for filtering streams was placed in the centre. Aligned it towards the right. Had to pass a special check variable in subs.js:540 to add the specific class for this purpose. This was a specific scenario where this sort of CSS was to be added, hence had to make a specific case. Also, fixed the bottom border color of the search streams bar for night mode.
This commit is contained in:
parent
703fae8980
commit
2c0c936e40
|
@ -85,10 +85,17 @@ run_test('basics', () => {
|
||||||
|
|
||||||
self.children = [];
|
self.children = [];
|
||||||
|
|
||||||
|
self.classList = new Set();
|
||||||
|
|
||||||
self.append = function (child) {
|
self.append = function (child) {
|
||||||
self.children.push(child);
|
self.children.push(child);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
self.addClass = function (c) {
|
||||||
|
self.classList.add(c);
|
||||||
|
self.addedClass = c;
|
||||||
|
};
|
||||||
|
|
||||||
self.find = function (sel) {
|
self.find = function (sel) {
|
||||||
switch (sel) {
|
switch (sel) {
|
||||||
case ".ind-tab":
|
case ".ind-tab":
|
||||||
|
@ -110,6 +117,8 @@ run_test('basics', () => {
|
||||||
switch (sel) {
|
switch (sel) {
|
||||||
case "<div class='tab-switcher'></div>":
|
case "<div class='tab-switcher'></div>":
|
||||||
return switcher;
|
return switcher;
|
||||||
|
case "<div class='tab-switcher stream_sorter_toggle'></div>":
|
||||||
|
return switcher;
|
||||||
case "<div class='ind-tab' data-tab-key='keyboard-shortcuts' data-tab-id='0' tabindex='0'>translated: Keyboard shortcuts</div>":
|
case "<div class='ind-tab' data-tab-key='keyboard-shortcuts' data-tab-id='0' tabindex='0'>translated: Keyboard shortcuts</div>":
|
||||||
return make_tab(0);
|
return make_tab(0);
|
||||||
case "<div class='ind-tab' data-tab-key='message-formatting' data-tab-id='1' tabindex='0'>translated: Message formatting</div>":
|
case "<div class='ind-tab' data-tab-key='message-formatting' data-tab-id='1' tabindex='0'>translated: Message formatting</div>":
|
||||||
|
@ -131,6 +140,7 @@ run_test('basics', () => {
|
||||||
{ label: i18n.t("Message formatting"), key: "message-formatting" },
|
{ label: i18n.t("Message formatting"), key: "message-formatting" },
|
||||||
{ label: i18n.t("Search operators"), key: "search-operators" },
|
{ label: i18n.t("Search operators"), key: "search-operators" },
|
||||||
],
|
],
|
||||||
|
html_class: "stream_sorter_toggle",
|
||||||
callback: function (name, key) {
|
callback: function (name, key) {
|
||||||
assert.equal(callback_args, undefined);
|
assert.equal(callback_args, undefined);
|
||||||
callback_args = [name, key];
|
callback_args = [name, key];
|
||||||
|
@ -147,6 +157,8 @@ run_test('basics', () => {
|
||||||
|
|
||||||
assert.deepEqual(switcher.children, tabs);
|
assert.deepEqual(switcher.children, tabs);
|
||||||
|
|
||||||
|
assert.equal(switcher.addedClass, 'stream_sorter_toggle');
|
||||||
|
|
||||||
assert.equal(focused_tab, 0);
|
assert.equal(focused_tab, 0);
|
||||||
assert.equal(tabs[0].class, 'first selected');
|
assert.equal(tabs[0].class, 'first selected');
|
||||||
assert.equal(tabs[1].class, 'middle');
|
assert.equal(tabs[1].class, 'middle');
|
||||||
|
|
|
@ -13,6 +13,11 @@
|
||||||
exports.toggle = function (opts) {
|
exports.toggle = function (opts) {
|
||||||
const component = (function render_component(opts) {
|
const component = (function render_component(opts) {
|
||||||
const _component = $("<div class='tab-switcher'></div>");
|
const _component = $("<div class='tab-switcher'></div>");
|
||||||
|
if (opts.html_class) {
|
||||||
|
// add a check inside passed arguments in case some extra
|
||||||
|
// classes need to be added for correct alignment or other purposes
|
||||||
|
_component.addClass(opts.html_class);
|
||||||
|
}
|
||||||
opts.values.forEach(function (value, i) {
|
opts.values.forEach(function (value, i) {
|
||||||
// create a tab with a tab-id so they don't have to be referenced
|
// create a tab with a tab-id so they don't have to be referenced
|
||||||
// by text value which can be inconsistent.
|
// by text value which can be inconsistent.
|
||||||
|
|
|
@ -537,6 +537,7 @@ exports.setup_page = function (callback) {
|
||||||
{ label: `<i class="fa fa-user-o" title="${i18n.t("Sort by number of subscribers")}"></i>`, key: "by-subscriber-count" },
|
{ label: `<i class="fa fa-user-o" title="${i18n.t("Sort by number of subscribers")}"></i>`, key: "by-subscriber-count" },
|
||||||
{ label: `<i class="fa fa-bar-chart" title="${i18n.t("Sort by estimated weekly traffic")}"></i>`, key: "by-weekly-traffic" },
|
{ label: `<i class="fa fa-bar-chart" title="${i18n.t("Sort by estimated weekly traffic")}"></i>`, key: "by-weekly-traffic" },
|
||||||
],
|
],
|
||||||
|
html_class: "stream_sorter_toggle",
|
||||||
callback: function (value, key) {
|
callback: function (value, key) {
|
||||||
exports.switch_stream_sort(key);
|
exports.switch_stream_sort(key);
|
||||||
},
|
},
|
||||||
|
|
|
@ -257,6 +257,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.stream_sorter_toggle {
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -- unified overlay design component -- */
|
/* -- unified overlay design component -- */
|
||||||
|
|
|
@ -34,6 +34,7 @@ body.night-mode {
|
||||||
|
|
||||||
.column-left .left-sidebar,
|
.column-left .left-sidebar,
|
||||||
#settings_page .form-sidebar,
|
#settings_page .form-sidebar,
|
||||||
|
.stream_name_search_section,
|
||||||
.column-right .right-sidebar {
|
.column-right .right-sidebar {
|
||||||
border-color: hsla(0, 0%, 0%, 0.2);
|
border-color: hsla(0, 0%, 0%, 0.2);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue