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 @@
.small {{ content }}
script(type="text/template")#projectMemberListTemplate
form.well.form-inline.addUserForm
form.form-inline.addUserForm
table.table
thead
tr
th Email
th Privileges
th(colspan=2) Who can access this project:
th
tbody
{{#showAdminControls}}
input(type="email",placeholder="colleague@example.com")#newEmail.email.input-large
button.btn.btn-primary.addUser Add Collaborator
div.invite-controls
div.small Invite:
input(type="email",placeholder="Enter email addressess...")#newEmail.email.input-large
button.btn.btn-primary.addUser Share
label.checkbox
input(type="checkbox")
| Enable Write Access
......@@ -274,9 +275,7 @@
{{/showRemove}}
script(type="text/template")#socialSharingTemplate
p.public-share
span Share Publicly
br
span
a#shareTwitter(href="#").social-icons
i.fa.fa-twitter-square.fa-2x
|  
......@@ -323,24 +322,29 @@
include project/partials/manage
script(type="text/template")#userPanelTemplate
.modal.hide
.modal.hide.modal-share
.modal-header
h2 Share
.modal-body
#projectMembersList
.row-fluid
.span6
#socialSharing
.span6
.control-group
label(for='select').control-label Access Level
.controls
.public-sharing
table.table
thead
tr
th(colspan=2) Global Access
tbody
tr
td
span.control-group
span.controls
select#publicAccessLevel
option(value='private') Private
option(value='readOnly') Public - Read Only
option(value='readAndWrite') Public - Read and Write
span#socialSharing
.modal-footer
button.btn.btn-primary(data-dismiss="modal") OK
button.btn.btn-primary(data-dismiss="modal") Done
script(type="text/template")#historyPanelTemplate
#revisionHistoryArea.fullEditorArea
......
......@@ -1406,3 +1406,32 @@ table {
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