From 1e4a9c0565c3d2f52ec205ae7627ebfc84278735 Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Wed, 30 Oct 2013 10:16:21 +0800 Subject: * merged commits from 'maxwell lou' by time '20131028_09:52'; * moved 'ValueKind' model from 'recommend/models' to 'indicator/models' * added field 'type' for 'indicator.models.Indicator' * added field 'kind' for 'indicator.models.IndicatorRecord', 'InnateConfine' * updated methods for models 'Indicator', 'IndicatorRecord', 'InnateConfine' * updated views and templates for 'apps/indicator' * added 'INDICATOR_RECOMMEND_PERIOD' into 'settings.py' * added 'type' field for 'indicator.models.Indicator' in 'search_indexes.py' * added a confirm step for 'EditHistoryData' page when delete a record * removed dir 'backupdata'; 'queries.txt' moved to 'backup' dir * moved *.json to 'backup' dir * removed 'apps/managers*.py' * updated 'indicator/popup/IndexDesc.html' * created dir 'apps/indicator/obsolete'; * moved 'indicator/forms.py' to dir 'obsolete'; * splitted views related forms.py from 'views.py', and placed in 'obsolete/views_forms.py' * loadded newest data into database * cleaned pervious data files in 'backup' dir * updated 'README.txt'; added a solution to a redis problem * added field 'type' of 'indicator.models.Indicator'; for filtering search results and only returning 'NORMAL_TYPE' --- 97suifangqa/staticfiles/stylesheets/sass/layouts/fixed-width.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '97suifangqa/staticfiles/stylesheets/sass/layouts') diff --git a/97suifangqa/staticfiles/stylesheets/sass/layouts/fixed-width.css b/97suifangqa/staticfiles/stylesheets/sass/layouts/fixed-width.css index dbe26f9..4c14438 100644 --- a/97suifangqa/staticfiles/stylesheets/sass/layouts/fixed-width.css +++ b/97suifangqa/staticfiles/stylesheets/sass/layouts/fixed-width.css @@ -120,7 +120,7 @@ /* Span 3 columns, starting in 2nd column from left. */ float: left; width: 660px; - margin-left: 300px; + margin-left: 350px; margin-right: -1000px; } /* line 128, ../../../../sass/sass/layouts/fixed-width.scss */ @@ -128,7 +128,7 @@ .two-sidebars .region-sidebar-first { /* Span 1 column, starting in 1st column from left. */ float: left; - width: 260px; + width: 290px; margin-left: 0px; margin-right: -300px; } @@ -138,7 +138,7 @@ /* Span 1 column, starting in 5th column from left. */ float: left; width: 260px; - margin-left: 1000px; + margin-left: 1060px; margin-right: -1300px; } -- cgit v1.2.2