Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions sass/assets/atoms.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
a.members-grid {
@extend .float-xs-left;
font-size: .75em;
margin: $margin-sm;
margin-bottom: $margin-sm;
padding: $margin-xs $margin-md;
background-color: $gray;
border-radius: 16px;

}
a.members-grid:hover {
text-decoration: none;
}
9 changes: 9 additions & 0 deletions sass/assets/tables.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
@import './node_modules/bootstrap/scss/bootstrap';

.scroll-y {
overflow-y: auto;
overflow-x: hidden;
}

.cell {
@extend .card;
>.context {
Expand All @@ -14,3 +19,7 @@ a.cell {
background-color: $highlighted;
}
}

.table {

}
1 change: 1 addition & 0 deletions sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ p.header {

@import 'assets/tables';
@import 'assets/media';
@import 'assets/atoms';

@import 'partials/navbar';
@import 'partials/index_page';
Expand Down
16 changes: 6 additions & 10 deletions sass/partials/_index_page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,15 @@
}
}
#project-cell-content-picker {
.table {
margin-bottom: 0;
}
p {
text-align: center;
font-size: .75em;
margin-bottom: 0;
}
margin-bottom: $margin-md;

}
.link {
Expand Down Expand Up @@ -115,16 +121,6 @@
}

}
.position-requests, .events {
.table {
margin-bottom: 0;
}
.table td.title {
font-weight: bold;
text-align: left;
}

}

}
.project-banner-headline {
Expand Down
16 changes: 16 additions & 0 deletions views/partials/atoms/area_requests-table.jade
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
if (block_requests.length > 0)
table.table
tbody
each request in block_requests
tr
td.title
p
a(href="/projects/"+project.id+"#areaRequest-list")= request.title
//TODO Tooltips/Popovers
- var assets = [];
each asset in request.assets
- assets.push(asset.title + "— level " + asset.experience + "\n")
td(title=assets style=" background-color: " +request.project_interest_color)
p!= helper.pluralize('position', request.nPositions, true)
else
span no current requests at this moment
12 changes: 12 additions & 0 deletions views/partials/atoms/events-table.jade
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
if (block_events.length > 0)
table.table
tbody
each event in block_events
tr
td.title
p
a(href="/events/"+event.id)= event.title
td
p= event.date_range
else
span no current events
5 changes: 5 additions & 0 deletions views/partials/atoms/members-grid.jade
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if (block_members.length > 0)
each member in block_members
a.members-grid(href="/members/"+member.id)= member.first_name + " " + member.last_name[0]
else
span no participating members
30 changes: 28 additions & 2 deletions views/partials/homepage/_homepage_project_cell-content-picker.jade
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
#project-cell-content-picker
h2 Description
p= project.description_short
.tab-content
//Description
.tab-pane(id=p+"content-description" role="tabpanel")
a(data-toggle="tab" href="#"+p+"content-members" role="tab")
h2 Description
p= project.description_short
//Members
.tab-pane(id=p+"content-members" role="tabpanel")
a(data-toggle="tab" href="#"+p+"content-positions" role="tab")
h2 Members
- var block_members = project.members
.scroll-y(style="max-height: 132px;")
include ../../partials/atoms/members-grid
//Area Requests
.tab-pane.active(id=p+"content-positions" role="tabpanel")
a(data-toggle="tab" href="#"+p+"content-events" role="tab")
h2 Area Requests
- var block_requests = project.areaRequests
.scroll-y(style="max-height: 132px;")
include ../../partials/atoms/area_requests-table
//Events
.tab-pane(id=p+"content-events" role="tabpanel")
a(data-toggle="tab" href="#"+p+"content-description" role="tab")
h2 Events
- var block_events = project.events
.scroll-y(style="max-height: 132px;")
include ../../partials/atoms/events-table

32 changes: 6 additions & 26 deletions views/partials/homepage/_homepage_project_cell.jade
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
//Tablet-Desktop-HD Desktop
.row.card.project-banner.hidden-sm-down
.col-lg-9.project-banner-img
.col-lg-8.project-banner-img
img.img-fluid(src= 'images/projects/' + project.title.toLowerCase() + '/banner.jpg')
h1.project-banner-headline= project.title
.project-cell
h3= project.post
p.status= project.status
a.link(href='/projects/' + project.id )
.col-lg-3.project-banner-description
.col-lg-4.project-banner-description
include ./_homepage_project_cell-content-picker
//Phone landscape sm
#device-phone.row.card.project-banner.hidden-md-up.hidden-xs-down
Expand Down Expand Up @@ -79,32 +79,12 @@
span no images
.position-requests
p.header Position Requests
if (project.areaRequests.length > 0)
table.table
tbody
each request in project.areaRequests
tr
td.title
a(href="/projects/"+project.id+"#areaRequest-list")= request.title
//TODO Tooltips/Popovers
- var assets = [];
each asset in request.assets
- assets.push(asset.title + "— level " + asset.experience + "\n")
td(title=assets style=" background-color: " +request.project_interest_color)!= helper.pluralize('position', request.nPositions, true)
else
span no current requests at this moment
- var block_requests = project.areaRequests
include ../../partials/atoms/area_requests-table
.events
p.header Events
if (project.events.length > 0)
table.table
tbody
each event in project.events
tr
td.title
a(href="/events/"+event.id)= event.title
td= event.date_range
else
span no listed events
- var block_events = project.events
include ../../partials/atoms/events-table

//Phone xs
#device-phone.row.card.project-banner.hidden-sm-up
Expand Down
1 change: 1 addition & 0 deletions views/partials/homepage/_homepage_project_spotlight.jade
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
.col-lg-12
h1 Project Spotlight
each project in projects
- var p = "p"+project.id+"-";
include ./_homepage_project_cell
hr