Skip to content

Commit

Permalink
UI-2977: clean up some code
Browse files Browse the repository at this point in the history
  • Loading branch information
JRMaitre committed Dec 28, 2017
1 parent ac495ce commit ec3f2cf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 53 deletions.
2 changes: 1 addition & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ define(function(require) {
voicemails: formattedData.voicemails
},
$rows = $(monster.template(self, 'voicemails-rows', dataTemplate));

console.log(dataTemplate, $rows);
callback && callback($rows, data, formattedData);
});
},
Expand Down
2 changes: 1 addition & 1 deletion i18n/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"emptyRow": "There are no messages stored in the selected Voicemail Box"
},
"empty": {
"headline1": "There are ",
"headline1": "There are",
"headline2": "voicemail boxes recognized on this account",
"subHeadline": "Select a box to manage the voicemails it contains."
},
Expand Down
56 changes: 6 additions & 50 deletions style/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

.received-voicemails-container .empty-state .count {
font-weight: bold;
margin-left: 3px;
margin-right: 3px;
margin-left: 5px;
margin-right: 5px;
}

.received-voicemails-container .empty-state .vmboxes-list {
Expand Down Expand Up @@ -129,15 +129,6 @@
width: 400px;
}

.received-voicemails-container .vmboxes-list td,
.received-voicemails-container .vmboxes-list .footable-header th {
text-align: left !important;
}

.received-voicemails-container .vmboxes-list td:hover {
background: #FAFAFA;
cursor: pointer;
}
/* Action Bar */
.received-voicemails-container.empty .filters.search,
.received-voicemails-container.empty .filters.basic-actions > *,
Expand Down Expand Up @@ -165,11 +156,6 @@
margin-left: 10px;
}

.received-voicemails-container .action-bar #select_voicemails {
width: 105px;
margin-bottom: 0;
}

.received-voicemails-container .action-bar .hidable {
display: inline-block;
}
Expand All @@ -182,24 +168,11 @@
margin-left: 10px;
}

.received-voicemails-container .action-bar .custom-range > * {
margin: 0 10px 0 0;
vertical-align: middle;
}

.received-voicemails-container .action-bar .custom-range > span {
margin-right: 5px;
}

/* Table */
.received-voicemails-container .voicemails-table table {
margin-top: 0;
}

.received-voicemails-container .voicemails-table table .footable-header th:nth-child(1) {
min-width: 77px;
}

.received-voicemails-container .voicemails-table tbody tr > td:first-child .monster-checkbox {
margin-right: 10px;
margin-top: 8px;
Expand All @@ -221,19 +194,6 @@
text-transform: uppercase;
}

.received-voicemails-container .voicemails-table .status[data-folder="new"] {
color: #33DB24;
font-weight: bold;
}

.received-voicemails-container .voicemails-table .status[data-folder="saved"] {
color: #AAA;
}

.received-voicemails-container .voicemails-table .status[data-folder="deleted"] {
color: #e01a00;
}

.received-voicemails-container .voicemails-table .select-line {
cursor: pointer;
}
Expand All @@ -247,10 +207,6 @@
padding: 0;
}

.received-voicemails-container .voicemails-table .empty-vm-row td {
text-align: center !important;
}

.received-voicemails-container .dropdown-menu.vmbox-target {
height: 300px;
overflow-y: auto;
Expand Down Expand Up @@ -287,21 +243,21 @@
padding: 3px 12px;
}

.received-voicemails-container .date-ranges > * {
.received-voicemails-container .filter-by-date .date-ranges > * {
margin: 0 10px 0 0;
vertical-align: middle;
}

.received-voicemails-container .date-ranges > span {
.received-voicemails-container .filter-by-date .date-ranges > span {
margin-right: 5px;
}

.received-voicemails-container .date-ranges input.date-filter {
.received-voicemails-container .filter-by-date .date-ranges input.date-filter {
height: 24px;
width: 90px;
}

.received-voicemails-container .date-ranges i.fa-calendar {
.received-voicemails-container .filter-by-date .date-ranges i.fa-calendar {
margin-left: -30px;
margin-right: 20px;
}
Expand Down
2 changes: 1 addition & 1 deletion views/received-voicemails.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<span>{{i18n.endDate}}</span>
<input id="endDate" type="text" class="date-filter filter-to">
<i class="fa fa-calendar"></i>
<button type="button" class="apply-filter monster-button monster-button-fit">{{i18n.filter}}</button>
<button type="button" class="apply-filter monster-button-neutral monster-button-fit">{{i18n.filter}}</button>
<a class="monster-link blue toggle-filter">{{i18n.cancel}}</a>
</div>
</div>
Expand Down

0 comments on commit ec3f2cf

Please sign in to comment.