Skip to content

Commit

Permalink
chore: css fixes (#4992)
Browse files Browse the repository at this point in the history
- added padding to make footer look nicer
- fixed margin on dashboard
  • Loading branch information
thelostone-mc authored and danlipert committed Aug 8, 2019
1 parent 27488df commit be49f41
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 23 deletions.
1 change: 1 addition & 0 deletions app/assets/v2/css/gitcoin.css
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ div.button-pink {

.footer {
background-color: #0d023b;
padding-top: 4rem;
}

.footer .nav-link {
Expand Down
46 changes: 23 additions & 23 deletions app/dashboard/templates/board.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<div id="gc-board" v-cloak>

<div class="container">
<nav class="mx-3">
<nav class="mx-3 mt-5">
<div class="nav nav-tabs" id="myTab" role="tablist">
<a class="nav-item nav-link nav-line active" id="funder-tab" data-toggle="tab" href="#nav-funder" role="tab" aria-controls="funder" aria-selected="false" @click="checkData('funder')">Funder</a>
<a class="nav-item nav-link nav-line " id="contributor-tab" data-toggle="tab" href="#nav-contributor" role="tab" aria-controls="contributor" aria-selected="true" @click="checkData('contributor')">Contributor</a>
Expand Down Expand Up @@ -79,17 +79,17 @@
</span>
<span class="font-weight-bold">You have [[ bounty.users_count ]] [[ 'applicant' | pluralize(bounty.users_count) ]] on this bounty</span>
<div class="d-flex flex-column flex-lg-row justify-content-between border p-3 my-2 ml-5 rounded">
<div class="list-bounty-item_content">
<div class="list-bounty-item_content my-auto">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2">&bull;</span>
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<template v-if="bounty.expires_date">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2">&bull;</span>
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
Expand All @@ -100,15 +100,15 @@
</div>
<button v-if="bounty.users_count > 0" @click="toggleCollapse(key, 'open'), fetchApplicants(bounty.id, key, 'open')" class="btn blue">View Applicants <i class="fa fa-fw" :class="isExpanded(key, 'open')? 'fa-chevron-up': 'fa-chevron-down'"></i></button>
<div class="d-flex flex-column justify-content-center" v-else>
<a :href="`/bounty/change/${bounty.id}`" target="_blank" class="btn btn-gc-blue btn-sm m-2"> <i class="fas fa-star"></i> Feature Bounty</a>
<a :href="`/bounty/change/${bounty.id}`" target="_blank" class="btn btn-gc-blue btn-sm m-2"> <i class="fas fa-user"></i> Invite Contributors</a>
<a :href="`/bounty/change/${bounty.id}`" target="_blank" class="btn btn-gc-blue btn-sm m-2"> <i class="fas fa-star pr-2"></i> Feature Bounty</a>
<a :href="`/bounty/change/${bounty.id}`" target="_blank" class="btn btn-gc-blue btn-sm m-2"> <i class="fas fa-user pr-2"></i> Invite Contributors</a>
</div>
</div>
<div v-show="isExpanded(key, 'open')">
<ul class="list-unstyled m-5">
<li class="mb-4" v-for="(contributor, key) in bounty.contributors">
<div class="d-flex flex-column flex-md-row justify-content-between">
<div class="list-bounty-item_content">
<div class="list-bounty-item_content my-auto">
<div class="d-flex">
<img :src="contributor.avatar_url" alt="" width="40" height="40" class="flex-shrink-0 mr-2 rounded-circle">
<div class="d-flex flex-column">
Expand Down Expand Up @@ -172,17 +172,17 @@ <h4 class="h5 font-weight-semibold my-3">
</span>
<span class="font-weight-bold">You have [[ bounty.users_count ]] [[ 'applicant' | pluralize(bounty.users_count) ]] on this bounty</span>
<div class="d-flex flex-column flex-lg-row justify-content-between border p-3 my-2 ml-5 rounded">
<div class="list-bounty-item_content">
<div class="list-bounty-item_content my-auto">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2">&bull;</span>
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<template v-if="bounty.expires_date">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2">&bull;</span>
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
Expand All @@ -197,7 +197,7 @@ <h4 class="h5 font-weight-semibold my-3">
<ul class="list-unstyled m-5">
<li class="mb-4" v-for="(contributor, key) in bounty.contributors">
<div class="d-flex flex-column flex-md-row justify-content-between">
<div class="list-bounty-item_content">
<div class="list-bounty-item_content my-auto">
<div class="d-flex">
<img :src="contributor.avatar_url" alt="" width="40" height="40" class="flex-shrink-0 mr-2 rounded-circle">
<div class="d-flex flex-column">
Expand Down Expand Up @@ -242,17 +242,17 @@ <h4 class="h5 font-weight-semibold my-3">
</span>
<span class="font-weight-bold">You have expired bounties</span>
<div class="d-flex flex-column flex-lg-row justify-content-between border p-3 my-2 ml-5 rounded">
<div class="list-bounty-item_content">
<div class="list-bounty-item_content my-auto">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2">&bull;</span>
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<template v-if="bounty.expires_date">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2">&bull;</span>
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
Expand Down Expand Up @@ -313,17 +313,17 @@ <h4 class="h5 font-weight-semibold my-3">
</span>
<span class="font-weight-bold">You are currently working on this bounty
</span>
<div class="d-flex flex-column flex-lg-row justify-content-between border p-3 my-2 ml-5 rounded">
<div class="list-bounty-item_content">
<div class="list-bounty-item_content my-auto">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2">&bull;</span>
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<template v-if="bounty.expires_date">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2">&bull;</span>
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
Expand Down Expand Up @@ -368,17 +368,17 @@ <h4 class="h5 font-weight-semibold my-3">
</span>
<span class="font-weight-bold">You are awaiting approval
</span>
<div class="d-flex flex-column flex-lg-row justify-content-between border p-3 my-2 ml-5 rounded">
<div class="list-bounty-item_content">
<div class="list-bounty-item_content my-auto">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2">&bull;</span>
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<template v-if="bounty.expires_date">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2">&bull;</span>
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
Expand Down Expand Up @@ -416,17 +416,17 @@ <h4 class="h5 font-weight-semibold my-3">
</span>
<span class="font-weight-bold">You are awaiting payment
</span>
<div class="d-flex flex-column flex-lg-row justify-content-between border p-3 my-2 ml-5 rounded">
<div class="list-bounty-item_content">
<div class="list-bounty-item_content my-auto">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2">&bull;</span>
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<template v-if="bounty.expires_date">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2">&bull;</span>
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
Expand Down

0 comments on commit be49f41

Please sign in to comment.