From 47b21961a04031685d7646801f9f8143344d125b Mon Sep 17 00:00:00 2001 From: magnolia-fan Date: Wed, 22 Jun 2011 08:52:56 +0400 Subject: [PATCH] Wow, settings now looks pretty nice --- public/javascripts/beathaven/pages.js | 2 +- public/javascripts/beathaven/settings.js | 2 +- public/stylesheets/settings.css | 28 ++++++++++-------------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/public/javascripts/beathaven/pages.js b/public/javascripts/beathaven/pages.js index 733c4ac..3062056 100644 --- a/public/javascripts/beathaven/pages.js +++ b/public/javascripts/beathaven/pages.js @@ -87,7 +87,7 @@ var Pages = { }, renderSettings: function(data) { - $('#data-container').css('background', 'url(/images/concrete_wall_2.png) 0 -30px repeat'); + $('#data-container').css('background', 'none'); $('#data-container .inner').html(data); yaCounter7596904.hit(Ajax.getAnchor(), 'Settings', Ajax.referer); Ajax.setTitle('Settings'); diff --git a/public/javascripts/beathaven/settings.js b/public/javascripts/beathaven/settings.js index d9d9ffb..58206b1 100644 --- a/public/javascripts/beathaven/settings.js +++ b/public/javascripts/beathaven/settings.js @@ -37,6 +37,6 @@ $('.settings-container .form input').live('blur', function(){ 'email': $('.settings-container .form input[name$="email"]').first().val(), }; Settings.saveAccountInfo(params, function(){ - console.log('saved'); + $('#header-container .hello .greating').text('Hi there, '+ (params.username.length > 0 ? params.username : '%username%') +'!'); }); }) \ No newline at end of file diff --git a/public/stylesheets/settings.css b/public/stylesheets/settings.css index 26a111b..13b75d3 100644 --- a/public/stylesheets/settings.css +++ b/public/stylesheets/settings.css @@ -13,9 +13,9 @@ } .settings-container .tabs .tab { position: relative; - border-left: #DDD 2px solid; - border-top: #DDD 2px solid; - border-right: #DDD 2px solid; + border-left: #DDD 1px solid; + border-top: #DDD 1px solid; + border-right: #DDD 1px solid; padding: 0 8px; line-height: 24px; margin-top: 2px; @@ -28,11 +28,11 @@ .settings-container .tabs .tab.active { position: relative; z-index: 200; - background-color: #EAEAEA; - border-left: #CCC 2px solid; - border-top: #CCC 2px solid; - border-right: #CCC 2px solid; - border-bottom: #EAEAEA 6px solid; + background-color: #FFF; + border-left: #CCC 1px solid; + border-top: #CCC 1px solid; + border-right: #CCC 1px solid; + border-bottom: #FFF 6px solid; margin-top: -2px; line-height: 29px; font-weight: bold; @@ -45,14 +45,8 @@ position: relative; z-index: 100; height: 500px; - background-color: #EAEAEA; - border-left: #CCC 2px solid; - border-top: #CCC 2px solid; - border-right: #CCC 2px solid; - border-bottom: #CCC 2px solid; - border-radius: 5px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; + border-top: #CCC 1px solid; + } .settings-container .form-container .form { margin: 25px; @@ -71,7 +65,7 @@ -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - background-color: #CCC; + background-color: #EAEAEA; margin-right: -10px; } .settings-container .form-container .form .field input[type="text"]{