Skip to content
Snippets Groups Projects
Commit c3c42b34 authored by Adam Conrad's avatar Adam Conrad
Browse files

Merge branch 'adam-redesign' of https://github.com/sharelatex/web-sharelatex into adam-redesign

parents 8e9aa39b 909bcbd3
No related branches found
No related tags found
No related merge requests found
...@@ -248,17 +248,18 @@ ...@@ -248,17 +248,18 @@
.small {{ content }} .small {{ content }}
script(type="text/template")#projectMemberListTemplate script(type="text/template")#projectMemberListTemplate
form.well.form-inline.addUserForm form.form-inline.addUserForm
table.table table.table
thead thead
tr tr
th Email th(colspan=2) Who can access this project:
th Privileges
th th
tbody tbody
{{#showAdminControls}} {{#showAdminControls}}
input(type="email",placeholder="colleague@example.com")#newEmail.email.input-large div.invite-controls
button.btn.btn-primary.addUser Add Collaborator div.small Invite:
input(type="email",placeholder="Enter email addressess...")#newEmail.email.input-large
button.btn.btn-primary.addUser Share
label.checkbox label.checkbox
input(type="checkbox") input(type="checkbox")
| Enable Write Access | Enable Write Access
...@@ -274,9 +275,7 @@ ...@@ -274,9 +275,7 @@
{{/showRemove}} {{/showRemove}}
script(type="text/template")#socialSharingTemplate script(type="text/template")#socialSharingTemplate
p.public-share span
span Share Publicly
br
a#shareTwitter(href="#").social-icons a#shareTwitter(href="#").social-icons
i.fa.fa-twitter-square.fa-2x i.fa.fa-twitter-square.fa-2x
|   |  
...@@ -323,24 +322,29 @@ ...@@ -323,24 +322,29 @@
include project/partials/manage include project/partials/manage
script(type="text/template")#userPanelTemplate script(type="text/template")#userPanelTemplate
.modal.hide .modal.hide.modal-share
.modal-header .modal-header
h2 Share h2 Share
.modal-body .modal-body
#projectMembersList #projectMembersList
.row-fluid .row-fluid
.span6 .public-sharing
#socialSharing table.table
.span6 thead
.control-group tr
label(for='select').control-label Access Level th(colspan=2) Global Access
.controls tbody
tr
td
span.control-group
span.controls
select#publicAccessLevel select#publicAccessLevel
option(value='private') Private option(value='private') Private
option(value='readOnly') Public - Read Only option(value='readOnly') Public - Read Only
option(value='readAndWrite') Public - Read and Write option(value='readAndWrite') Public - Read and Write
span#socialSharing
.modal-footer .modal-footer
button.btn.btn-primary(data-dismiss="modal") OK button.btn.btn-primary(data-dismiss="modal") Done
script(type="text/template")#historyPanelTemplate script(type="text/template")#historyPanelTemplate
#revisionHistoryArea.fullEditorArea #revisionHistoryArea.fullEditorArea
......
...@@ -1406,3 +1406,32 @@ table { ...@@ -1406,3 +1406,32 @@ table {
margin-bottom: 6px; margin-bottom: 6px;
} }
} }
.modal-share {
width: 700px;
margin-left: -350px;
.modal-body {
padding: 0 0.6em;
}
.invite-controls {
padding: 0.8em;
background-color: #eee;
.small {
font-size: 0.9em;
color: #666;
}
input.email {
width: 450px;
}
label.checkbox {
display: block;
}
}
.public-sharing {
margin: 0.4em;
padding-top: 0.4em;
#socialSharing {
float: right;
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment