Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
texjs-web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Mehren
texjs-web
Commits
c3c42b34
Commit
c3c42b34
authored
11 years ago
by
Adam Conrad
Browse files
Options
Downloads
Plain Diff
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
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/views/templates.jade
+29
-25
29 additions, 25 deletions
app/views/templates.jade
public/stylesheets/less/app/editor.less
+29
-0
29 additions, 0 deletions
public/stylesheets/less/app/editor.less
with
58 additions
and
25 deletions
app/views/templates.jade
+
29
−
25
View file @
c3c42b34
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
public/stylesheets/less/app/editor.less
+
29
−
0
View file @
c3c42b34
...
...
@@ -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;
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment