natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #327 from youwenliang/ui-refinement 

Modify popup delete dialog
This commit is contained in:
Daniela Arcese 2017-07-27 15:55:05 -04:00 committed by GitHub
parent 0f031e2d8b 9d3f6680cb
commit 07b9545b03
2 changed files with 78 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/upload.js
View File

@ -465,12 +465,14 @@ $(document).ready(function() {
popupDiv.classList.add('popup'); popupDiv.classList.add('popup');
const $popupMessage = $('<div>', { class: 'popup-message' }); const $popupMessage = $('<div>', { class: 'popup-message' });
$popupMessage.attr('data-l10n-id', 'deletePopupText'); $popupMessage.attr('data-l10n-id', 'deletePopupText');
const $popupDelSpan = $('<span>', { class: 'popup-yes' }); const $popupAction = $('<div>', { class: 'popup-action' });
$popupDelSpan.attr('data-l10n-id', 'deletePopupYes');
const $popupNvmSpan = $('<span>', { class: 'popup-no' }); const $popupNvmSpan = $('<span>', { class: 'popup-no' });
$popupNvmSpan.attr('data-l10n-id', 'deletePopupCancel'); $popupNvmSpan.attr('data-l10n-id', 'deletePopupCancel');
const $popupDelSpan = $('<span>', { class: 'popup-yes' });
$popupDelSpan.attr('data-l10n-id', 'deletePopupYes');
$popupText.html([$popupMessage, $popupDelSpan, $popupNvmSpan]); $popupText.html([$popupMessage, $popupAction]);
$popupAction.html([$popupNvmSpan, $popupDelSpan]);
// add data cells to table row // add data cells to table row
row.appendChild(name); row.appendChild(name);

91
public/main.css
View File

@ -275,33 +275,39 @@ tbody {
/* The actual popup (appears on top) */ /* The actual popup (appears on top) */
.popup .popuptext { .popup .popuptext {
visibility: hidden; visibility: hidden;
min-width: 115px; min-width: 204px;
min-height: 105px;
background-color: #fff; background-color: #fff;
color: #000; color: #000;
border: 1px solid #0297f8; border: 1px solid #d7d7db;
padding: 15px 24px;
box-sizing: content-box;
text-align: center; text-align: center;
border-radius: 5px; border-radius: 5px;
padding: 7px 8px;
position: absolute; position: absolute;
z-index: 1; z-index: 1;
bottom: 8px; bottom: 20px;
right: -28px; left: -40px;
transition: opacity 0.5s; transition: opacity 0.5s;
opacity: 0; opacity: 0;
outline: 0; outline: 0;
box-shadow: 3px 3px 7px #888; box-shadow: 3px 3px 7px rgba(136, 136, 136, 0.3);
} }
/* Popup arrow */ /* Popup arrow */
.popup .popuptext::after { .popup .popuptext::after {
content: ""; content: "";
position: absolute; position: absolute;
top: 100%; bottom: -11px;
right: 30px; left: 20px;
margin-left: -5px; background-color: #fff;
border-width: 5px; display: block;
border-style: solid; width: 20px;
border-color: #0297f8 transparent transparent; height: 20px;
transform: rotate(45deg);
border-radius: 0 0 5px;
border-right: 1px solid #d7d7db;
border-bottom: 1px solid #d7d7db;
} }
.popup .show { .popup .show {
@ -310,15 +316,39 @@ tbody {
} }
.popup-message { .popup-message {
margin-bottom: 4px; height: 40px;
display: flex;
justify-content: center;
align-items: center;
border-bottom: 1px #ebebeb solid;
color: #0c0c0d;
font-size: 15px;
font-weight: normal;
padding-bottom: 15px;
white-space: nowrap;
width: calc(100% + 48px);
margin-left: -24px;
}
.popup-action {
margin-top: 15px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
} }
.popup-yes { .popup-yes {
color: #fff; color: #fff;
background-color: #0297f8; background-color: #0297f8;
border-radius: 5px; border-radius: 5px;
padding: 2px 11px; padding: 5px 25px;
font-weight: normal;
cursor: pointer; cursor: pointer;
min-width: 94px;
box-sizing: border-box;
white-space: nowrap;
margin-left: 12px;
} }
.popup-yes:hover { .popup-yes:hover {
@ -327,9 +357,19 @@ tbody {
.popup-no { .popup-no {
color: #4a4a4a; color: #4a4a4a;
border-radius: 6px; background-color: #fbfbfb;
padding: 3px 5px; border: 1px #c1c1c1 solid;
border-radius: 5px;
padding: 5px 25px;
font-weight: normal;
min-width: 94px;
box-sizing: border-box;
cursor: pointer; cursor: pointer;
white-space: nowrap;
}
.popup-no:hover {
background-color: #efeff1;
} }
/** upload-progress **/ /** upload-progress **/
@ -666,8 +706,7 @@ tbody {
.social-links { .social-links {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 9vw; width: 94px;
max-width: 94px;
} }
.social-links > a { .social-links > a {
@ -685,6 +724,18 @@ tbody {
margin-bottom: -5px; margin-bottom: -5px;
} }
@media (max-device-width: 992px), (max-width: 992px) {
.popup .popuptext {
left: auto;
right: -40px;
}
.popup .popuptext::after {
left: auto;
right: 36px;
}
}
@media (max-device-width: 768px), (max-width: 768px) { @media (max-device-width: 768px), (max-width: 768px) {
.description { .description {
margin: 0 auto 25px; margin: 0 auto 25px;
@ -737,6 +788,10 @@ tbody {
.feedback { .feedback {
margin-top: 10px; margin-top: 10px;
min-width: 30px;
max-width: 300px;
text-indent: 2px;
padding: 5px 5px 5px 20px;
} }
#copy { #copy {