Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Fix various UI stuff in ShareDialog
Browse files Browse the repository at this point in the history 
Add Clipboard module for copying to clipboard
Fix hidden Field in AbstractAjxpUser
  • Loading branch information
@cdujeu
cdujeu committed Feb 19, 2016
1 parent f1550b7 commit 2661b57
Show file tree
Hide file tree
Showing 10 changed files with 230 additions and 92 deletions.
1 change: 1 addition & 0 deletions core/src/plugins/action.share/class.ShareCenter.js
View file
Expand Up @@ -983,6 +983,7 @@ Class.create("ShareCenter", {
conn.discrete = true;
}
conn.addParameter("get_action", "load_shared_element_data");
conn.addParameter("merged", "true");
this._prepareShareActionParameters(uniqueNode, conn);
conn.onComplete = function(transport){
jsonCallback(transport.responseJSON);
Expand Down
60 changes: 48 additions & 12 deletions core/src/plugins/action.share/res/react-share-form.css
View file
Expand Up @@ -49,25 +49,39 @@ div#react_share_form .save-as-team-container a {
font-size: 14px;
cursor: pointer;
}
div#react_share_form .form-legend {
color: #bbb;
margin-top: -5px !important;
font-size: 11px;
}
div#react_share_form div.mui-drop-down-menu.full-width {
width: 400px;
margin-left: -10px;
width: 100%;
margin-left: 0;
height: 43px;
}
div#react_share_form div.mui-drop-down-menu.full-width .mui-menu-control .mui-menu-label {
font-size: 16px;
white-space: nowrap;
width: 365px;
width: 95%;
overflow: hidden;
text-overflow: ellipsis;
padding-left: 0;
}
div#react_share_form div.mui-drop-down-menu.full-width .mui-menu-drop-down-icon {
right: 0;
}
div#react_share_form div.mui-drop-down-menu.full-width .mui-menu-control-underline {
margin: 0;
}
div#react_share_form .public-link-container {
padding: 3px 6px 15px;
padding: 7px 13px 11px;
background-color: #F1F1F1;
border-radius: 8px;
margin: 16px 0 6px;
}
div#react_share_form .public-link-container .public-link {
width: 350px;
font-size: 20px;
width: 300px;
font-size: 18px;
}
div#react_share_form .public-link-container .public-link input {
text-align: center;
Expand All @@ -87,16 +101,35 @@ div#react_share_form .public-link-container.edit-link .mui-text-field {
font-size: 20px;
width: 100px;
}
div#react_share_form .custom-link-button.icon-edit-sign {
div#react_share_form .public-link-container .custom-link-button.icon-edit-sign,
div#react_share_form .public-link-container .copy-link-button {
color: #ddd;
font-size: 20px;
font-size: 24px;
cursor: pointer;
display: inline-block;
padding-left: 5px;
display: block;
padding-left: 7px;
float: right;
margin-top: 16px;
}
div#react_share_form .custom-link-button.icon-edit-sign:hover {
div#react_share_form .public-link-container .custom-link-button.icon-edit-sign:hover,
div#react_share_form .public-link-container .copy-link-button:hover {
color: #47b092;
}
div#react_share_form .public-link-container .copy-link-button {
font-size: 13px !important;
margin-top: 18px;
background-color: #ddd;
color: #F1F1F1;
padding: 4px;
border-radius: 4px;
}
div#react_share_form .public-link-container .copy-link-button:hover {
background-color: #47b092;
color: #F1F1F1;
}
div#react_share_form .public-link-container .section-legend {
margin-top: 10px;
}
div#react_share_form .password-container,
div#react_share_form .expires {
margin-top: -10px;
Expand All @@ -110,7 +143,10 @@ div#react_share_form .label-desc-edit .mui-text-field {
margin-top: -10px;
}
div#react_share_form h3 {
font-size: 22px;
font-size: 18px;
margin-bottom: 0;
margin-top: 4px;
color: #999;
}
div#react_share_form h4 {
padding-top: 10px;
Expand Down
72 changes: 55 additions & 17 deletions core/src/plugins/action.share/res/react-share-form.less
View file
Expand Up @@ -65,24 +65,38 @@ div#react_share_form {
cursor: pointer;
}
}
.form-legend {
color: #bbb;
margin-top: -5px !important;
font-size: 11px;
}
div.mui-drop-down-menu.full-width{
width: 400px;
margin-left: -10px;
width: 100%;
margin-left: 0;
height: 43px;
.mui-menu-control .mui-menu-label{
font-size: 16px;
white-space: nowrap;
width: 365px;
width: 95%;
overflow: hidden;
text-overflow: ellipsis;
padding-left: 0;
}
.mui-menu-drop-down-icon{
right: 0;
}
.mui-menu-control-underline{
margin: 0;
}
}
.public-link-container{
padding: 3px 6px 15px;
padding: 7px 13px 11px;
background-color: #F1F1F1;
border-radius: 8px;
margin: 16px 0 6px;
.public-link{
width: 350px;
font-size: 20px;
width: 300px;
font-size: 18px;
input{
text-align: center;
color: @color2;
Expand All @@ -104,16 +118,37 @@ div#react_share_form {
width: 100px;
}
}
}
.custom-link-button.icon-edit-sign{
color: #ddd;
font-size: 20px;
cursor: pointer;
display: inline-block;
padding-left: 5px;
}
.custom-link-button.icon-edit-sign:hover{
color: @color1;
.custom-link-button.icon-edit-sign,
.copy-link-button
{
color: #ddd;
font-size: 24px;
cursor: pointer;
display: block;
padding-left: 7px;
float: right;
margin-top: 16px;
}
.custom-link-button.icon-edit-sign:hover,
.copy-link-button:hover
{
color: @color1;
}
.copy-link-button{
font-size: 13px !important;
margin-top: 18px;
background-color: #ddd;
color: #F1F1F1;
padding: 4px;
border-radius: 4px;
}
.copy-link-button:hover{
background-color: @color1;
color: #F1F1F1;
}
.section-legend{
margin-top: 10px;
}
}
.password-container,
.expires
Expand All @@ -133,7 +168,10 @@ div#react_share_form {

}
h3{
font-size: 22px;
font-size: 18px;
margin-bottom: 0;
margin-top: 4px;
color: #999;
}
h4{
padding-top: 10px;
Expand Down

0 comments on commit 2661b57

Please sign in to comment.