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

お届け先の複数指定 数量及びボタンスタイル修正 #5463

Merged
merged 3 commits into from
Aug 2, 2022
Merged

お届け先の複数指定 数量及びボタンスタイル修正 #5463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0072b57
お届け先の複数指定　数量及びボタンスタイル修正
YokoInoue-u Dec 16, 2021
e8abac6
cssを更新
chihiro-adachi Jul 21, 2022
4995f9d
cssを更新
chihiro-adachi Aug 1, 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
17 changes: 14 additions & 3 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 @@ -22799,7 +22799,7 @@ Styleguide 15.2.6
margin-bottom: 5px;
}
.ec-AddAddress .ec-AddAddress__selectAddress {
display: inline-block;
display: block;
}
.ec-AddAddress .ec-AddAddress__selectAddress label {
font-size: 16px;
Expand All @@ -22809,8 +22809,7 @@ Styleguide 15.2.6
min-width: 100%;
}
.ec-AddAddress .ec-AddAddress__selectNumber {
display: inline-block;
margin-left: 30px;
display: block;
}
.ec-AddAddress .ec-AddAddress__selectNumber label {
font-size: 16px;
Expand Down Expand Up @@ -30550,9 +30549,21 @@ Styleguide 22.1
.ec-AddAddress {
margin: 0 10%;
}
.ec-AddAddress .ec-AddAddress__selectAddress {
display: inline-block;
}
.ec-AddAddress .ec-AddAddress__selectAddress select {
min-width: 350px;
}
.ec-AddAddress .ec-AddAddress__selectNumber {
display: inline-block;
margin-left: 30px;
}
.ec-AddAddress .ec-AddAddress__actions {
width: 33.3333%;
min-width: 250px;
margin: 0 auto;
}
.ec-historyRole .ec-historyRole__contents {
flex-direction: row;
}
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.

2 changes: 1 addition & 1 deletion 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.

17 changes: 14 additions & 3 deletions html/template/default/assets/scss/project/_15.2.order.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,10 @@ Styleguide 15.2.6
margin-bottom: 5px;
}
& &__selectAddress {
display: inline-block;
display: block;
@include media_desktop {
display: inline-block;
}
label {
font-size: 16px;
font-weight: normal;
Expand All @@ -286,8 +289,11 @@ Styleguide 15.2.6
}
}
& &__selectNumber {
display: inline-block;
margin-left: 30px;
display: block;
@include media_desktop {
display: inline-block;
margin-left: 30px;
}
label {
font-size: 16px;
font-weight: normal;
Expand All @@ -299,6 +305,11 @@ Styleguide 15.2.6
}
}
& &__actions {
@include media_desktop {
width: 33.3333%;
min-width: 250px;
margin: 0 auto;
}
.ec-blockBtn--action {
margin-bottom: 8px;
}
Expand Down
8 changes: 2 additions & 6 deletions src/Eccube/Resource/template/default/Shopping/shipping_multiple.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,8 @@ $(function() {
{% endfor %}

<div class="ec-AddAddress__actions">
<div class="ec-off4Grid">
<div class="ec-off4Grid__cell">
<button id="button__confirm" type="submit" class="ec-blockBtn--action">{{ 'front.shopping.shipping_send_selected_shipping'|trans }}</button>
<a class="ec-blockBtn--cancel" href="{{ url('shopping') }}">{{ 'common.back'|trans }}</a>
</div>
</div>
<button id="button__confirm" type="submit" class="ec-blockBtn--action">{{ 'front.shopping.shipping_send_selected_shipping'|trans }}</button>
<a class="ec-blockBtn--cancel" href="{{ url('shopping') }}">{{ 'common.back'|trans }}</a>
</div>
</form>
</div>
Expand Down