Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
9382db65
authored
Mar 20, 2015
by
Oláh István Gergely
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
templates and css: modify BD's profile icon theme
parent
77a4efd9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
15 deletions
+39
-15
circle/dashboard/static/dashboard/dashboard.less
+23
-1
circle/dashboard/templates/dashboard/_display-name.html
+4
-0
circle/dashboard/templates/dashboard/base.html
+12
-13
circle/dashboard/templates/dashboard/profile.html
+0
-1
No files found.
circle/dashboard/static/dashboard/dashboard.less
View file @
9382db65
...
...
@@ -10,6 +10,16 @@ html {
min-height: 100%;
}
.navbar-nav img {
width: 46px;
height: 46px;
margin-top: -4px;
}
.navbar-fixed-top {
border: 0px;
}
/* Set widths on the navbar form inputs since otherwise they're 100% wide */
.navbar-form input[type="text"],
.navbar-form input[type="password"] {
...
...
@@ -32,7 +42,7 @@ html {
#dashboard-menu {
margin-right:
15
px;
margin-right:
0
px;
}
/* we need this for mobile view */
...
...
@@ -56,6 +66,13 @@ html {
padding-bottom: 12.5px;
}
.navbar-nav > li:last-child > a {
padding-top: 4px;
padding-bottom: 0px;
padding-right: 0px;
padding-left: 0px;
}
}
.no-margin {
...
...
@@ -110,6 +127,11 @@ html {
background-color: black!important;
}
.timeline img{
border-radius: 50%;
margin-bottom: 2px;
}
.timeline a {
color: black;
}
...
...
circle/dashboard/templates/dashboard/_display-name.html
View file @
9382db65
{% load i18n %}
{% if user and user.pk %}
{% if user.profile %}
<img
src=
"{{ user.profile.get_avatar_url }}"
width=
"46px"
height=
"46px"
title=
"
{% endif %}
{% if user.get_full_name %}{{ user.get_full_name }}{% else %}{{ user.username }}{% endif %}{% if new_line %}<br />{% endif %}
{% if show_org %}
...
...
@@ -10,4 +13,5 @@
({% trans "
username
"
%}
:
{{
user
.
username
}})
{%
endif
%}
{%
endif
%}
"
>
{% endif %}
circle/dashboard/templates/dashboard/base.html
View file @
9382db65
...
...
@@ -47,18 +47,7 @@
</a>
</li>
{% endif %}
<li>
<a
href=
"{% url "
dashboard
.
views
.
profile-preferences
"
%}"
>
<i
class=
"fa fa-user"
></i>
{% include "dashboard/_display-name.html" with user=user show_org=True %}
</a>
</li>
<li>
<a
href=
"{% url "
logout
"
%}?
next=
{%
url
"
login
"
%}"
>
<i
class=
"fa fa-sign-out"
></i>
{% trans "Log out" %}
</a>
</li>
<li
class=
"visible-xs"
>
<li
class=
"visible-xs"
>
<a
href=
"{% url "
dashboard
.
views
.
notifications
"
%}"
>
{% trans "Notifications" %}
{% if NEW_NOTIFICATIONS_COUNT > 0 %}
...
...
@@ -81,7 +70,17 @@
<li>
{% trans "Loading..." %}
</li>
</ul>
</li>
</ul>
<li>
<a
href=
"{% url "
logout
"
%}?
next=
{%
url
"
login
"
%}"
>
<i
class=
"fa fa-sign-out"
></i>
{% trans "Log out" %}
</a>
</li>
<li>
<a
href=
"{% url "
dashboard
.
views
.
profile-preferences
"
%}"
>
{% include "dashboard/_display-name.html" with user=user show_org=True %}
</a>
</li>
</ul>
{% else %}
<a
class=
"navbar-brand pull-right"
href=
"{% url "
login
"
%}?
next=
{{
request
.
path
}}"
><i
class=
"fa fa-sign-in"
></i>
{% trans "Log in " %}
</a>
...
...
circle/dashboard/templates/dashboard/profile.html
View file @
9382db65
...
...
@@ -24,7 +24,6 @@
{% trans "Back" %}
</a>
</div>
<h3
class=
"no-margin"
>
<i
class=
"fa fa-user"
></i>
{% include "dashboard/_display-name.html" with user=profile show_org=True %}
</h3>
</div>
...
...
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