Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix _activity overflow #264

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

Merged
jajodiaraghav merged 1 commit into from
Jun 9, 2017
Merged

Fix _activity overflow #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 16 deletions website/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ a:hover{
}
.activity-strip-section > div {
margin-left: 20px;
font-size: 20px;
font-size: 16px;
font-weight: bold;
}
.activity-strip-section > div a {
Expand Down Expand Up @@ -431,31 +431,16 @@ input[type='file'] {
font-size: 14px;
line-height: 20px;
}

.panel-heading .image_container{
background-color: transparent;
}

.issue_count{
color: #fff;
}
.issue_status{
display: block;

color: #dd4252;
}

.activity-strip-section > div > .small{
position:relative;
top:0;
}


.issue_count a{
color: #fff;
text-decoration: none;
}

.issue_count a:hover{
color: #dd4252;
}
9 changes: 7 additions & 2 deletions website/templates/_activity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@
<a href="/domain/{{ activity.target.domain_name }}">
<img src="http://www.{{activity.target.domain_name}}/favicon.ico" height="25" onerror="this.onerror=null; this.style.display='none';">
</a>
<a href="{{ activity.target.get_absolute_url }}">{{ activity.target|truncatechars:100 }}</a><span class="issue_status">{{activity.target.status}}</span>
<a href="{{ activity.target.get_absolute_url }}">{{ activity.target|truncatechars:100 }}</a>
{% else %}
<a href="{{ activity.target_url }}"> - {{ activity.target }}</a><span class="issue_status">{{activity.target.status}}</span>
<a href="{{ activity.target_url }}"> - {{ activity.target }}</a>
{% endif %}
{% if activity.target.status == "open" %}
<span class="label label-success text-capitalize">{{activity.target.status}}</span>
{% else %}
<span class="label label-danger text-capitalize">{{activity.target.status}}</span>
{% endif %}
{% endif %}

<div class="small">
Expand Down
22 changes: 8 additions & 14 deletions website/templates/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,16 @@ <h1 class="page-header text-capitalize">{{ user.username }}</h1>
</div>
<div class="col-md-3">
{% if request.user == user %}



<form method="post" action="." enctype="multipart/form-data">
{% csrf_token %}
<span>
<input type="file" class="required" style="opacity: 0; width: 1px;height:1px;" id='${multipartFilePath}' name="user_avatar" onchange="$(this).parent().find('span').html($(this).val().replace('C:\\fakepath\\', ''))" />
<button class="btn btn-primary" name="test_files" type="button" onclick="$(this).parent().find('input[type=file]').click();"> <i class="fa fa-upload" aria-hidden="true"></i> Upload Profile Pic </button>
&nbsp;
<span class="badge badge-important" ></span>
</span>
<br/> <br>
<button type="submit" class="btn btn-primary btn-small">Upload</button>
<div>
<input type="file" class="required" style="opacity: 0; width: 1px;height:1px;" id='${multipartFilePath}' name="user_avatar" onchange="$(this).parent().find('span').html($(this).val().replace('C:\\fakepath\\', ''))" />
<button class="btn btn-primary" name="test_files" type="button" onclick="$(this).parent().find('input[type=file]').click();">
<i class="fa fa-upload" aria-hidden="true"></i> Upload Profile Pic</button>
<span class="badge badge-important"></span>
</div><br>
<button type="submit" class="btn btn-primary">Upload</button>
</form>

{% endif %}
Expand Down Expand Up @@ -82,9 +80,5 @@ <h1> {{ my_score|default:0 }} Points</h1>
</div>
</div>
</div>

</div>
<script>

</script>
{% endblock %}