* merged commits from 'maxwell lou' by time '20131028_09:52';HEADmaster

* 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'

1 files changed, 20 insertions, 9 deletions

diff --git a/97suifangqa/staticfiles/stylesheets/sass/elements.css b/97suifangqa/staticfiles/stylesheets/sass/elements.css
index 5ed4bde..56d2c87 100644
--- a/97suifangqa/staticfiles/stylesheets/sass/elements.css
+++ b/97suifangqa/staticfiles/stylesheets/sass/elements.css
@@ -19,14 +19,21 @@
 }

 /* line 26, ../../../sass/sass/elements.scss */

 .multi-segment-button .segment.first {

-  padding-left: 0.5em;

+	padding-left: 0.8em;

+  padding-top: 0.1em;

 }

 /* line 30, ../../../sass/sass/elements.scss */

 .multi-segment-button .segment.last {

-  padding-right: 0.5em;

+  padding-right: 0.6em;

   border-right: none;

+  font-weight: normal;

+  font-size: 16px;

+  padding-top: 0.2em;

 }

 

+.multi-segment-button .segment.last:active {

+	outline: 0;

+}

 /* line 38, ../../../sass/sass/elements.scss */

 .multi-button .button, .multi-button .multi-segment-button {

   margin: 0;

@@ -63,7 +70,7 @@
 /* line 60, ../../../sass/sass/elements.scss */

 .border-box, .expand-heading {

   background-color: #f7f7f7;

-  border: solid 1px #c9caca;

+  /*border: solid 1px #c9caca;*/

   -webkit-border-radius: 3px;

   -moz-border-radius: 3px;

   -ms-border-radius: 3px;

@@ -73,13 +80,14 @@
   padding-right: 1em;

   padding-top: 0.4em;

   padding-bottom: 0.4em;

+  font-size: 15px;

 }

 

 /* line 72, ../../../sass/sass/elements.scss */

 .expand-heading {

   cursor: pointer;

   color: #99cc33;

-  padding-left: 30px;

+  padding: 10px 0 10px 30px;

   background-image: url(../../images/green-triangle-right.png);

   background-repeat: no-repeat;

   background-position: 10px center;

@@ -247,9 +255,12 @@ body.modal-active {
 

 /* line 191, ../../../sass/sass/elements.scss */

 .grey-button {

-  border-color: #cccccc;

+  /*border-color: #cccccc;*/

   color: #6f6f6f;

   background-color: #f7f7f7;

+  font-weight: bold;

+  padding-top:0.1em;

+  

 }

 /* line 194, ../../../sass/sass/elements.scss */

 .grey-button:visited {

@@ -272,19 +283,19 @@ body.modal-active {
 .dark-grey-button {

   border: none;

   color: white;

-  background-color: #4c4948;

+  background-color: #f2f2f0;

 }

 /* line 217, ../../../sass/sass/elements.scss */

 .dark-grey-button:visited {

-  color: white;

+  color: #898989;

 }

 /* line 221, ../../../sass/sass/elements.scss */

 .dark-grey-button:hover {

-  background-color: #3f3c3c;

+  background-color: #e9eaea;

 }

 /* line 224, ../../../sass/sass/elements.scss */

 .dark-grey-button:active {

-  background-color: #32302f;

+  background-color: #f2f2f0;

 }

 /* line 229, ../../../sass/sass/elements.scss */

 .dark-grey-button.disabled:hover, .dark-grey-button.disabled:active {