diff --git a/config/com.mongo.plist b/config/com.mongo.mongod.plist
similarity index 100%
rename from config/com.mongo.plist
rename to config/com.mongo.mongod.plist
diff --git a/config/com.nginx.nginx.plist b/config/com.nginx.nginx.plist
new file mode 100644
index 000000000..4a7aa5fbb
--- /dev/null
+++ b/config/com.nginx.nginx.plist
@@ -0,0 +1,14 @@
+
+
+
+
+ Label
+ com.nginx.nginx
+ RunAtLoad
+
+ ProgramArguments
+
+ /usr/local/bin/nginx
+
+
+
\ No newline at end of file
diff --git a/config/com.redis.plist b/config/com.redis.redis-server.plist
similarity index 90%
rename from config/com.redis.plist
rename to config/com.redis.redis-server.plist
index 1ea538308..47ee84ff4 100644
--- a/config/com.redis.plist
+++ b/config/com.redis.redis-server.plist
@@ -3,7 +3,7 @@
Label
- com.redis
+ com.redis.redis-server
RunAtLoad
ProgramArguments
diff --git a/media/css/reader.css b/media/css/reader.css
index 1d2274987..8c8795597 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -3332,7 +3332,7 @@ form.opml_import_form input {
bottom: 0;
right: 0;
overflow-y: auto;
- margin: 56px 0;
+ margin: 32px 0;
}
.NB-splash-info {
@@ -3362,8 +3362,12 @@ form.opml_import_form input {
bottom: inherit;
border-bottom: 1px solid #C9CDE0;
}
+.NB-body-main .NB-splash-info.NB-splash-top {
+ height: 30px;
+}
.NB-splash-info.NB-splash-bottom {
border-top: 1px solid #E9ECF6;
+ height: 30px;
}
.NB-splash-info .NB-splash-title {
position: absolute;
@@ -3377,69 +3381,58 @@ form.opml_import_form input {
.NB-splash-info.NB-splash-top .NB-splash-title {
top: 0px;
bottom: inherit;
- right: 166px;
+ right: 24px;
width: 312px;
height: 55px;
}
+.NB-body-main .NB-splash-info.NB-splash-top .NB-splash-title {
+ display: none;
+}
.NB-splash-info .NB-splash-links {
- position: absolute;
- right: 0px;
- width: 80px;
- text-align: right;
- bottom: 0;
+ float: right;
display: block;
line-height: 16px;
- margin: 0;
- padding: 0;
text-shadow: 1px 1px 0 #F0F0F0;
list-style: none;
white-space: nowrap;
z-index: 1;
-}
-
-.NB-splash-bottom .NB-splash-links-2 {
- right: 82px;
-}
-.NB-splash-info.NB-splash-top .NB-splash-links {
- top: 0;
- width: 164px;
+ margin: 0;
+ padding: 0;
}
.NB-splash-info .NB-splash-links .NB-splash-link {
display: block;
line-height: 12px;
- margin: 1px 0;
- padding: 0;
- width: 100%;
+ margin: 0;
float: left;
}
-.NB-splash-info .NB-splash-links .NB-splash-link.NB-first {
- clear: both;
-}
-
.NB-splash-info .NB-splash-links .NB-splash-link a {
- background-color: #F3F6F9;
margin: 0;
- padding: 2px 4px;
+ padding: 9px 12px 9px 20px;
+ display: block;
+ -webkit-transition: all .12s ease-out;
+ -moz-transition: all .12s ease-out;
+ -o-transition: all .12s ease-out;
+ -ms-transition: all .12s ease-out;
+}
+.NB-splash-info .NB-splash-links .NB-splash-link.NB-splash-link-logo a {
+ padding-top: 0;
+ margin-top: -1px;
}
-.NB-splash-info .NB-splash-links .NB-splash-link a:hover {
- background-color: #E9ECF6;
-}
.NB-splash-info .NB-splash-links .NB-splash-link-github a:hover {
- background: #E9ECF6 url('/media/embed/reader/github_icon.png') no-repeat 0 0;
+ background: transparent url('/media/embed/reader/octocat.png') no-repeat 0 7px;
}
.NB-splash-info .NB-splash-links .NB-splash-link-getsatisfaction a:hover {
- background: #E9ECF6 url('/media/embed/reader/getsatisfaction.png') no-repeat 0 0;
+ background: transparent url('/media/embed/reader/getsatisfaction.png') no-repeat 0 7px;
}
.NB-splash-info .NB-splash-links .NB-splash-link-blog a:hover {
- background: #E9ECF6 url('/media/embed/reader/ofbrooklyn_icon.png') no-repeat 0 0;
+ background: transparent url('/media/embed/reader/ofbrooklyn_icon.png') no-repeat 0 7px;
}
-
.NB-splash-info .NB-splash-links .NB-splash-link-twitter a:hover {
- background: #E9ECF6 url('/media/embed/reader/twitter_icon.png') no-repeat 0 0;
+ background: transparent url('/media/embed/reader/twitter_bird.png') no-repeat 0 7px;
}
.NB-splash-info .NB-splash-links a {
@@ -3463,6 +3456,33 @@ form.opml_import_form input {
color: #A85B40;
}
+.NB-module-logo, .NB-module-login {
+ height: 264px;
+}
+.NB-module-logo {
+ text-align: center;
+ line-height: 32px;
+ font-size: 20px;
+}
+.NB-module-logo .NB-module-logo-image {
+ margin: 12px 0 0;
+}
+.NB-module-logo .NB-module-logo-tagline {
+ margin: 36px 0 42px;
+}
+.NB-module-logo .NB-module-logo-tagline b {
+ padding: 2px 8px;
+ background-color: #F0F0F0;
+ font-weight: normal;
+ border-radius: 4px;
+ color: #191F37;
+ text-shadow: 0 1px 0 #FFF;
+}
+.NB-module-logo .NB-module-logo-elsewhere {
+ font-size: 16px;
+ color: #797979;
+}
+
/* ============== */
/* = Classifier = */
/* ============== */
diff --git a/media/img/reader/octocat.png b/media/img/reader/octocat.png
new file mode 100644
index 000000000..596426ee2
Binary files /dev/null and b/media/img/reader/octocat.png differ
diff --git a/media/img/reader/twitter_bird.png b/media/img/reader/twitter_bird.png
new file mode 100644
index 000000000..057ab004b
Binary files /dev/null and b/media/img/reader/twitter_bird.png differ
diff --git a/media/js/newsblur/common/assetmodel.js b/media/js/newsblur/common/assetmodel.js
index ff4c59215..983123e38 100644
--- a/media/js/newsblur/common/assetmodel.js
+++ b/media/js/newsblur/common/assetmodel.js
@@ -884,7 +884,11 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
NEWSBLUR.Preferences[preference] = value;
var preferences = {};
preferences[preference] = value;
- this.make_request('/profile/set_preference', preferences, callback, null);
+ if (NEWSBLUR.Globals.is_authenticated) {
+ this.make_request('/profile/set_preference', preferences, callback, null);
+ } else {
+ if (callback) callback();
+ }
},
save_preferences: function(preferences, callback) {
diff --git a/templates/base.html b/templates/base.html
index 79503bae2..6670511d1 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -101,24 +101,19 @@
-
-
-