Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
868
Issues
868
List
Boards
Labels
Service Desk
Milestones
Merge Requests
44
Merge Requests
44
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Commits
722e9b9a
Commit
722e9b9a
authored
9 minutes ago
by
Ben Hayward
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated to use modern colours and BEM naming convention
parent
95364d00
fix/limit-hashtag-remind-1927
1 merge request
!574
[Sprint/OwlfashionedOwl](fix): Limit hashtag remind #1927
Pipeline
#87705282
running with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
14 deletions
+9
-14
src/app/common/components/error/error.component.ts
src/app/common/components/error/error.component.ts
+6
-11
src/app/modules/modals/modals.module.ts
src/app/modules/modals/modals.module.ts
+2
-2
src/app/modules/modals/remind-composer/remind-composer.ts
src/app/modules/modals/remind-composer/remind-composer.ts
+1
-1
No files found.
src/app/common/components/error/error.component.ts
View file @
722e9b9a
import
{
Component
,
Input
}
from
'
@angular/core
'
;
@
Component
({
selector
:
'
minds-error-box
'
,
inputs
:
[
'
errorString
'
],
selector
:
'
m-error-box
'
,
template
:
`
<div
class="mdl-card mdl-color--red-500 mdl-color-text--blue-grey-50 mdl-shadow--2dp"
style="min-height:0;"
*ngIf="errorString"
>
<div class="mdl-card__supporting-text mdl-color-text--blue-grey-50">
{{ errorString }}
<div class="m-errorBox__container" *ngIf="message">
<div class="m-errorBox__text">
{{ message }}
</div>
</div>
`
,
})
export
class
ErrorBox
{
@
Input
()
errorString
=
''
;
export
class
ErrorBox
Component
{
@
Input
()
message
:
string
;
}
This diff is collapsed.
Click to expand it.
src/app/modules/modals/modals.module.ts
View file @
722e9b9a
...
...
@@ -15,7 +15,7 @@ import { ConfirmPasswordModalComponent } from './confirm-password/modal.componen
import
{
SignupModal
}
from
'
./signup/signup
'
;
import
{
TOSUpdatedModal
}
from
'
./tos-updated/tos.component
'
;
import
{
TextInputAutocompleteModule
}
from
'
../../common/components/autocomplete
'
;
import
{
ErrorBox
}
from
'
../../common/components/error/error.component
'
;
import
{
ErrorBox
Component
}
from
'
../../common/components/error/error.component
'
;
@
NgModule
({
imports
:
[
...
...
@@ -36,7 +36,7 @@ import { ErrorBox } from '../../common/components/error/error.component';
SignupModal
,
ConfirmPasswordModalComponent
,
TOSUpdatedModal
,
ErrorBox
,
ErrorBox
Component
,
],
entryComponents
:
[
ConfirmPasswordModalComponent
],
exports
:
[
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/modals/remind-composer/remind-composer.ts
View file @
722e9b9a
...
...
@@ -39,7 +39,7 @@ import { TopbarHashtagsService } from '../../hashtags/service/topbar.service';
[selectChoice]="selectChoice"
></m-post-autocomplete-item-renderer>
</ng-template>
<m
inds-error-box [errorString]="errorString"></minds
-error-box>
<m
-error-box [message]="errorString"></m
-error-box>
<m-text-input--autocomplete-container>
<textarea
name="message"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment