From 2fb758d8c910d91a04c982c9f677bc46d4ae9837 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Sun, 22 Jul 2012 23:27:27 -0700 Subject: [PATCH 1/2] Restyling the demo account dashboard. Thanks to @mgeraci for the inspiration. --- media/css/reader.css | 88 +++++---- media/img/reader/octocat.png | Bin 0 -> 698 bytes media/img/reader/twitter_bird.png | Bin 0 -> 1509 bytes media/js/newsblur/common/assetmodel.js | 6 +- templates/base.html | 15 +- templates/reader/feeds.xhtml | 239 +++++++++++++------------ 6 files changed, 190 insertions(+), 158 deletions(-) create mode 100644 media/img/reader/octocat.png create mode 100644 media/img/reader/twitter_bird.png diff --git a/media/css/reader.css b/media/css/reader.css index cbf5959fd..1b218d2ff 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -3327,7 +3327,7 @@ form.opml_import_form input { bottom: 0; right: 0; overflow-y: auto; - margin: 56px 0; + margin: 32px 0; } .NB-splash-info { @@ -3357,8 +3357,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; @@ -3372,69 +3376,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 { @@ -3458,6 +3451,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 0000000000000000000000000000000000000000..596426ee2f68aaf442e4b9a4e3183dc8e68dbbbd GIT binary patch literal 698 zcmV;r0!96aP)L zU<8FAcF|4Uc%u|Vx6wrqbQ48)VI_eScpWT|qN2NsZv3baGSSp(n@*S?+nRg2@D=9v z8vWtnaGvu#f1dyUoCD?P1l|EvCTFLC5n%UbLPQV|tR}_#frvpi1NZ;|;y^p#0h~a( zxXFwt2PhzHL@5MtnB=!W1ICQve?_cRnkpe`0KU7b?A++PfV09zGO>t7DQetK;^|dx zJs4s+lUp(*{t*#VX*qyrH!pMMcoZ_L;K)NkV9f?f$FDmYXJ4ToQ@Yt zS={N=(h4GThKEizUiN$`5nxKR2|Mu0mLTzLXK0OaHvHpLlt@@AfWrfdw|?}mTBO5X_Ki(eXF9c%+k9s!+C@dpecX0-^j}T%x{ ziioWWjRg{0+q5?FKw6$ECbfwv%~C-uL8X=08cY)ugvM&sqT&xSy$h`N!T8Y0%-nm= zobNl|IrrRYEXaRz;rv(TV;HtDH-|1nV^ZWvh(qs`357w!GTBuk7YSu@6(d2+&IzRu z&-F9qun;m_^|n5kg<&cmUtA)Wc=9M#@N1cfk2d5N5gNm?vO^-nRzMjqh2?y}s=4_? zScCJNRkP9HAw8lK`uLn02^Q7l7qc}LtcBBLuf?-M6e93LnZZN;t$`pFvT9~{DKw9m z2@O8uB3D>7v!Y5o1-Mg?Aa2m=GguM;+-TH-OoPz~(s3OLbOecRV+P2i3`R<4!sjjx ziY9SoR3Yu2i-lHJjZcXz+$mPICQ!UBM?lDGSD!{ zO1voZLI962GNnSLY}Fv8vnlvRkLL+-AUIbjR5BvOhy>7*gx?>@YsNb$7s979p6MMd zt`;Ft2!leU#G?HuOO1k2?VcYf;)v8x>m?p-3bU0K*h)VP$hovtgT81vo}=6*lN$h2 zCTY@dPkQu+!Ygd+Id8M z@6zpEU0-7> zCNzMljmF{fmV(vZcR=xUfA7mZZNyK?67FFgbXMcFD||oiY#Fr0HN2J6x7+WIJCmM> zt2V@*_`dEO5V$2@id`PMpS(NtP54!>I%NwWJ8NR)znkOJul$o2}{;?h=1vBHI`oJ?AxP1yXC;+srnr`yt@5ZOwPD!W_^V@RU@%6tLx)XO-t3TmGt;uakqXR^1oBArN#$w{Idt7(_nwNIiB0t_-S3do% H!@K8S?9(ld literal 0 HcmV?d00001 diff --git a/media/js/newsblur/common/assetmodel.js b/media/js/newsblur/common/assetmodel.js index 8c5b0aa5c..2bcae572f 100644 --- a/media/js/newsblur/common/assetmodel.js +++ b/media/js/newsblur/common/assetmodel.js @@ -879,7 +879,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 11d03cd01..9c6e74ad8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -99,24 +99,19 @@
-
- -
diff --git a/templates/reader/feeds.xhtml b/templates/reader/feeds.xhtml index 9acab409f..79a07f640 100644 --- a/templates/reader/feeds.xhtml +++ b/templates/reader/feeds.xhtml @@ -1,6 +1,6 @@ {% extends 'base.html' %} -{% load typogrify_tags recommendations_tags utils_tags statistics_tags %} +{% load recommendations_tags utils_tags statistics_tags %} {% block extra_head_js %}