Skip to content

Fixing padding issues #6551

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

Merged
downzer0 merged 1 commit into from
Jan 12, 2015
Merged

Fixing padding issues #6551

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
14 changes: 13 additions & 1 deletion lms/static/sass/course/instructor/_instructor_2.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,11 @@
}

.form-actions {
@include padding($baseline 0 $baseline 0);
padding: $baseline 0;

&.new-cohort-form {
padding: $baseline;
}
}
}

Expand Down Expand Up @@ -1097,6 +1101,14 @@
.tab-content {
@include padding($baseline $baseline 0 $baseline);
border: 1px solid $gray-l5;

&.new-cohort-form {
padding: 0 $baseline;

.form-label {
margin-top: $baseline;
}
}
}
}

Expand Down
7 changes: 5 additions & 2 deletions lms/templates/instructor/instructor_dashboard_2/cohort-form.underscore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<form action="" method="post" name="" id="cohort-management-settings-form" class="cohort-management-settings-form">
<% if (isNewCohort) { %>
<h3 class="form-title"><%- gettext('Add a New Cohort Group') %></h3>
<div class="tab-content is-visible new-cohort-form">
<% } %>

<div class="form-fields">
<%
// Don't allow renaming of existing cohorts yet as it doesn't interact well with
Expand Down Expand Up @@ -113,8 +113,11 @@
</div>
</div>
</div>
<% if (isNewCohort) { %>
</div>
<% } %>

<div class="form-actions">
<div class="form-actions <% if (isNewCohort) { %>new-cohort-form<% } %>">
<button class="form-submit button action-primary action-save">
<i class="icon fa fa-plus" aria-hidden="true"></i>
<%- gettext('Save') %>
Expand Down