Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8e97df7e
authored
Sep 16, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix notifications
It seems Bootstrap 4.2 doesn't align the dropdown in the good way
parent
b8a48b95
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
6 deletions
+17
-6
circle/dashboard/static/dashboard/dashboard.css
+13
-2
circle/dashboard/static/dashboard/dashboard.js
+2
-2
circle/dashboard/templates/dashboard/base.html
+2
-2
No files found.
circle/dashboard/static/dashboard/dashboard.css
View file @
8e97df7e
...
...
@@ -364,9 +364,11 @@ a.hover-black {
display
:
block
;
}
.
notification-messages
{
#
notification-messages
{
padding
:
10px
8px
;
width
:
350px
;
right
:
0
;
left
:
auto
;
}
.notification-message
{
...
...
@@ -375,7 +377,7 @@ a.hover-black {
border-bottom
:
1px
dotted
#D3D3D3
;
}
.
notification-messages
.notification-message
:last-child
{
#
notification-messages
.notification-message
:last-child
{
margin-bottom
:
0px
;
padding
:
0px
;
border-bottom
:
none
;
...
...
@@ -390,6 +392,15 @@ a.hover-black {
cursor
:
pointer
;
}
#notification-button
a
.dropdown-toggle
{
color
:
white
;
font-size
:
12px
;
}
#notification-button
{
margin-right
:
15px
;
}
#vm-migrate-node-list
{
list-style
:
none
;
}
...
...
circle/dashboard/static/dashboard/dashboard.js
View file @
8e97df7e
...
...
@@ -372,7 +372,7 @@ $(function () {
});
/* don't close notifications window on missclick */
$
(
document
).
on
(
"click"
,
"
.
notification-messages"
,
function
(
e
)
{
$
(
document
).
on
(
"click"
,
"
#
notification-messages"
,
function
(
e
)
{
if
(
$
(
e
.
target
).
closest
(
"a"
).
length
)
return
true
;
else
...
...
@@ -380,7 +380,7 @@ $(function () {
});
$
(
"#notification-button a"
).
click
(
function
()
{
$
(
'
.
notification-messages'
).
load
(
"/dashboard/notifications/"
);
$
(
'
#
notification-messages'
).
load
(
"/dashboard/notifications/"
);
$
(
'#notification-button a span[class*="badge-pulse"]'
).
remove
();
});
...
...
circle/dashboard/templates/dashboard/base.html
View file @
8e97df7e
...
...
@@ -16,14 +16,14 @@
{% if user.is_authenticated and user.pk and not request.token_user %}
<ul
class=
"nav navbar-nav pull-right"
>
<li
class=
"dropdown"
id=
"notification-button"
>
<a
href=
"{% url "
dashboard
.
views
.
notifications
"
%}"
style=
"color: white; font-size: 12px;"
<a
href=
"{% url "
dashboard
.
views
.
notifications
"
%}"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
>
{% trans "Notifications" %}
{% if NEW_NOTIFICATIONS_COUNT > 0 %}
<span
class=
"badge badge-pulse"
>
{{ NEW_NOTIFICATIONS_COUNT }}
</span>
{% endif %}
</a>
<ul
class=
"dropdown-menu
notification-messages"
>
<ul
class=
"dropdown-menu
"
id=
"
notification-messages"
>
<li>
{% trans "Loading..." %}
</li>
</ul>
</li>
...
...
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