Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feature-8986: Missing spacing in some areas like button of calendar a… #9002

Merged
merged 6 commits into from Jul 28, 2023
Merged

feature-8986: Missing spacing in some areas like button of calendar a… #9002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb146d2
feature-8986: Missing spacing in some areas like button of calendar a…
ntthitrinh Jul 26, 2023
1a6b613
feature-8986: Missing spacing in some areas like button of calendar a…
ntthitrinh Jul 26, 2023
e3b41d2
feature-8986: Missing spacing in some areas like button of calendar a…
ntthitrinh Jul 26, 2023
5c0f0ee
Merge branch 'development' into ntthitrinh-tma/feature-8986
khangon Jul 27, 2023
83c3718
feature-8986: Missing spacing in some areas like button of calendar a…
ntthitrinh Jul 28, 2023
c2faa95
Merge branch 'ntthitrinh-tma/feature-8986' of github.com:lthanhhieu/o…
ntthitrinh Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/components/forms/wizard/badge-forms/badge-preview.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div class="badge-setting">
<div class="badge-setting badge-preview">
<div>
<form class="ui form">
<div class="field">
<form class="ui form form-preview">
<div class="field badge-preview-title">
{{#if @headerText}}
<h2 class="badge-setting-title">
{{@headerText}}
</h2>
{{/if}}
</div>
<div class="ui grid">
<div class="ui grid label-checkbox-sample">
<div class="two column row">
<div class="left floated column">
<UiCheckbox @class="slider mt-2 ml-2 blog-icon-preview" @checked={{@data.isShowingSampleData}} @onChange={{action (mut
Expand Down
2 changes: 1 addition & 1 deletion app/components/public/add-to-calender.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="ui list basic segment m-0 pl-0 pr-0 pb-0">
<div class="ui list basic segment pb-2">
<div class="item mt-1">
<i class="clock alternate outline icon pt-1"></i>
<div class="content">
Expand Down
19 changes: 14 additions & 5 deletions app/styles/components/forms/badge-form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,18 @@ label.warning {
}
}

.preview {
margin: unset !important;
padding: 50px !important;
border-top: 1px solid rgb(211, 211, 211);
margin-top: 5px !important;
.badge-preview {
.badge-preview-title {
margin-bottom: unset !important;
}

.label-checkbox-sample {
margin: unset !important;
}

.preview {
padding: 50px !important;
border-top: 1px solid rgb(211, 211, 211);
margin-top: unset;
}
}
4 changes: 4 additions & 0 deletions app/styles/partials/utils.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,3 +241,7 @@
.mr-8 {
margin-right: 2rem !important;
}

.pd-1 {
padding: 1rem !important;
}
2 changes: 1 addition & 1 deletion app/templates/components/public/social-links.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="ui list mt-0 mb-0 pt-0 pb-0">
<div class="ui list mt-0 mb-0 pt-0 pb-0 pl-4">
<div class="social-links mt-0 mb-0 pt-0 pb-0">
{{#if this.externalUrl}}
<div>
Expand Down
Loading