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

新規会員登録のスタイル修正 #5462

Merged
merged 2 commits into from
Aug 1, 2022
Merged

新規会員登録のスタイル修正 #5462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb2ea4e
会員登録　halfIinputのエラーメッセージ、プレースホルダー表示、規約の横幅調整
YokoInoue-u Dec 15, 2021
2da5039
cssを更新
chihiro-adachi Jul 21, 2022
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
33 changes: 24 additions & 9 deletions html/template/default/assets/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12294,7 +12294,12 @@ Styleguide 3.1.2
width: 47%;
margin-left: 2%;
}
.ec-halfInput input[type=text]:first-child {
.ec-halfInput .ec-errorMessage {
display: inline-block;
width: 47%;
}
.ec-halfInput input[type=text]:first-of-type,
.ec-halfInput .ec-errorMessage:first-of-type {
margin-left: 0;
}
/*
Expand Down Expand Up @@ -12350,7 +12355,7 @@ Styleguide 3.1.4
display: inline-block;
text-align: left;
width: auto;
max-width: 8em;
max-width: 9em;
font-size: 16px;
}
.ec-zipInput span {
Expand Down Expand Up @@ -12411,7 +12416,7 @@ Markup:
Styleguide 3.1.5
*/
.ec-telInput input {
max-width: 10em;
max-width: 12em;
text-align: left;
}
/**
Expand Down Expand Up @@ -12676,7 +12681,12 @@ Styleguide 3.1.2
width: 47%;
margin-left: 2%;
}
.ec-halfInput input[type=text]:first-child {
.ec-halfInput .ec-errorMessage {
display: inline-block;
width: 47%;
}
.ec-halfInput input[type=text]:first-of-type,
.ec-halfInput .ec-errorMessage:first-of-type {
margin-left: 0;
}
/*
Expand Down Expand Up @@ -12732,7 +12742,7 @@ Styleguide 3.1.4
display: inline-block;
text-align: left;
width: auto;
max-width: 8em;
max-width: 9em;
font-size: 16px;
}
.ec-zipInput span {
Expand Down Expand Up @@ -12793,7 +12803,7 @@ Markup:
Styleguide 3.1.5
*/
.ec-telInput input {
max-width: 10em;
max-width: 12em;
text-align: left;
}
/*
Expand Down Expand Up @@ -29780,6 +29790,10 @@ Styleguide 22.1
margin-left: 15px;
width: 45%;
}
.ec-halfInput .ec-errorMessage {
margin-left: 15px;
width: 45%;
}
.ec-input input, .ec-birth input, .ec-select input, .ec-halfInput input, .ec-numberInput input, .ec-zipInput input, .ec-telInput input {
font-size: 14;
}
Expand All @@ -29796,6 +29810,10 @@ Styleguide 22.1
margin-left: 15px;
width: 45%;
}
.ec-halfInput .ec-errorMessage {
margin-left: 15px;
width: 45%;
}
.ec-select__delivery {
display: inline-block;
}
Expand Down Expand Up @@ -30552,9 +30570,6 @@ Styleguide 22.1
.ec-historyListHeader .ec-historyListHeader__action a {
font-size: 14px;
}
.ec-registerRole .ec-registerRole__actions {
text-align: left;
}
.ec-customerRole .ec-blockBtn--action {
margin-bottom: 16px;
}
Expand Down
2 changes: 1 addition & 1 deletion html/template/default/assets/css/style.css.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions html/template/default/assets/css/style.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/default/assets/css/style.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 16 additions & 5 deletions html/template/default/assets/scss/component/_3.1.inputText.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,19 @@ Styleguide 3.1.2
width: 45%;
}
}
input[type='text']:first-child{
margin-left: 0;
.ec-errorMessage {
display: inline-block;
width: 47%;
@include media_desktop {
margin-left: 15px;
width: 45%;
}
}
input[type='text'],
.ec-errorMessage {
&:first-of-type {
margin-left: 0;
}
}
}

Expand Down Expand Up @@ -167,9 +178,9 @@ Styleguide 3.1.4
display: inline-block;
input{
display: inline-block;
text-align: left;
text-align: left;
width: auto;
max-width: 8em;
max-width: 9em;
font-size: 16px;
}
span{
Expand Down Expand Up @@ -233,7 +244,7 @@ Styleguide 3.1.5
.ec-telInput{
@extend .ec-input;
input {
max-width: 10em;
max-width: 12em;
text-align: left;
}
}
3 changes: 0 additions & 3 deletions html/template/default/assets/scss/project/_19.1.register.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ Styleguide 19.1
& &__actions {
padding-top:20px;
text-align: center;
@include media_desktop {
text-align: left;
}
p {
margin-bottom: 16px;
}
Expand Down
14 changes: 7 additions & 7 deletions src/Eccube/Resource/template/default/Entry/index.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,15 @@ file that was distributed with this source code.
{% endfor %}
</div>
<div class="ec-registerRole__actions">
<div class="ec-checkbox{{ has_errors(form.user_policy_check) ? ' error' }}">
<label>
{{ form_widget(form.user_policy_check) }}
{{ 'front.entry.agree_with_terms'|trans({ '%url%': url('help_agreement') })|raw }}
</label>
{{ form_errors(form.user_policy_check) }}
</div>
<div class="ec-off4Grid">
<div class="ec-off4Grid__cell">
<div class="ec-checkbox{{ has_errors(form.user_policy_check) ? ' error' }}">
<label>
{{ form_widget(form.user_policy_check) }}
{{ 'front.entry.agree_with_terms'|trans({ '%url%': url('help_agreement') })|raw }}
</label>
{{ form_errors(form.user_policy_check) }}
</div>
<button class="ec-blockBtn--action" type="submit" name="mode" value="confirm">{{ 'front.entry.agree'|trans }}</button>
<a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{ 'front.entry.disagree'|trans }}</a>
</div>
Expand Down