From 1e4a9c0565c3d2f52ec205ae7627ebfc84278735 Mon Sep 17 00:00:00 2001
From: Alvin Li <liweitianux@gmail.com>
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/blog.css  | 125 +++++++++++++++------
 .../staticfiles/stylesheets/sass/elements.css      |  29 +++--
 .../stylesheets/sass/layouts/fixed-width.css       |   6 +-
 .../staticfiles/stylesheets/sass/normalize.css     |  14 ++-
 97suifangqa/staticfiles/stylesheets/sass/pages.css |  20 +++-
 5 files changed, 138 insertions(+), 56 deletions(-)

(limited to '97suifangqa/staticfiles/stylesheets/sass')

diff --git a/97suifangqa/staticfiles/stylesheets/sass/blog.css b/97suifangqa/staticfiles/stylesheets/sass/blog.css
index 424fb4c..9c3ed72 100644
--- a/97suifangqa/staticfiles/stylesheets/sass/blog.css
+++ b/97suifangqa/staticfiles/stylesheets/sass/blog.css
@@ -15,16 +15,29 @@ body.scrolled-down.blog #blog-top-nav .background {
 
 /* line 22, ../../../sass/sass/blog.scss */
 .blog .post-question input[type="text"] {
-  background-color: #8b8885;
+  background-color: white;
   color: white;
   border: 1px solid white;
   -webkit-box-shadow: 0px 0px 2px white;
   -moz-box-shadow: 0px 0px 2px white;
   box-shadow: 0px 0px 2px white;
+  height: 29px;
+  border-radius: 3px;
+  
+}
+
+.blog .post-question input[type="text"]:focus {
+  background-color: #white;
+  color: #727171;
+  border-color: #99cc33;
+  height: 29px;
+  border-radius: 3px;
+  outline:0;
 }
+
 /* line 65, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"].placeholder {
-  color: #eeeeee;
+  color: #a8a8a8;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"]:focus.placeholder {
@@ -32,7 +45,7 @@ body.scrolled-down.blog #blog-top-nav .background {
 }
 /* line 65, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"].input-placeholder {
-  color: #eeeeee;
+  color: #a8a8a8;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"]:focus.input-placeholder {
@@ -40,7 +53,7 @@ body.scrolled-down.blog #blog-top-nav .background {
 }
 /* line 65, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"]:-moz-placeholder {
-  color: #eeeeee;
+  color: #a8a8a8;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"]:focus:-moz-placeholder {
@@ -48,7 +61,7 @@ body.scrolled-down.blog #blog-top-nav .background {
 }
 /* line 65, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"]::-webkit-input-placeholder {
-  color: #eeeeee;
+  color: #a8a8a8;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"]:focus::-webkit-input-placeholder {
@@ -56,7 +69,7 @@ body.scrolled-down.blog #blog-top-nav .background {
 }
 /* line 65, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"]::-moz-placeholder {
-  color: #eeeeee;
+  color: #a8a8a8;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"]:focus::-moz-placeholder {
@@ -64,7 +77,7 @@ body.scrolled-down.blog #blog-top-nav .background {
 }
 /* line 65, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"]:-ms-input-placeholder {
-  color: #eeeeee;
+  color: #a8a8a8;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 .blog .post-question input[type="text"]:focus:-ms-input-placeholder {
@@ -76,6 +89,7 @@ body.scrolled-down.blog #blog-top-nav .background {
   bottom: 30px;
   text-align: center;
   width: auto;
+ 
 }
 /* line 40, ../../../sass/sass/blog.scss */
 .blog #nav-ribbon {
@@ -179,7 +193,7 @@ body.scrolled-down.blog #blog-top-nav .background {
 /* line 134, ../../../sass/sass/blog.scss */
 .blog #nav-ribbon .tail {
   width: 50px;
-  cursor: pointer;
+  cursor:default;
 }
 /* line 139, ../../../sass/sass/blog.scss */
 .blog #nav-ribbon .tail-cut {
@@ -227,8 +241,12 @@ body.scrolled-down.blog #blog-top-nav .background {
 }
 /* line 186, ../../../sass/sass/blog.scss */
 .blog-details #blog-top-nav .breadcrumb ul.inline li a.button {
-  padding-top: 0.2em;
-  padding-bottom: 0.2em;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  padding-left:0.8em;
+  padding-right: 0.8em;
+  border-radius: 3px 3px 3px 3px;
+  height: 40px;
 }
 /* line 191, ../../../sass/sass/blog.scss */
 .blog-details #blog-top-nav .breadcrumb ul.inline li a.button.first {
@@ -273,8 +291,8 @@ body.scrolled-down.blog #blog-top-nav .background {
 }
 /* line 231, ../../../sass/sass/blog.scss */
 .blog-details #blog-top-nav .section-nav ul.links li a.active {
-  color: #006699;
-  border-bottom: 1px solid #006699;
+  color: #99cc33;
+  /*border-bottom: 1px dashed #99cc33;*/
   text-decoration: none;
 }
 /* line 237, ../../../sass/sass/blog.scss */
@@ -284,8 +302,8 @@ body.scrolled-down.blog #blog-top-nav .background {
 }
 /* line 244, ../../../sass/sass/blog.scss */
 .blog-details #blog-top-nav .section-nav ul.links li a:hover, .blog-details #blog-top-nav .section-nav ul.links:hover li a:hover {
-  color: #006699;
-  border-bottom: 1px solid #006699;
+  color: #99cc33;
+  /*border-bottom: 1px dashed #99cc33;*/
   text-decoration: none;
 }
 /* line 250, ../../../sass/sass/blog.scss */
@@ -315,6 +333,7 @@ body.scrolled-down.blog #blog-top-nav .background {
 .blog-details #content .text h3 {
   font-size: 1.1em;
   color: #4c4a49;
+  line-height: 1.5em;
 }
 /* line 274, ../../../sass/sass/blog.scss */
 .blog-details #content .text h4 {
@@ -363,7 +382,7 @@ body.scrolled-down.blog #blog-top-nav .background {
 /* line 306, ../../../sass/sass/blog.scss */
 .blog-details #content .jargon-explanation-box .content-wrap .jargon-details {
   min-height: 150px;
-  max-height: 200px;
+  max-height: 250px;
   overflow: auto;
 }
 /* line 311, ../../../sass/sass/blog.scss */
@@ -464,7 +483,14 @@ body.scrolled-down.blog #blog-top-nav .background {
   font-size: 0.875em;
   line-height: 1.30612em;
   cursor: pointer;
-  border: 1px solid #c9caca;
+  border: 1px solid #e3e1d5;
+  background-color:white;
+  
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -o-border-radius: 2px;
+  border-radius: 2px;
 }
 /* line 397, ../../../sass/sass/blog.scss */
 .blog-details #content .cards .card .back .card-wrap {
@@ -490,7 +516,7 @@ body.scrolled-down.blog #blog-top-nav .background {
 /* line 415, ../../../sass/sass/blog.scss */
 .blog-details #content .cards .card .front .card-wrap .card-title {
   font-weight: normal;
-  background-color: #4c4948;
+  background-color: #484848;
   color: white;
   margin: 0;
   position: absolute;
@@ -523,6 +549,8 @@ body.scrolled-down.blog #blog-top-nav .background {
 /* line 450, ../../../sass/sass/blog.scss */
 .blog-details #content .cards .card .front .card-wrap .card-details {
   padding: 0.5em;
+  color:rgba(126,136,138,0.92);
+  font-family: "Open Sans", sans-serif;
 }
 /* line 455, ../../../sass/sass/blog.scss */
 .blog-details #content .cards .card .front {
@@ -574,19 +602,19 @@ body.scrolled-down.blog #blog-top-nav .background {
 /* line 500, ../../../sass/sass/blog.scss */
 .blog-details #content .cards .card.blue .back .card-wrap {
   background-image: url(../../images/card-bg-blue.png);
-  background-color: #0063a8;
+  background-color: #3879D9;
 }
 /* line 504, ../../../sass/sass/blog.scss */
 .blog-details #content .cards .card.blue .front .card-wrap {
-  color: #006699;
+  color: #3879D9;
 }
 /* line 506, ../../../sass/sass/blog.scss */
 .blog-details #content .cards .card.blue .front .card-wrap .card-title {
-  background-color: #0063a8;
+  background-color: #3879D9;
 }
 /* line 509, ../../../sass/sass/blog.scss */
 .blog-details #content .cards .card.blue .front .card-wrap .card-subtitle {
-  background-color: #00508f;
+  background-color: #326cc4;
 }
 /* line 517, ../../../sass/sass/blog.scss */
 .blog-details #sidebar-first,
@@ -613,9 +641,11 @@ body.scrolled-down.blog #blog-top-nav .background {
 }
 /* line 535, ../../../sass/sass/blog.scss */
 .blog-details #sidebar-second .social ul.buttons .multi-segment-button .segment.first {
-  width: 60px;
+  width: 63px;
   white-space: nowrap;
   overflow: hidden;
+  font-weight: normal;
+  font-size: 15px;
 }
 /* line 540, ../../../sass/sass/blog.scss */
 .blog-details #sidebar-second .social ul.buttons .multi-segment-button {
@@ -626,6 +656,7 @@ body.scrolled-down.blog #blog-top-nav .background {
   background-image: url(../../images/grey-star.png);
   background-repeat: no-repeat;
   background-position: 10px center;
+  margin-bottom: 0.2em;
 }
 /* line 550, ../../../sass/sass/blog.scss */
 .blog-details #sidebar-second .social ul.buttons #no-idea-button {
@@ -636,6 +667,7 @@ body.scrolled-down.blog #blog-top-nav .background {
   background-image: url(../../images/white-unhappy-face.png);
   background-repeat: no-repeat;
   background-position: 10px center;
+  margin-bottom: 0.2em;
 }
 /* line 561, ../../../sass/sass/blog.scss */
 .blog-details #sidebar-second .comments {
@@ -643,14 +675,15 @@ body.scrolled-down.blog #blog-top-nav .background {
 }
 /* line 563, ../../../sass/sass/blog.scss */
 .blog-details #sidebar-second .comments ol {
-  font-size: 0.92857em;
-  line-height: 1.38462em;
+  font-size: 1em;
+  line-height: 1.58462em;
   max-height: 400px;
   overflow: hidden;
   overflow: auto;
   counter-reset: comments-counter;
   margin: 0;
-  padding: 0;
+  padding:0;
+  width: 265px;
 }
 /* line 571, ../../../sass/sass/blog.scss */
 .blog-details #sidebar-second .comments ol li:before {
@@ -669,6 +702,7 @@ body.scrolled-down.blog #blog-top-nav .background {
   padding-left: 0.05em;
   content: counter(comments-counter);
   counter-increment: comments-counter;
+  padding-top: 0.1em;
 }
 /* line 581, ../../../sass/sass/blog.scss */
 .blog-details #sidebar-second .comments ol li {
@@ -717,9 +751,10 @@ body.scrolled-down.blog #blog-top-nav .background {
   display: block;
   color: inherit;
   text-decoration: none;
-  padding-left: 1.5em;
+  padding-left: 2em;
   padding-top: 0.3em;
   padding-bottom: 0.3em;
+  font-size: 15px;
 }
 /* line 619, ../../../sass/sass/blog.scss */
 .blog-details #sidebar-second .jargon-list ul li a:hover,
@@ -771,7 +806,7 @@ body.scrolled-down.blog #blog-top-nav .background {
   -moz-border-radius: 2px;
   -ms-border-radius: 2px;
   -o-border-radius: 2px;
-  border-radius: 2px;
+  border-radius: 3px;
 }
 /* line 658, ../../../sass/sass/blog.scss */
 .blog-details #sidebar-first .related-questions h3 {
@@ -857,7 +892,7 @@ body.scrolled-down.blog #blog-top-nav .background {
 /* line 732, ../../../sass/sass/blog.scss */
 .blog-details #back-to-top-button {
   bottom: 50px;
-  left: 960px;
+  left: 1020px;
 }
 /* line 736, ../../../sass/sass/blog.scss */
 .blog-details .confirm-dialog {
@@ -897,7 +932,7 @@ body.scrolled-down.blog #blog-top-nav .background {
 /* line 771, ../../../sass/sass/blog.scss */
 .blog-list #content #blog-list-top-nav .search-type-nav {
   vertical-align: bottom;
-  border-bottom: 1px solid #c9caca;
+  /*border-bottom: 1px solid #c9caca;*/
 }
 /* line 776, ../../../sass/sass/blog.scss */
 .blog-list #content #blog-list-top-nav .search-type-nav ul.links li a {
@@ -1058,6 +1093,7 @@ body.scrolled-down.blog #blog-top-nav .background {
   border: 1px solid #c2b59e;
   background-color: #918e8c;
   background-color: rgba(0, 0, 0, 0.5);
+
 }
 /* line 923, ../../../sass/sass/blog.scss */
 .blog-list #sidebar-first .post-question .submit {
@@ -1082,7 +1118,7 @@ body.blog-index #main {
 /* line 940, ../../../sass/sass/blog.scss */
 body.blog-index #main .background {
   z-index: -1000;
-  background: url(../../images/back_main.jpg) no-repeat center top;
+  background: url(../../images/back_main.jpg) no-repeat 80%;
   position: fixed;
   top: 0;
   left: 0;
@@ -1168,12 +1204,12 @@ body.blog-index #main .post-question .submit {
 /* line 969, ../../../sass/sass/blog.scss */
 body.blog-index #main .post-question .question, body.blog-index #main .post-question .submit {
   font-size: 1.14286em;
-  line-height: 1.25em;
-  vertical-align: 2px;
+  
 }
 /* line 974, ../../../sass/sass/blog.scss */
 body.blog-index #main #logo {
   margin-top: 65px;
+  /*margin-left:120px;*/
   width: 100%;
   text-align: center;
 }
@@ -1183,3 +1219,28 @@ body.blog-index #main #copyright {
   bottom: 75px;
   left: 75px;
 }
+
+.blog-list #content #blog-list-content ul.articles .excerpt ol li{
+	list-style: decimal;
+}
+
+#wenzhongzhushi{
+	-webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius:3px;
+  border-radius: 3px;
+  text-align: center;
+  font-family: "Courier New", "DejaVu Sans Mono", monospace, sans-serif, "STHeiti", "WenQuanYi Micro Hei", "Microsoft YaHei", SimSun, sans-serif;
+  background-color: #898989;
+  color: white;
+  padding:0.10em 0.3em 0 0.35em;
+}
+
+/*#pbzb{
+	line-height: 1.1em;
+}*/
+
+div .panbiezhibiao p{
+	line-height: 1.1em;
+}
\ No newline at end of file
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 {
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;
 }
 
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;
 }
 
 /*
diff --git a/97suifangqa/staticfiles/stylesheets/sass/pages.css b/97suifangqa/staticfiles/stylesheets/sass/pages.css
index 0ceb23c..cf5674b 100644
--- a/97suifangqa/staticfiles/stylesheets/sass/pages.css
+++ b/97suifangqa/staticfiles/stylesheets/sass/pages.css
@@ -36,16 +36,25 @@ body {
 
 /* line 48, ../../../sass/sass/pages.scss */
 .text .highlight {
-  background-color: #efeff0;
-  border: 1px solid #c9caca;
-  padding: 2px;
-  font-weight: bold;
+  background-color: #f3f2f0;
+  /*border: 1px solid #c9caca;*/
+  padding:10px 10px 10px 10px;
+  margin:25px 0 25px 0;
+    
 }
 /* line 53, ../../../sass/sass/pages.scss */
 .text .highlight p {
   margin: 0;
 }
 
+.highlight {
+  background-color: #f3f2f0;
+  /*border: 1px solid #c9caca;*/
+  padding: 10px 10px 10px 10px;
+  margin:25px 0 25px 0;
+   
+}
+
 /*
  * Header
  */
@@ -200,7 +209,6 @@ body.scrolled-down #back-to-top-button {
   /* Wrapping link for logo */
   float: left;
   /* LTR */
-  margin: 0;
   padding: 0;
 }
 /* line 202, ../../../sass/sass/pages.scss */
@@ -431,7 +439,7 @@ span.field-label {
   bottom: 0;
   background: url(../../images/back_main.jpg) no-repeat center top;
   background-size: auto 100%;
-  min-height: 600px;
+  
 }
 /* line 397, ../../../sass/sass/pages.scss */
 .left-picture #sidebar-first #header {
-- 
cgit v1.2.2