Skip to content

Commit

Permalink
Merge pull request #6563 from zoek1/feature/projects-responsive
Browse files Browse the repository at this point in the history 
Add projects responsive fixes
  • Loading branch information
@androolloyd
androolloyd authored May 4, 2020
2 parents 848ea5f + fe4b1c5 commit 1b6e8f4
Showing 1 changed file with 24 additions and 9 deletions.
33 changes: 24 additions & 9 deletions app/dashboard/templates/profiles/tribes-vue.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@
</div>
<div key="sidebar-1" v-if="!isLoading" class="col-12 col-md-9 order-2 order-md-1">
{% if not user.is_authenticated %}
<div class="p-xl-0 pb-4 mx-3 col-11 d-md-none">
<div class="p-xl-0 pb-4 mx-3 col-11 d-md-none py-2">
<div class="get-started">
<div class="d-flex flex-column align-items-center flex-fill ml-3 text-center">
<p class="py-0 px-2 font-title">Gitcoin is a community of 39,102 amazing open source developers working remotely to build in Web3.</p>
Expand Down Expand Up @@ -503,11 +503,26 @@
</div>
</template>
<project-directory v-bind:tribe="tribe.handle" inline-template>
<div class="sidebar-container flex-column flex-lg-row">
<div class="sidebar-container flex-column flex-lg-row mb-3">
<div class="pb-4 border-bottom form-group d-md-none">
<div class="d-flex flex-grow-1 d-md-inline-block mx-3" id="search_projects">
<form class="form-inline my-2 flex-fill justify-content-center">
<div class="input-group w-100">
<input class="form-control" v-model="searchTerm" type="search" placeholder="Search" aria-label="Search">
<div class="input-group-append">
<button type="submit" class="btn input-group-text btn-search" @click.prevent="searchProjects();"> <i class="fas fa-search"></i></button>
</div>
</div>
</form>
</div>
<p class="font-body mx-2 mb-2 mt-4 mx-lg-0 mt-lg-2 d-md-none">
<span class="font-weight-bold">[[ numProjects ]] projects </span> found
</p>
</div>
<transition name="fade">
<nav v-show="showFilters" class="sidebar flex-fill p-4" role="navigation">
<div class="pb-4 border-bottom form-group">
<div class="d-flex flex-grow-1" id="search_projects">
<div class="pb-4 border-bottom form-group d-none d-md-block">
<div class="d-flex flex-grow-1 " id="search_projects">
<form class="form-inline my-2 flex-fill justify-content-center">
<div class="input-group w-100">
<input class="form-control" v-model="searchTerm" type="search" placeholder="Search" aria-label="Search">
Expand All @@ -521,7 +536,7 @@
<span class="font-weight-bold">[[ numProjects ]] projects </span> found
</p>
</div>
<div v-if="!tribe" class="pb-4 border-bottom form-group">
<div v-if="!tribe" class="pb-4 border-bottom form-group d-none d-md-inline-block">
<label for="project_sponsors" class="font-weight-bold">Sponsor</label>
<div id="project_sponsors" class="form__select2">
<select2 v-model.trim="params.sponsor" data-minimum-results-for-search="Infinity" class="form-control">
Expand All @@ -532,19 +547,19 @@
</select2>
</div>
</div>
<div class="g-multiselect pb-4 border-bottom form-group">
<div class="g-multiselect pb-4 border-bottom form-group d-none d-md-inline-block">
<label for="skills" class="font-weight-bold">Member Skills</label>
<div class="form__select2">
<select2 :options="skills" v-model="params.skills" data-placeholder="e.g. HTML, CSS" data-tags="true" multiple class="form-control">
<option disabled value="0">Select one</option>
</select2>
</div>
</div>
<button class="btn blue font-caption px-0 btn-block font-weight-semibold" @click="params = {}; searchTerm = ''; searchProjects();">Reset Filters</button>
<button class="btn blue font-caption px-0 btn-block font-weight-semibold d-none d-md-inline-block" @click="params = {}; searchTerm = ''; searchProjects();">Reset Filters</button>
</nav>
</transition>
<div class="container pt-4" @scroll.passive="onScroll($event)">
<button v-if="!hideFilterButton" class="blue btn font-smaller-1 font-weight-bold" @click="showFilters = !showFilters">[[ showFilters ? 'Hide' : 'Show' ]] filters <i class="fas fa-filter"></i></button>
<button v-if="!hideFilterButton" class="blue btn font-smaller-1 font-weight-bold d-none d-md-inline-block" @click="showFilters = !showFilters">[[ showFilters ? 'Hide' : 'Show' ]] filters <i class="fas fa-filter"></i></button>
<div class="mt-4">
<div v-if="noResults" class="text-center">
<img src="{% static 'v2/images/shrug_bot.png' %}" alt="nothing found" width="316" height="221">
Expand Down Expand Up @@ -1335,7 +1350,7 @@ <h2 class="text-center font-bigger-1 mt-5">
</b-tab>
</b-tabs>
</div>
<div key="feed-1" v-if="!isLoading" class="col-12 col-md-3 order-1 order-md-2">
<div key="feed-1" v-if="!isLoading && is_my_org && tribe" class="col-12 col-md-3 order-1 order-md-2">
<div id="sponsor_sidebar" class="font-body">
<div class="sponsor-top d-none d-sm-block"></div>
<div class="p-3">
Expand Down

0 comments on commit 1b6e8f4

Please sign in to comment.