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

Firefox alignment fix, misc. styling, login cancel button #96

Merged
merged 10 commits into from
May 5, 2017
Merged

Firefox alignment fix, misc. styling, login cancel button #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
23ced20
fix warning badge alignment and change color to white
BenAlderfer May 1, 2017
9a6de6f
Merge branch 'master' into design-changes
BenAlderfer May 3, 2017
3a3135b
Merge branch 'master' into design-changes
BenAlderfer May 4, 2017
7bd3b3f
login modal close button (untested)
BenAlderfer May 4, 2017
03894b1
cancel button confirmed working, working on edit course styling
BenAlderfer May 5, 2017
5acc8c8
fix color picker alignment
BenAlderfer May 5, 2017
ebe267f
fixed firefox alignment issue
BenAlderfer May 5, 2017
1be9e3d
working on color picker alignment
BenAlderfer May 5, 2017
d0868ab
good as it'll get for now
BenAlderfer May 5, 2017
39d8179
Merge branch 'master' into design-changes
BenAlderfer May 5, 2017
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
40 changes: 28 additions & 12 deletions public/js/directives/course/course-edit-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,43 @@ <h3 class="modal-title">Edit Course</h3>
</div>
<div class="modal-body">
<div class="main-course-info">
<!-- 1st row -->
<labeled-text name="'Name'" model="c.name" style="flex:1 0 100%"></labeled-text>
<!-- /1st row -->

<!-- 2nd row -->
<div style="display: flex;">
<div class="form-group" style="flex:1">
<label for="deptInput">Department</label>
<color-picker ng-model="deptColor" options="{ name: 'dept-color', swatchOnly: true }"></color-picker>
<input type="text" class="form-control" id="deptInput"
placeholder="Department" ng-model="c.dept" />
</div>

<labeled-text name="'Number'" model="c.num" style="flex:1"></labeled-text>
<labeled-text name="'Credits'" model="c.credits" style="flex:0 0 50px"></labeled-text>
</div>
<!-- /2nd row -->
</div>

<!-- 3rd row -->
<div style="display: flex; ">
<div class="form-group" style="flex:1">
<label for="deptInput">Department</label>
<color-picker ng-model="deptColor" options="{ name: 'dept-color', swatchOnly: true }"></color-picker>
<input type="text" class="form-control" id="deptInput"
placeholder="Department" ng-model="c.dept" />
<label>Prerequisites</label>
<input type="text" class="form-control left-side no-right-border prereq-dept" ng-model="prereq.dept" placeholder="Department"/>
</div>

<labeled-text name="'Number'" model="c.num" style="flex:1"></labeled-text>
<labeled-text name="'Credits'" model="c.credits" style="flex:0 0 50px"></labeled-text>
</div>
<div class="form-group" style="flex:1">
<label>&nbsp;</label>
<input type="text" class="form-control right-side prereq-num" ng-model="prereq.num" placeholder="Number"/>
</div>

<label>Prerequisites</label>
<div class="prereq-form">
<input type="text" class="form-control left-side no-right-border" ng-model="prereq.dept" placeholder="Department"/>
<input type="text" class="form-control right-side" ng-model="prereq.num" placeholder="Number"/>
<button class="btn btn-default right-side add-prereq" ng-click="addPrereq()"
<button class="btn btn-default right-side add-prereq" style="flex:0 0 30px;" ng-click="addPrereq()"
ng-disabled="!prereq.dept || !prereq.num">
<i class="fa fa-plus"></i>
</button>
</div>
<!-- /3rd row -->

<ul class="list-group">
<li class="list-group-item deletable-list-item" ng-repeat="prereq in c.prereqs">
Expand Down
1 change: 1 addition & 0 deletions public/js/modals/login/login-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div class="login-modal">
<div class="modal-header">
<button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h3 class="modal-title">Login</h3>
</div>
<div class="modal-body">
Expand Down
4 changes: 3 additions & 1 deletion public/js/modals/login/login-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ angular.module('LoginModal', ['ui.bootstrap', 'AuthService'])
modalInstance.close();
});
};

modalScope.close = function () {
modalInstance.close();
};
modalScope.invalidForm = function() {
return !modalScope.email || !modalScope.password;
};
Expand Down
8 changes: 4 additions & 4 deletions public/sass/CoursePlanner.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ body {
}

.plan-title {
margin-right: auto;
margin-left: 15px;
margin-bottom: 5px;
margin-top: 15px;
margin: 15px auto 5px 15px;
font-weight: bold;
}

Expand Down Expand Up @@ -261,6 +258,7 @@ body {
flex: 1;
}

// not an error - this centers plans
years {
margin: 0 auto;
}
Expand Down Expand Up @@ -329,6 +327,8 @@ li {
color-picker {
position: absolute;
margin-top: -1px;
margin-left: -1px;

span {
display: inline-block !important;
width: 15px !important;
Expand Down
18 changes: 16 additions & 2 deletions public/sass/course.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ $shadow: #888888;
padding-top: 5px;
padding-left: 1px;
padding-right: 1px;

p {
margin: 0;
font-size: x-small;
Expand All @@ -82,6 +83,17 @@ $shadow: #888888;
right: 0;
}

.prereq-dept {
border-right: none;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}

.prereq-num {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}

.bottomleft-topright-line {
width: 200px;
max-height: 0;
Expand Down Expand Up @@ -117,9 +129,10 @@ $shadow: #888888;
right: -5px;
float: right;
background: $red;
padding-top: 1.5px;
border-radius: 6px;
height: 14px;
color: $black;
color: $white;
z-index: 3;
width: 14px;
}
Expand All @@ -142,7 +155,8 @@ $shadow: #888888;
}

.add-prereq {
margin-left: 5px;
//TODO: should try to fix this to align properly, not with margins
margin: 25px 0 14px 5px;
box-shadow: none;
padding: 5px;
}
Expand Down