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/normalize.css | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to '97suifangqa/staticfiles/stylesheets/sass/normalize.css') diff --git a/97suifangqa/staticfiles/stylesheets/sass/normalize.css b/97suifangqa/staticfiles/stylesheets/sass/normalize.css index 26c95e2..c651cba 100644 --- a/97suifangqa/staticfiles/stylesheets/sass/normalize.css +++ b/97suifangqa/staticfiles/stylesheets/sass/normalize.css @@ -144,13 +144,13 @@ body { */ /* line 162, ../../../sass/sass/normalize.scss */ a { - color: #006699; + color: #99cc33; text-decoration: none; } /* line 167, ../../../sass/sass/normalize.scss */ a:visited { - color: #006699; + color: #99cc33; } /* line 172, ../../../sass/sass/normalize.scss */ @@ -586,7 +586,9 @@ input[type="reset"] { color: white; padding-left: 0.8em; padding-right: 0.8em; - height: 2.1em; + padding-top:0.4em; + height: 35px; + font-size: 16px; vertical-align: middle; } /* line 588, ../../../sass/sass/normalize.scss */ @@ -651,9 +653,9 @@ input[type="text"], input[type="password"] { padding-left: 0.5em; padding-right: 0.5em; - padding-top: 0; - padding-bottom: 0; - height: 1.95em; + padding-top: 0em; + padding-bottom: 0.3em; + height: 1.65em; } /* -- cgit v1.2.2