Skip to content

Commit

Permalink
Appearance fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
iliaaw committed Sep 13, 2013
1 parent 2fee013 commit 5a5bf23
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 19 deletions.
43 changes: 33 additions & 10 deletions css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ button {

.header {
padding: 55px 0px 0px 1px;
width: 900px;
width: 897px;
margin: 0px auto;
}

Expand Down Expand Up @@ -102,7 +102,7 @@ button {
border-radius: 2px;
border: 1px solid #ccc;
padding: 24px 24px 0px;
z-index: 1;
z-index: 100;
box-shadow: 0px 1px 4px 1px #cfcfcf;
}

Expand Down Expand Up @@ -146,6 +146,12 @@ button {
cursor: pointer;
}

.fastbox-button-close:hover,
.editbox-button-close:hover,
.searchbox-button-close:hover {
color: #666;
}

.fastbox-button-close,
.editbox-button-close {
position: absolute;
Expand Down Expand Up @@ -238,13 +244,20 @@ button {
width: 127px;
height: 117px;
border: 1px solid #e0e0e0;
overflow: hidden;
line-height: 16px;
}

.cell-wrapper {
.cell-border {
position: relative;
width: 113px;
height: 103px;
padding: 7px;
}

.cell-inner {
width: 113px;
height: 103px;
overflow: hidden;
}

.cell-reminder {
Expand All @@ -263,18 +276,26 @@ button {
background: #e4eff7;
}

.cell-current .cell-wrapper {
.cell-current .cell-border:after {
content: '';
position: absolute;
display: block;
border: 2px solid #86c9fc;
padding: 5px;
top: -1px;
left: -1px;
bottom: -1px;
right: -1px;
}

.cell-date {
margin-bottom: 5px;
}

.cell-title {
margin-top: 5px;
font-weight: bold;
}

.cell-participants {
margin-top: 5px;
}

.resultsbox-wrapper {
Expand All @@ -288,6 +309,7 @@ button {
border-radius: 2px;
border: 1px solid #ccc;
box-shadow: 0px 1px 4px 1px #cfcfcf;
z-index: 100;
}

.resultsbox-wrapper:after {
Expand Down Expand Up @@ -341,12 +363,12 @@ button {

.resultsbox-result {
border-bottom: 1px solid #ebebeb;
margin-left: 8px;
margin-left: 4px;
cursor: pointer;
position: relative;
white-space: nowrap;
overflow: hidden;
z-index: 1;
z-index: 100;
}

.resultsbox-result:last-child {
Expand Down Expand Up @@ -388,6 +410,7 @@ button {
padding: 24px 22px;
margin: -20px 15px;
box-shadow: 0px 1px 4px 1px #cfcfcf;
z-index: 100;
}


Expand Down
20 changes: 11 additions & 9 deletions js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -511,16 +511,18 @@
.addClass(item ? 'cell-reminder' : '')
.addClass(date.getHyphenSeparatedDate() === new Date().getHyphenSeparatedDate() ? 'cell-today' : '')
.append($('<div></div>')
.addClass('cell-wrapper')
.addClass('cell-border')
.append($('<div></div>')
.addClass('cell-date')
.html(cellDate))
.append($('<div></div>')
.addClass('cell-title')
.html(item ? item.title : ''))
.append($('<div></div>')
.addClass('cell-participants')
.html(item ? item.participants : '')))
.addClass('cell-inner')
.append($('<div></div>')
.addClass('cell-date')
.html(cellDate))
.append($('<div></div>')
.addClass('cell-title')
.html(item ? item.title : ''))
.append($('<div></div>')
.addClass('cell-participants')
.html(item ? item.participants : ''))))
.data('date', date.getHyphenSeparatedDate())
.click(clickHandler);
};
Expand Down

0 comments on commit 5a5bf23

Please sign in to comment.