Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ecommerce
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
ecommerce
Commits
5e91f310
Commit
5e91f310
authored
Jan 16, 2017
by
Vedran Karacic
Committed by
Vedran Karačić
Jan 18, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix basket alert message close button position.
parent
d5ff74a1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
11 deletions
+31
-11
ecommerce/static/sass/partials/views/_basket.scss
+26
-8
ecommerce/templates/oscar/partials/alert_messages.html
+5
-3
No files found.
ecommerce/static/sass/partials/views/_basket.scss
View file @
5e91f310
.basket
{
.alertinner
{
display
:
inline-block
;
.alert
{
position
:
relative
;
.alertinner
{
padding-left
:
0
;
p
{
margin-bottom
:
0
;
}
}
.close-btn
{
position
:
absolute
;
top
:
50%
;
right
:
10px
;
-webkit-transform
:
translateY
(
-50%
);
-ms-transform
:
translateY
(
-50%
);
transform
:
translateY
(
-50%
);
}
}
.container
{
...
...
@@ -111,7 +129,7 @@
width
:
30px
;
vertical-align
:
middle
;
display
:
table-cell
;
float
:
left
;
@include
float
(
left
)
;
.btn
{
display
:
block
;
...
...
@@ -262,7 +280,7 @@
#payment-method
{
#payment-method-image
,
button
{
float
:
left
;
@include
float
(
left
)
;
border
:
1px
solid
palette
(
grayscale
,
base
);
border-radius
:
5px
;
height
:
50px
;
...
...
@@ -367,7 +385,7 @@
.fa-lock
{
position
:
relative
;
float
:
right
;
@include
float
(
right
)
;
top
:
-25px
;
right
:
10%
;
margin-right
:
-5%
;
...
...
@@ -375,7 +393,7 @@
.card-type-icon
{
position
:
relative
;
float
:
right
;
@include
float
(
right
)
;
top
:
-30px
;
right
:
28%
;
margin-right
:
-15%
;
...
...
@@ -396,7 +414,7 @@
}
.description
{
float
:
left
;
@include
float
(
left
)
;
}
.price
{
...
...
@@ -435,7 +453,7 @@
}
.voucher
{
float
:
left
;
@include
float
(
left
)
;
font-size
:
14px
;
margin
:
0
10px
0
0
;
line-height
:
24px
;
...
...
ecommerce/templates/oscar/partials/alert_messages.html
View file @
5e91f310
...
...
@@ -11,8 +11,8 @@ Use message tags to control these alerts. Available tags include:
<div
id=
"messages"
>
{% if messages %}
{% for message in messages %}
<div
class=
"alert {% for tag in message.tags|split %}alert-{{ tag }} {% endfor %} fade in"
aria-live=
"polite"
>
<div
class=
"alertinner {% if 'noicon' not in message.tags %}wicon{% endif %}"
>
<div
class=
"
row
alert {% for tag in message.tags|split %}alert-{{ tag }} {% endfor %} fade in"
aria-live=
"polite"
>
<div
class=
"
col-sm-11 col-xs-10
alertinner {% if 'noicon' not in message.tags %}wicon{% endif %}"
>
{# Allow HTML to be embedded in messages #}
{% if 'safe' in message.tags %}
{{ message|safe }}
...
...
@@ -33,7 +33,9 @@ Use message tags to control these alerts. Available tags include:
{% endif %}
{% endif %}
</div>
<a
class=
"close"
data-dismiss=
"alert"
href=
"#"
>
×
</a>
<div
class=
"close-btn col-sm-1 col-xs-2"
>
<a
class=
"close"
data-dismiss=
"alert"
href=
"#"
>
×
</a>
</div>
</div>
{% endfor %}
{% endif %}
...
...
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