Permalink
Browse files

Revamp CSS with sass

- New fabfile function in develop to launch sass watch command
- new css is in bookie.scss file
- Updated/built into bookie.css
- Some small tweaks to colors to be more consistant
- Some small html edits needed to get the styles to apply more cleanly
- Updated api to fix bug in change password not handling error callback
  • Loading branch information...
1 parent a26e7f5 commit 9397f7de00e447fc407cc5b0564da617a716a9e9 @mitechie mitechie committed Aug 21, 2011

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -292,7 +292,11 @@ var bookie = (function ($b, $) {
'success': function (data) {
$b.accounts.passwordui.message(data.message, true);
$b.accounts.passwordui.reset();
- }
+ },
+ 'error': function (data, status_string) {
+ $b.accounts.passwordui.message(data.error, false);
+ $b.accounts.passwordui.reset();
+ }
}
);
}
@@ -53,7 +53,7 @@
<div class="yui3-u-7-8">
<div class="yui3-g">
<div class="yui3-u-7-8">
- <a class="bmark"
+ <a
% if username:
href="${request.route_url('user_redirect',
hash_id=bmark.hash_id,
@@ -71,10 +71,6 @@
title="Readable"
class="button"> R </a>
</span>
- % if user:
- <span class="item"><a href="#" title="Edit" class="button"> E </a></span>
- <!--<span class="item"> <a href="" title="Delete" class="button"> X </a></span>-->
- % endif
</div>
<div class="yui3-u-3-8 url" title="${bmark.hashed.url}">
@@ -13,7 +13,7 @@
<link rel="stylesheet" type="text/css" href="/static/tagfield/superbly-tagfield.css">
- <link rel="stylesheet" type="text/css" href="/static/css/bookie.css">
+ <link rel="stylesheet" type="text/css" href="/static/css/bookie2.css">
% if hasattr(self, 'header'):
${self.header()}
@@ -41,13 +41,15 @@
else:
prefix = ""
%>
- <span class="item"><a href="${prefix}/recent" class="nav_button">Recent</a></span>
- <span class="item"><a href="${prefix}/popular" class="nav_button">Popular</a></span>
- <span class="item"><a href="${prefix}/search" class="nav_button">Search</a></span>
+ <span class="item"><a href="${prefix}/recent" class="button nav_button">Recent</a></span>
+ <span class="item"><a href="${prefix}/popular" class="button nav_button">Popular</a></span>
+ <span class="item"><a href="${prefix}/search" class="button nav_button">Search</a></span>
% if request.user:
- <span class="item"><a href="${request.route_url('user_account', username=request.user.username)}" class="nav_button">Account</a></span>
+ <span class="item"><a
+ href="${request.route_url('user_account',
+ username=request.user.username)}" class="button nav_button">Account</a></span>
% else:
- <span class="item"><a href="/login" class="nav_button">Login</a></span>
+ <span class="item"><a href="/login" class="button nav_button">Login</a></span>
% endif
<!--<span class="item">-->
@@ -22,7 +22,8 @@
</form>
</div>
- <div class="notes">
+ <p>&nbsp;</p>
+ <div class="note">
<p>Search will check for terms in your bookmark tags, descriptions, and
extended descriptions</p>
<p>You can also check the parsed and cached versions of the pages by
@@ -294,7 +294,8 @@ var bookie = (function (opts) {
url: url,
type: 'post',
data: $.extend(data, options),
- success: callbacks.success
+ success: callbacks.success,
+ error: callbacks.error
};
$b.api._request(opts);
@@ -212,16 +212,14 @@ test('live.add', function () {
});
-
-
/**
* Remove bookmark
*
* This is hackish I know, we're going to delete the bookmark we added in the
* test for add, if it fails, well it's probably because add failed.
*
*/
-test('live.add', function () {
+test('live.remove', function () {
expect(1)
stop();
View
@@ -44,3 +44,7 @@ def push_chrome_ext():
"""Upload the chrome extension to the server"""
build_chrome_ext()
rsync_project(chrome_ext_server, chrome_ext_local)
+
+def start_css():
+ """Start up the sass watch process so we can work on css files"""
+ local('sass --watch bookie/static/css/bookie.scss:bookie/static/css/bookie.css &!')

0 comments on commit 9397f7d

Please sign in to comment.