clean up some variables, fixing search footer

merge-requests/1931/head
Henry Jameson 7 months ago
parent 78dcc0423e
commit 73f6ecb21e

@ -21,8 +21,6 @@
<script src="./lists_card.js"></script> <script src="./lists_card.js"></script>
<style lang="scss"> <style lang="scss">
@import "../../variables";
.list-card { .list-card {
display: flex; display: flex;
} }
@ -35,18 +33,6 @@
.button-list-edit { .button-list-edit {
margin: 0; margin: 0;
padding: 1em; padding: 1em;
color: $fallback--link; color: var(--link);
color: var(--link, $fallback--link);
&:hover {
background-color: $fallback--lightBg;
background-color: var(--selectedMenu, $fallback--lightBg);
color: $fallback--link;
color: var(--selectedMenuText, $fallback--link);
--faint: var(--selectedMenuFaintText, $fallback--faint);
--faintLink: var(--selectedMenuFaintLink, $fallback--faint);
--lightText: var(--selectedMenuLightText, $fallback--lightText);
}
} }
</style> </style>

@ -85,7 +85,7 @@
</div> </div>
<button <button
v-else-if="!loading" v-else-if="!loading"
class="button-unstyled -link -fullwidth" class="button-unstyled -link text-center"
@click.prevent="fetchOlderNotifications()" @click.prevent="fetchOlderNotifications()"
> >
<div class="new-status-notification text-center"> <div class="new-status-notification text-center">

@ -67,7 +67,7 @@
/> />
<button <button
v-if="!loading && loaded && lastStatusFetchCount > 0" v-if="!loading && loaded && lastStatusFetchCount > 0"
class="more-statuses-button button-unstyled -link -fullwidth" class="more-statuses-button button-unstyled -link"
@click.prevent="search(searchTerm, 'statuses')" @click.prevent="search(searchTerm, 'statuses')"
> >
<div class="new-status-notification text-center"> <div class="new-status-notification text-center">
@ -148,11 +148,8 @@
<script src="./search.js"></script> <script src="./search.js"></script>
<style lang="scss"> <style lang="scss">
@import "../../variables";
.search-result-heading { .search-result-heading {
color: $fallback--faint; color: var(--faint);
color: var(--faint, $fallback--faint);
padding: 0.75rem; padding: 0.75rem;
text-align: center; text-align: center;
} }
@ -171,17 +168,7 @@
.search-result { .search-result {
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px solid; border-bottom: 1px solid;
border-color: $fallback--border; border-color: var(--border);
border-color: var(--border, $fallback--border);
}
.search-result-footer {
border-width: 1px 0 0;
border-style: solid;
border-color: var(--border, $fallback--border);
padding: 10px;
background-color: $fallback--fg;
background-color: var(--panel, $fallback--fg);
} }
.search-input-container { .search-input-container {
@ -212,8 +199,7 @@
.hashtag { .hashtag {
flex: 1 1 auto; flex: 1 1 auto;
color: $fallback--text; color: var(--text);
color: var(--text, $fallback--text);
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
@ -226,14 +212,14 @@
line-height: 2.25rem; line-height: 2.25rem;
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
color: $fallback--text; color: var(--text);
color: var(--text, $fallback--text);
} }
} }
.more-statuses-button { .more-statuses-button {
height: 3.5em; height: 3.5em;
line-height: 3.5em; line-height: 3.5em;
width: 100%;
} }
</style> </style>

@ -48,8 +48,6 @@
<script src="./user_list_popover.js"></script> <script src="./user_list_popover.js"></script>
<style lang="scss"> <style lang="scss">
@import "../../variables";
.user-list-popover { .user-list-popover {
padding: 0.5em; padding: 0.5em;

Loading…
Cancel
Save