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

made some changes to block out details css page, attempted to get the… #2

Open
wants to merge 2 commits into
base: andy
Choose a base branch
from
Open

made some changes to block out details css page, attempted to get the… #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be8d4b2
made some changes to block out details css page, attempted to get the…
Cece47 May 31, 2015
b0d3d34
updating a few minor css details so i can open master to look at it
Cece47 May 31, 2015
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
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h1>Edit Appointment</h1>

<!--TEMPLATE details of appointments-->
<script id="details" type="text/HTML">
<header>
<header class="details-pg-header">
<i class="fa fa-calendar-o"></i>
<h1 class="header"> Details </h1>
</header>
Expand Down
19 changes: 10 additions & 9 deletions js/appt-new-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ app.router.route('appt/new', function () {
$('.appointment-form').on('submit', function (e) {
e.preventDefault();

var addAppt = new app.Appt(
$('input[name=title-input]').val(),
$('input[name=date-input]').val(),
$('input[name=time-input]').val(),
$('input[name=address-input]').val()
);
// return addAppt;
app.appts.add(addAppt);
var addAppt = new app.appts(
$('input[name=title-input]').val(),
$('input[name=date-input]').val(),
$('input[name=time-input]').val(),
$('input[name=address-input]').val()
);
return addAppt;

});
app.appts.add(addAppt);

});
});

app.router.route('home', goHome);
Expand Down
2 changes: 2 additions & 0 deletions js/appt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ app.appts = function (apptTitle, date, apptTime, address) {
return app.appts;

};

console.log(app.appts);
25 changes: 22 additions & 3 deletions styles/details-style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,27 @@

.details-pg-header {
width:100%;
}
.details-appointment-title, .details-appointment-date,
.details-appointment-time, .details-appointment-address,
.details-appointment-map, .details-weather-container, .details-appointment-notes {
border: 1px solid black;
padding: 1em;
padding-bottom: 1em;
background: white;
}
display:inline-block;
position:relative;
text-align:center;
}
.details-appointment-title, .details-appointment-address, .details-appointment-map, .details-weather-container, .details-appointment-notes {
width:40em;
height:3em;
}
.details-appointment-date, .details-appointment-time {
width:10em;
height:1.5em;
}
.details-appointment-date {
float:left;
}
.details-appointment-time {
float:right;
}
32 changes: 4 additions & 28 deletions styles/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ header {
font-size:1.7em;
text-shadow: 3px 3px white;
}
.main-container {
display:block;
max-width: 100%;
}
.fa-bars {
float:right;
position:absolute;
Expand All @@ -36,29 +40,6 @@ header {
z-index: 2;
top:0;
}
.menu {
background-color:#f0f1ee;
padding:0.5em;
padding-left:3.5em;
line-height:1.5em;
width: 170px;
height:6em;
position: absolute;
top: 60px;
}
.wrap:hover .menu {
right: -7px;
}
.menu a {
font-family: 'Open Sans Condensed', sans-serif;
text-decoration:none;
font-family:Helvetica;
margin-bottom:0.5em;
color:black;
}
.menu a:hover {
color:#8FD4D9;
}
.fa-calendar-o {
float:left;
position:absolute;
Expand All @@ -68,11 +49,6 @@ header {
font-size:1.7em;
text-shadow: 3px 3px white;
}
.main-container {
margin:0 auto;
display:block;
max-width: 50%;
}
.search-form {
display:block;
}
Expand Down