Skip to content

Commit

Permalink
crowdfunding: hiring logo and layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@pinkiebell
pinkiebell committed Oct 1, 2018
1 parent 9befa27 commit 14bda0d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 17 deletions.
6 changes: 6 additions & 0 deletions app/assets/v2/css/dashboard.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ body {
.title-row {
display: flex;
margin-top: 2em;
margin-right: 8px;
padding-bottom: 5px;
float: right;
border-bottom: 2px solid #3E24FB;
}

Expand Down Expand Up @@ -253,3 +255,7 @@ body {
margin-right: 4rem;
}
}

.hiring {
content: url('/static/v2/images/hiring.svg');
}
19 changes: 10 additions & 9 deletions app/dashboard/templates/dashboard/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,21 @@
</div>

<div class="col-12 col-lg-9 col-xl-10 body">
<div class="container-fluid" id="bounties">

This comment has been minimized.

Sign in to view

Copy link
@owocki

owocki Oct 5, 2018

Contributor

#2367

this caused this layout issue... was this intentional?

@pinkiebell @thelostone-mc

This comment has been minimized.

Sign in to view

Copy link
@pinkiebell

pinkiebell Oct 6, 2018

Author Contributor

@owocki @thelostone-mc
That seems like a leftover(bug) I introduced between the styling rounds.
I actually tested layout responsiveness but not very high resolutions (oops).

This actually fixed this strange layout behaviour:
screenshot 2018-10-06 at 02 38 00

Would be nice if either of you can push a one-liner back to container-fluid

This comment has been minimized.

Sign in to view

Copy link
@pinkiebell

pinkiebell Oct 6, 2018

Author Contributor

@owocki @thelostone-mc

diff --git a/app/assets/v2/css/dashboard.css b/app/assets/v2/css/dashboard.css
index 91525829..d48adaf9 100644
--- a/app/assets/v2/css/dashboard.css
+++ b/app/assets/v2/css/dashboard.css
@@ -75,6 +75,7 @@ body {
   display: flex;
   margin-top: 2em;
   margin-right: 8px;
+  padding-left: 8px !important;
   padding-bottom: 5px;
   float: right;
   border-bottom: 2px solid #3E24FB;
diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index fa5f807c..d89dccb6 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -58,7 +58,7 @@
       {% else %}
         <div class="col-12 col-lg-12 col-xl-12 body">
       {% endif %}
-        <div class="container" id="bounties">
+        <div class="container-fluid" id="bounties">
           <div id="dashboard-title" class="hidden">
             {% if not hackathon %}
               {% include 'shared/search_bar.html' %}
<div class="container" id="bounties">
<div id="dashboard-title" class="hidden">
{% include 'shared/search_bar.html' %}
<div class="row mt-2 mb-2">
<div class="col-12 offset-lg-1 col-lg-10 title-row">
<div class="col-12 col-md-4">
<span id="filter" class="font-title"></span>
<span id="matches" class="font-body"></span>
</div>
<div class="col-12 col-md-8 bounty-info" id="funding-info">
</div>
</div>
</div>
</div>
<div class="col-12 col-lg-11 title-row">
<div class="col-12 col-md-4">
<span id="filter" class="font-title"></span>
<span id="matches" class="font-body"></span>
</div>
<div class="col-12 col-md-8 bounty-info" id="funding-info">
</div>
</div>
<div style="clear: right;"></div>
<div class="row loading justify-content-center align-items-center loading_img">
<img src="{% static "v2/images/loading_v2.gif" %}">
</div>
Expand Down
11 changes: 3 additions & 8 deletions app/retail/templates/shared/result.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
[[/if]]
<div class="col-12 col-md-8 d-flex flex-column">
<div class="bounty-detail">
[[if attached_job_description != null && attached_job_description != '']]
<div class="hiring"></div>
[[/if]]
<div class="title font-subheader">
[[:title]]
</div>
Expand All @@ -37,14 +40,6 @@
<span>[[:network]]</span>
</p>
</div>
[[else]]
[[if attached_job_description != null && attached_job_description != '']]
<div class="tag hiring">
<p>
<span>Hiring</span>
</p>
</div>
[[/if]]
[[/if]]
<div class="tag token">
<p>
Expand Down

0 comments on commit 14bda0d

Please sign in to comment.