summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryderr <r@okfoc.us>2014-10-02 13:42:22 -0400
committerryderr <r@okfoc.us>2014-10-02 13:42:22 -0400
commitfe5ac8ac5921bcc47edd3cd7748414f5ecba0a9f (patch)
treef0da9e309e993776705b5581035f9d20087e6029
parentd584725202624b2629a85dd209cebc701706ff4b (diff)
collaborators touchup
-rw-r--r--package.json3
-rwxr-xr-xpublic/assets/stylesheets/app.css17
-rw-r--r--views/controls/editor/collaborators.ejs10
3 files changed, 21 insertions, 9 deletions
diff --git a/package.json b/package.json
index b4ac400..adefb82 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,8 @@
"multer": "~0.1.0",
"body-parser": "1.3.0",
"marked": "~0.3.2",
- "emailjs": "~0.3.6"
+ "emailjs": "~0.3.6",
+ "intro.js": "^0.9.0"
},
"devDependencies": {
"grunt": "~0.4.1",
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 63d5a9f..3edad4f 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2087,14 +2087,22 @@ a[data-role="forgot-password"] {
/* COLLABORATORS */
-.collaborators > div {
- width: 600px;
+.collaborators .rap {
+ display: table;
+ width: 100%;
+ height: 100%;
+}
+
+.collaborators .rap .holder .inner {
+ width: 480px;
margin: 0 auto;
text-align: left;
background: white;
padding: 10px;
margin: 20px auto;
+position: relative;
}
+
.collaborators button {
width: auto;
position: relative;
@@ -2121,14 +2129,15 @@ a[data-role="forgot-password"] {
border-color: black;
}
.collaborators p {
- margin: 20px 0;
+ margin: 10px 0 20px;
+ font-weight: 300;
}
.collaborators form input[type=text] {
font-size: 16px;
width: 300px;
}
.collaborators h2 {
- margin: 20px auto 10px;
+ margin: 20px auto 0;
}
#collaborator-list {
margin-top: 20px;
diff --git a/views/controls/editor/collaborators.ejs b/views/controls/editor/collaborators.ejs
index 69e5b64..b658bf6 100644
--- a/views/controls/editor/collaborators.ejs
+++ b/views/controls/editor/collaborators.ejs
@@ -1,7 +1,9 @@
<div class="collaborators fixed mediaDrawer animate">
<span class="close">X</span>
-
- <div>
+
+ <div class="rap">
+ <div class="holder">
+ <div class="inner vvbox">
<h2>Collaborators</h2>
<p>
@@ -21,9 +23,9 @@
<ul id="collaborator-list">
</ul>
-
</div>
-
+ </div>
+</div>
</div>
<script type="text/html" id="collaborator-template">