-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[ Workshop-details]- display Working hours #1088 #1098
Merged
Merged
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
b509485
fix
Olya-web7 96588c3
fix
Olya-web7 a0bc290
fix
Olya-web7 6b68872
fix
Olya-web7 d1a5086
fix
Olya-web7 6ac0fe8
fix
Olya-web7 283b43f
fix
Olya-web7 b773b70
fix
Olya-web7 6224454
fix
Olya-web7 a9a5b39
Merge branch 'develop' into workshop-working-hours
Olya-web7 5058930
fix
Olya-web7 c75361b
Merge branch 'workshop-working-hours' of https://github.com/ita-socia…
Olya-web7 47c7581
fix
Olya-web7 d4fcdf2
fix
Olya-web7 aadeb80
fix
Olya-web7 4d93780
fix
Olya-web7 7a64265
fix
Olya-web7 268bf5d
fix
Olya-web7 dcc014c
fix
Olya-web7 91987ad
Merge branch 'develop' into workshop-working-hours
Olya-web7 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
src/app/shared/components/working-hours-form/working-hours-form.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
.toggle { | ||
height: 40px; | ||
padding: 5px; | ||
margin-top: 10px; | ||
flex-grow: 1; | ||
box-sizing: border-box; | ||
border: 1px solid #EBEBEB; | ||
background: #FFFFFF; | ||
&-selected{ | ||
background: rgba(56, 73, 249, 0.07); | ||
border: 1px solid #3849F9; | ||
} | ||
&:first-child{ | ||
border-top-left-radius: 25px; | ||
border-bottom-left-radius: 25px; | ||
} | ||
&:last-child{ | ||
border-top-right-radius: 25px; | ||
border-bottom-right-radius: 25px; | ||
} | ||
} | ||
|
||
.text{ | ||
font-family: Open Sans; | ||
font-weight: 700; | ||
color: #AAAAAA; | ||
padding: 5px; | ||
} | ||
|
||
.input { | ||
font-family: Open Sans; | ||
border: 1px solid #E3E3E3; | ||
box-sizing: border-box; | ||
border-radius: 21px; | ||
padding: 0.5rem 2rem; | ||
max-width: max-content; | ||
height: 40px; | ||
align-items: center; | ||
text-align: center; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 4 additions & 2 deletions
6
src/app/shell/details/information-page/workshop-about/workshop-about.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
@import "src/app/shared/styles/working-hours.scss"; | ||
|
||
.wrapper{ | ||
margin-top: 2rem; | ||
} | ||
margin: 2rem 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use double quotes please
"row"