Skip to content

Commit b66fd6c

Browse files
committed
Small ui fixes
1 parent 90398a7 commit b66fd6c

File tree

8 files changed

+40
-8
lines changed

8 files changed

+40
-8
lines changed

app/assets/stylesheets/main.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,18 @@ td.hljs-ln-code {
435435
padding-left: 10px !important;
436436
}
437437

438+
.course-card-link:hover {
439+
text-decoration: none;
440+
}
438441

439442
.course-card {
440443
color: black;
444+
445+
&:hover {
446+
box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14),0 1px 5px 0 rgba(0,0,0,0.12),0 3px 1px -2px rgba(0,0,0,0.2);
447+
filter: brightness(0.95);
448+
transition: all .2s;
449+
}
441450
}
442451

443452
.nobullets {

app/assets/stylesheets/organizations.css renamed to app/assets/stylesheets/organizations.scss

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,37 @@
22
color: black !important;
33
}
44

5-
.organization-card:hover {
5+
.organization-card-link:hover {
66
text-decoration: none;
77
}
88

9-
.organization-card .card-body {
9+
.organization-card .card-body, .small-organization-card .card-body {
1010
display: flex;
11+
align-items: center;
1112
}
1213

14+
.organization-card:hover, .small-organization-card:hover {
15+
box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14),0 1px 5px 0 rgba(0,0,0,0.12),0 3px 1px -2px rgba(0,0,0,0.2);
16+
filter: brightness(0.95);
17+
transition: all .2s;
18+
}
19+
20+
$image-size: 6rem;
21+
1322
.organization-card .card-body img {
1423
margin-right: 1rem;
24+
width: $image-size;
25+
height: $image-size;
26+
}
27+
28+
.small-organization-card .card-body img {
29+
margin-right: 1rem;
30+
width: $image-size/2;
31+
height: $image-size/2;
1532
}
1633

1734
.cover-content {
18-
padding: 11rem;
35+
padding-bottom: 11rem;
1936
padding-top: 7rem;
2037
text-align: center;
2138
}

app/views/courses/_list.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% locals[:courses].each do |course| %>
2-
<%= link_to organization_course_path(@organization, course) do %>
2+
<%= link_to organization_course_path(@organization, course), class: "course-card-link" do %>
33
<div class="card course-card<% unless course.hidden? || course.disabled? %> border-secondary<% end %>">
44
<div class="card-body<% if course.hidden? || course.disabled? %> text-secondary<% end %>">
55
<h4 class="card-title">

app/views/layouts/application.html.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<% end %>
4444
<%= bootstrap_flash %>
4545
<%= yield %>
46+
<br>
4647
</div>
4748
</div>
4849
<div class="everything-push">

app/views/layouts/landing.html.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<div id="everything">
3030
<div class="container container-fluid well-large" id="content-area">
3131
<%= yield %>
32+
<br>
33+
<br>
3234
</div>
3335
</div>
3436
<%= render partial: 'layouts/footer' %>

app/views/organizations/_organization.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<%= link_to organization do %>
1+
<%= link_to organization, class: "organization-card-link" do %>
22
<div class="card organization-card <%= organization.hidden? ? 'border-secondary' : 'border-dark' %>">
33
<div class="card-body <%= organization.hidden? ? 'text-secondary' : '' %>">
4-
<%= image_tag organization.logo.url(:small_logo) if organization.logo? %>
4+
<%= image_tag(organization.logo.url(:small_logo), class: "img-fluid") %>
55
<div>
66
<h4 class="card-title">
77
<%= organization.name %>

app/views/organizations/index.html.erb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@
3636
<% @organizations.each do |organization| %>
3737
<% next if organization.hidden? && !can?(:view_hidden_organizations, nil) %>
3838
<li>
39-
<%= link_to organization_path(organization) do %>
40-
<div class="card">
39+
<%= link_to organization_path(organization), class: "organization-card-link" do %>
40+
<div class="card small-organization-card">
4141
<div class="card-body <%= organization.hidden? ? 'text-secondary' : '' %>">
42+
<%= image_tag(organization.logo.url(:small_logo), class: "img-fluid") %>
43+
<div>
4244
<h6 class="card-title">
4345
<%= organization.name %>
4446
<small class="text-muted <%= /[[:upper:]]/.match(organization.name[-1]) ? 'text-littlebitup' : '' %>">
@@ -48,6 +50,7 @@
4850
<%= organization.information %>
4951
</div>
5052
</div>
53+
</div>
5154
<% end %>
5255
<br>
5356
</li>

public/logos/small_logo/missing.png

1.44 KB
Loading

0 commit comments

Comments
 (0)