Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated CSS to address issue #5959 #6069

Merged
merged 1 commit into from
Jul 26, 2019
Merged

updated CSS to address issue #5959 #6069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions app/assets/stylesheets/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,10 @@ a .fa-white,
.pl-content blockquote p {
padding: 8px 4px;
margin-top: 8px;
font-size: 14px;
font-family: "Helvetica Neue";
border-left: 5px solid #736f6f;
background-color: #f3f1ef;
}

#tags .label {
Expand Down Expand Up @@ -387,8 +391,8 @@ div.note .meta {
height:auto;
overflow:auto;
}
/*start of img aspect css that will affect the
thumbnails which appears on the user's profile
/*start of img aspect css that will affect the
thumbnails which appears on the user's profile
under their notes*/
#notes .note a.img {
height: auto;
Expand All @@ -408,7 +412,7 @@ under their notes*/
.grid-image {
width: 100% !important;
height: auto;
display: block;
display: block;
overflow: hidden;
margin-bottom: 10px;
}
Expand Down Expand Up @@ -470,7 +474,7 @@ div.note.moderated h4 {
.grid-image {
width: auto;
height: auto;
display: block;
display: block;
overflow: hidden;
margin-bottom: 10px;
}
Expand Down
22 changes: 11 additions & 11 deletions app/views/dashboard/_activity.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<div class="meta activity-dropdown">
<div class="btn-group">

<button
class="btn btn-outline-secondary btn-sm dropdown-toggle"
type="button"
data-toggle="dropdown"
aria-haspopup="true"
<button
class="btn btn-outline-secondary btn-sm dropdown-toggle"
type="button"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
>
<span class="node-type-filter"><%= t('dashboard._activity.all_updates') %></span>
Expand All @@ -23,7 +23,7 @@
<div class="dropdown-menu">
<a class="form-check dropdown-item" href="#">
<label class="form-check-label">
<input data-type="all" class="node-type-all" type="checkbox" checked="checked" />
<input data-type="all" class="node-type-all" type="checkbox" checked="checked" />
<%= t('dashboard._activity.dropdown.all') %>
</label>
</a>
Expand All @@ -32,32 +32,32 @@

<a class="form-check dropdown-item" href="#">
<label class="form-check-label">
<input data-type="note" class="node-type node-type-note" type="checkbox" checked="checked" />
<input data-type="note" class="node-type node-type-note" type="checkbox" checked="checked" />
<%= t('dashboard._activity.dropdown.research_notes') %>
</label>
</a>
<a class="form-check dropdown-item" href="#">
<label class="form-check-label">
<input data-type="question" class="node-type node-type-question" type="checkbox" checked="checked" />
<input data-type="question" class="node-type node-type-question" type="checkbox" checked="checked" />
<%= t('dashboard._activity.dropdown.question') %>
</label>
</a>
<a class="form-check dropdown-item" href="#">
<label class="form-check-label">
<input data-type="event" class="node-type node-type-event" type="checkbox" checked="checked" />
<input data-type="event" class="node-type node-type-event" type="checkbox" checked="checked" />
<%= t('dashboard._activity.dropdown.events') %>
</label>
</a>
<a class="form-check dropdown-item" href="#">
<label class="form-check-label">
<input data-type="comment" class="node-type node-type-comment" type="checkbox" checked="checked" />
<input data-type="comment" class="node-type node-type-comment" type="checkbox" checked="checked" />
<%= t('dashboard._activity.dropdown.comments') %>
</label>
</a>

<a class="d-lg-none dropdown-item" href="#">
<label>
<input data-type="wiki" class="node-type node-type-wiki" type="checkbox" checked="checked" />
<input data-type="wiki" class="node-type node-type-wiki" type="checkbox" checked="checked" />
<%= t('dashboard._activity.dropdown.wiki') %>
</label>
</a>
Expand Down