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

Fix banner upload problems #4820

Merged
merged 5 commits into from
Jul 18, 2019
Merged

Fix banner upload problems #4820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b2e700
fix styles and logic
octavioamu Jul 18, 2019
505c1b8
fix stylelint
octavioamu Jul 18, 2019
fa76cf8
fix z-index
octavioamu Jul 18, 2019
5cdc7a2
fix banner text
octavioamu Jul 18, 2019
ac29faf
Merge branch 'master' into fix/banner-styles
octavioamu Jul 18, 2019
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
42 changes: 22 additions & 20 deletions app/assets/v2/css/profile.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
border-radius: 50%;
}

.profile-header {
position: relative;
}

.profile-header__handle {
padding-top: 0.8rem;
margin-bottom: 0;
Expand Down Expand Up @@ -374,14 +378,30 @@ a:hover .avatar_edit .avatar_edit_text {
}

.profile-banner {
top: 25vh;
display: flex;
top: 0;
bottom: 0;
color: #ffffff;
z-index: 1;
width: 100vw;
visibility: hidden;
cursor: pointer;
}

.profile-banner:hover {
background: linear-gradient(to top,rgba(255,255,255,0.6),rgba(255,255,255,0.0));
}

.profile-banner .h4 {
font-weight: bold;
text-shadow: 1px 1px 1px #000;
opacity: 0.5;
padding: 5px;
}

.profile-banner:hover .h4 {
opacity: 1;
}

.picky {
cursor: pointer;
}
Expand All @@ -398,22 +418,4 @@ nav.navbar.navbar-dark{
background-image: url(/static/v2/images/header-bg.png);
}

#change_header_lede {
padding-top: 2rem;
padding-bottom: 10rem;
background: linear-gradient(to top,rgba(255,255,255,0.6),rgba(255,255,255,0.0));
}

#change_header_lede:hover {
background: linear-gradient(to top,rgba(255,255,255,0.9),rgba(255,255,255,0.0));
}

#change_header_lede span {
font-weight: bold;
visibility: hidden;
padding: 5px;
}

#change_header_lede:hover span {
visibility: visible;
}
4 changes: 0 additions & 4 deletions app/assets/v2/js/pages/profile-edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ $(document).ready(function() {
});

const banner = document.querySelector('.profile-banner');
const updateHeader = document.querySelector('#update-header');

banner.style['visibility'] = 'visible';


function setBanner() {
const data = new FormData();
Expand Down
26 changes: 12 additions & 14 deletions app/dashboard/templates/profiles/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,18 @@
</head>
<body class="interior {{ active }} g-font-muli">
{% include 'shared/tag_manager_2.html' %}
<div class="position-absolute profile-banner text-center">
{% csrf_token %}
{% if is_my_profile%}
<h4 class="font-title-lg m-auto" id="change_header_lede">
<span>
Edit Header Photo
</span>
</h4>
{% endif %}
</div>
<div class="container-fluid header profile-header dash" style="min-height: 450px; {% if profile.profile_wallpaper %} background-image: url( {{ profile.profile_wallpaper }} ) {% endif %}">
{% include 'shared/top_nav.html' with class='d-md-flex' %}
{% include 'home/nav.html' %}
{% if not hidden and is_staff %}
{% include 'shared/top_nav.html' with class='d-md-flex' %}
{% include 'home/nav.html' %}
<div class="container-fluid header profile-header dash" style="min-height: 450px; {% if profile.profile_wallpaper %} background-image: url( {{ profile.profile_wallpaper }} ) {% endif %}">
{% csrf_token %}
{% if is_my_profile %}
<div class="position-absolute profile-banner text-center">
<div class="h4 font-title-lg m-auto">
Edit Header Photo
</div>
</div>
{% endif %}
{% if not hidden and is_staff %}
<div class="alpha-warning font-caption mb-0">
<span class="font-weight-bold">Staff only</span>
<a style="color:white;" href="{{profile.admin_url}}">{% trans "Profile Admin" %}</a>
Expand Down
2 changes: 1 addition & 1 deletion app/retail/templates/shared/top_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<!--- Top Row Notification -->
<div class="row bottom_notification font-caption" style="text-align: center;">
<span style="text-align: center; margin: auto;">
{% blocktrans %}The <strong>Grow Ethereum</strong> Hackathon runs July 22nd to August 15th - <a href="https://hackathons.gitcoin.co/grow-ethereum/">Check out the Details</a>.{% endblocktrans %}
{% blocktrans %}The <strong>Grow Ethereum</strong> Hackathon runs July 29nd to August 19th - <a href="https://hackathons.gitcoin.co/grow-ethereum/">Check out the Details</a>.{% endblocktrans %}
</span>
<span style="cursor: pointer;" id="top_nav_notification">
&times;
Expand Down