Merge branch 'develop' into gh-pages

* develop:
  no message
  no message
  Update bookmarklet.js
  Update bookmarklet.js
This commit is contained in:
Bengt Brodersen 2015-06-10 23:26:03 +02:00
commit b9c7db5c24

View File

@ -85,9 +85,9 @@
jQuery("#hide-due-date-checkbox").attr('checked', readCookie("card_printer_hide_due_date", 'false') == 'true');
jQuery("#hide-status-checkbox").attr('checked', readCookie("card_printer_hide_status", 'true') == 'true');
jQuery("#card-print-dialog-title").text("Card Print - Loading " + issueKeyList.length + " issues...");
jQuery("#card-print-dialog-title").text("Card Printer - Loading issues...");
renderCards(issueKeyList, function() {
jQuery("#card-print-dialog-title").text("Card Print");
jQuery("#card-print-dialog-title").text("Card Printer");
//print();
});
@ -392,9 +392,9 @@
/*!
<div id="card-print-dialog">
<div id="card-print-dialog-header">
<div id="card-print-dialog-title">Card Print</div>
<div id="card-print-dialog-title">Card Printer</div>
<div id="info">
<label id="info-line">Card Printer supports...&nbsp;&nbsp;&nbsp;<b>Jira</b> - <b>PivotalTracker</b> - <b>Trello</b> - <b>YouTrack</b></label>
<label id="info-line"><b>Jira</b> - <b>PivotalTracker</b> - <b>Trello</b> - <b>YouTrack</b></label>
<input id="report-issue" type="button" class="aui-button" value="Report Issues" />
<input id="about" type="button" class="aui-button" value="About" />
</div>
@ -808,8 +808,8 @@ body {
position: absolute;
left: 0rem;
top: 0rem;
height: 3.2rem;
width: 3.2rem;
height: 3.0rem;
width: 3.0rem;
border-radius: 50% !important;
background-color: LIGHTSEAGREEN !important;
background-image: url(https://qoomon.github.io/Jira-Issue-Card-Printer/resources/icons/Objects.png);
@ -817,7 +817,7 @@ body {
background-position: center;
background-size: 63%;
}
.issue-icon[type="story"] {
.issue-icon[type="story"], .issue-icon[type="user story"]{
background-color: GOLD !important;
background-image: url(https://qoomon.github.io/Jira-Issue-Card-Printer/resources/icons/Bulb.png);
}
@ -962,7 +962,7 @@ body {
}
.badge, .shadow {
border-style: solid;
border-color: #555;
border-color: #333;
border-top-width: 0.12rem;
border-left-width: 0.12rem;
border-bottom-width: 0.21rem;
@ -971,7 +971,7 @@ body {
}
.badge {
// WHITESMOKE, GAINSBOROM;
background-color: WHITESMOKE;
background-color: #E0E0E0;
}
.hidden {
display: none;