diff options
Diffstat (limited to 'client/src/app/header')
4 files changed, 13 insertions, 15 deletions
diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss index de483086b..8a4111c5a 100644 --- a/client/src/app/header/header.component.scss +++ b/client/src/app/header/header.component.scss | |||
@@ -2,7 +2,11 @@ | |||
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | my-search-typeahead { | 4 | my-search-typeahead { |
5 | @include margin-right(15px); | 5 | @include margin-right(80px); |
6 | |||
7 | @media screen and (max-width: $small-view) { | ||
8 | @include margin-right(15px); | ||
9 | } | ||
6 | } | 10 | } |
7 | 11 | ||
8 | .publish-button { | 12 | .publish-button { |
@@ -11,7 +15,7 @@ my-search-typeahead { | |||
11 | @include button-with-icon(22px, 3px, -1px); | 15 | @include button-with-icon(22px, 3px, -1px); |
12 | @include margin-right(25px); | 16 | @include margin-right(25px); |
13 | 17 | ||
14 | @media screen and (max-width: 600px) { | 18 | @media screen and (max-width: $mobile-view) { |
15 | @include margin-right(10px); | 19 | @include margin-right(10px); |
16 | 20 | ||
17 | padding: 0 10px; | 21 | padding: 0 10px; |
diff --git a/client/src/app/header/search-typeahead.component.html b/client/src/app/header/search-typeahead.component.html index 7a9b6c51f..783b4b53b 100644 --- a/client/src/app/header/search-typeahead.component.html +++ b/client/src/app/header/search-typeahead.component.html | |||
@@ -25,8 +25,7 @@ | |||
25 | <div class="d-flex justify-content-between"> | 25 | <div class="d-flex justify-content-between"> |
26 | <label class="small-title" i18n>GLOBAL SEARCH</label> | 26 | <label class="small-title" i18n>GLOBAL SEARCH</label> |
27 | <div class="advanced-search-status muted"> | 27 | <div class="advanced-search-status muted"> |
28 | <span *ngIf="serverConfig" class="mr-1" i18n>using {{ serverConfig.search.searchIndex.url }}</span> | 28 | <span *ngIf="serverConfig" class="me-1" i18n>using {{ serverConfig.search.searchIndex.url }}</span> |
29 | <i class="glyphicon glyphicon-globe"></i> | ||
30 | </div> | 29 | </div> |
31 | </div> | 30 | </div> |
32 | <div class="muted" i18n>Results will be augmented with those of a third-party index. Only data necessary to make the query will be sent.</div> | 31 | <div class="muted" i18n>Results will be augmented with those of a third-party index. Only data necessary to make the query will be sent.</div> |
@@ -39,9 +38,8 @@ | |||
39 | <label class="small-title" i18n>ADVANCED SEARCH</label> | 38 | <label class="small-title" i18n>ADVANCED SEARCH</label> |
40 | <div class="advanced-search-status c-help"> | 39 | <div class="advanced-search-status c-help"> |
41 | <span [ngClass]="canSearchAnyURI ? 'text-success' : 'muted'" i18n-title title="Determines whether you can resolve any distant content, or if this instance only allows doing so for instances it follows."> | 40 | <span [ngClass]="canSearchAnyURI ? 'text-success' : 'muted'" i18n-title title="Determines whether you can resolve any distant content, or if this instance only allows doing so for instances it follows."> |
42 | <span *ngIf="canSearchAnyURI()" class="mr-1" i18n>any instance</span> | 41 | <span *ngIf="canSearchAnyURI()" class="me-1" i18n>any instance</span> |
43 | <span *ngIf="!canSearchAnyURI()" class="mr-1" i18n>only followed instances</span> | 42 | <span *ngIf="!canSearchAnyURI()" class="me-1" i18n>only followed instances</span> |
44 | <i [ngClass]="canSearchAnyURI() ? 'glyphicon glyphicon-ok-sign' : 'glyphicon glyphicon-exclamation-sign'"></i> | ||
45 | </span> | 43 | </span> |
46 | </div> | 44 | </div> |
47 | </div> | 45 | </div> |
diff --git a/client/src/app/header/search-typeahead.component.scss b/client/src/app/header/search-typeahead.component.scss index 5114ec3a7..e4c9c602c 100644 --- a/client/src/app/header/search-typeahead.component.scss +++ b/client/src/app/header/search-typeahead.component.scss | |||
@@ -129,10 +129,6 @@ li.suggestion { | |||
129 | } | 129 | } |
130 | } | 130 | } |
131 | 131 | ||
132 | .glyphicon { | ||
133 | top: 3px; | ||
134 | } | ||
135 | |||
136 | .advanced-search-status { | 132 | .advanced-search-status { |
137 | height: max-content; | 133 | height: max-content; |
138 | cursor: default; | 134 | cursor: default; |
diff --git a/client/src/app/header/suggestion.component.html b/client/src/app/header/suggestion.component.html index 4ac9809e1..3f85ed6ae 100644 --- a/client/src/app/header/suggestion.component.html +++ b/client/src/app/header/suggestion.component.html | |||
@@ -1,16 +1,16 @@ | |||
1 | <a tabindex="-1" class="d-flex flex-auto flex-items-center p-2" [class.focus-visible]="active"> | 1 | <a tabindex="-1" class="d-flex flex-auto flex-items-center p-2" [class.focus-visible]="active"> |
2 | <div class="flex-shrink-0 mr-2 text-center"> | 2 | <div class="flex-shrink-0 me-2 text-center"> |
3 | <my-global-icon iconName="search"></my-global-icon> | 3 | <my-global-icon iconName="search"></my-global-icon> |
4 | </div> | 4 | </div> |
5 | 5 | ||
6 | <img class="avatar mr-2 flex-shrink-0 d-none" alt="" aria-label="Team" src="" width="28" height="28"> | 6 | <img class="avatar me-2 flex-shrink-0 d-none" alt="" aria-label="Team" src="" width="28" height="28"> |
7 | 7 | ||
8 | <div | 8 | <div |
9 | class="flex-auto overflow-hidden text-left no-wrap css-truncate css-truncate-target" | 9 | class="flex-auto overflow-hidden text-start no-wrap css-truncate css-truncate-target" |
10 | [attr.aria-label]="result.text" [innerHTML]="result.text | highlight : highlight" | 10 | [attr.aria-label]="result.text" [innerHTML]="result.text | highlight : highlight" |
11 | ></div> | 11 | ></div> |
12 | 12 | ||
13 | <div class="border rounded flex-shrink-0 px-1 bg-gray text-gray-light ml-1 f6"> | 13 | <div class="border rounded flex-shrink-0 px-1 bg-gray text-gray-light ms-1 f6"> |
14 | <span *ngIf="result.type === 'search-instance'" i18n>In this instance's network</span> | 14 | <span *ngIf="result.type === 'search-instance'" i18n>In this instance's network</span> |
15 | <span *ngIf="result.type === 'search-index'" i18n>In the vidiverse</span> | 15 | <span *ngIf="result.type === 'search-index'" i18n>In the vidiverse</span> |
16 | </div> | 16 | </div> |