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

28 files changed, 1643 insertions, 149 deletions

diff --git a/97suifangqa/apps/indicator/static/css/delete_card_tip.css b/97suifangqa/apps/indicator/static/css/delete_card_tip.css
index 89eee88..9fef26f 100644
--- a/97suifangqa/apps/indicator/static/css/delete_card_tip.css
+++ b/97suifangqa/apps/indicator/static/css/delete_card_tip.css
@@ -4,6 +4,7 @@
 	background-color: #FFFFFF;
 	border: 1px solid #94C721;
 	padding: 0 20px 0 20px;
+	border-radius: 3px;
 }
 .delete_card_tip_title_line {
 	height: 42px;
@@ -26,26 +27,49 @@
 	cursor: pointer;
 }
 .delete_card_tip_content {
-	height: 55px;
+	height: 60px;
 	line-height: 55px;
 	color: #4A4A4A;
 	font-size: 14px;
+	text-align: center
 }
 .delete_card_tip_action {
 	height: 67px;
+	margin-left: -20px;
 }
-.delete_card_tip_action .action_confirm_cancel, .delete_card_tip_action .action_confirm_ignore {
+.delete_card_tip_action .action_confirm_ignore {
 	background-color: #99CC33;
-    border-radius: 2px;
-    width: 75px;
+    border-radius: 3px;
+    width: 100px;
     color: white;
     cursor: pointer;
-    height: 22px;
-    line-height: 22px;
+    height: 26px;
     display: inline-block;
     text-align: center;
-    margin-top: 13px;
     text-decoration: none;
+    font-size: 15px;
+    padding:2px;
+    padding-top:7px;
+    margin-right: 20px;
+
+}
+
+.delete_card_tip_action .action_confirm_cancel{
+	background-color: #a8a8a8;
+    border-radius: 3px;
+    width: 100px;
+    color: white;
+    cursor: pointer;
+    height: 26px;
+    display: inline-block;
+    text-align: center;
+    text-decoration: none;
+	padding:2px;
+	font-size: 15px;
+	padding-top:7px;
+	margin-right: 40px;
+
+
 }
 .delete_card_tip_action .action_confirm_cancel {
 	margin: 0 11px 0 213px;
diff --git a/97suifangqa/apps/indicator/static/css/edit_history_data.css b/97suifangqa/apps/indicator/static/css/edit_history_data.css
index e1caa9f..d3124de 100644
--- a/97suifangqa/apps/indicator/static/css/edit_history_data.css
+++ b/97suifangqa/apps/indicator/static/css/edit_history_data.css
@@ -23,16 +23,18 @@ input[type="radio"]:checked + label {
 
 #edit_history_data_container {
 	width: 588px;
-	height: 180px;
+	height: 230px;
 	background-color: #FFFFFF;
 	border: 1px solid #94C721;
 	padding: 0 20px 0 20px;
+	border-radius: 3px;
 }
 .edit_history_data_title_line {
 	height: 42px;
 	line-height: 42px;
 	border-bottom: 1px solid #D6D0D6;
 	width: 588px;
+	margin-top: 10px;
 }
 .edit_history_data_title_line .edit_history_data_title {
 	font-weight: bold;
@@ -51,6 +53,7 @@ input[type="radio"]:checked + label {
 .edit_history_data_content {
 	color: #4A4A4A;
 	font-size: 14px;
+	margin-top:10px;
 }
 .edit_history_data_content .refer_range {
 	height: 26px;
@@ -60,9 +63,11 @@ input[type="radio"]:checked + label {
 }
 .edit_history_data_content .refer_range .refer_text {
 	margin-right: 8px;
+	margin-bottom:-5px;
 }
 .edit_history_data_content .refer_range .refer_value {
 	margin-right: 8px;
+	margin-bottom:-10px;
 }
 .edit_history_data_content .edit_data {
 	line-height: 26px;
@@ -70,6 +75,7 @@ input[type="radio"]:checked + label {
 .edit_history_data_content .edit_data .date {
 	height: 26px;
 	line-height: 26px;
+	margin-top: -10px;
 }
 .edit_history_data_content .edit_data .date .date_text {
 	margin-right: 8px;
@@ -93,11 +99,11 @@ input[type="radio"]:checked + label {
 	font-weight: bold;
 }
 .edit_history_data_content .edit_data .state .normal {
-	background-color: #B8DB70;
+	/*background-color: #B8DB70;*/
 	padding: 2px;
 }
 .edit_history_data_content .edit_data .state .abnormal {
-	background-color: #FFB3B3;
+	color: #99CC33;
 	padding: 2px;
 }
 .edit_history_data_content .edit_data .state .unknown {
@@ -105,19 +111,45 @@ input[type="radio"]:checked + label {
 	padding: 2px;
 }
 .edit_history_data_content .edit_data #delete_btn {
-	float: right;
-	height: 26px;
-	line-height: 22px;
-	padding: 1px 26px;
-	margin-right: 8px;
-	background-color: #E64848;
+    background-color: rgb(50, 53, 61);
+    border-radius: 3px 3px 3px 3px;
+    color: rgb(255, 255, 255);
+    float: right;
+    font-size: 15px;
+    height: 35px;
+    margin-right: 15px;
+    margin-top: 5px;
+    padding: 1px 26px 1px 20px;
+    width: 100px;
 }
 .edit_history_data_content .edit_data #edit_btn, .edit_history_data_content .editing_data #save_btn {
-	float: right;
-	height: 26px;
-	line-height: 22px;
-	padding: 1px 26px;
+    border-radius: 3px 3px 3px 3px;
+    float: right;
+    font-size: 15px;
+    height: 35px;
+    margin-top: 5px;
+    padding: 1px 26px 1px 20px;
+    width: 100px
+}
+.edit_history_data_content .delete_prompt {
+    float: right;
+    height: 35px;
+    margin-top: 10px;
+}
+.edit_history_data_content .delete_prompt div {
+    float: right;
+    margin-right: 10px;
+}
+.edit_history_data_content .delete_prompt .prompt {
+    font-size: 16px;
+    line-height: 24px;
+    padding: 1px 10px 1px 10px;
+}
+.edit_history_data_content .delete_prompt .prompt_btns {
+    cursor: pointer;
 }
+
+
 .edit_history_data_content .editing_data {
 	line-height: 26px;
 	display: none;
@@ -138,30 +170,40 @@ input[type="radio"]:checked + label {
 	position: relative;
 }
 .edit_history_data_content .editing_data .date .datepicker {
-	background: #FFFFFF;
-	border: 1px solid #9C9C9C;
-	color: #B9B9B9;
-	width: 131px;
-	height: 17px;
-	line-height: 17px;
-	position: relative;
-	padding-top: 2px;
-	padding-bottom: 2px;
+	background: none repeat scroll 0 0 rgb(255, 255, 255);
+    border: 1px solid rgb(217, 217, 217);
+    border-radius: 3px 3px 3px 3px;
+    color: rgb(217, 217, 217);
+    height: 30px;
+    line-height: 17px;
+    margin: -3px 0 15px;
+    padding-top: 2px;
+    position: absolute;
+    width: 123px;
 }
+
+.edit_history_data_content .editing_data .date .datepicker:focus {
+	outline:0;
+	border-color:#99cc33;
+}
+
 .edit_history_data_content .editing_data .date .ui-datepicker-trigger {
 	position: absolute;
-	top: 4px;
-	right: 8px;
+	top: 5px;
+	right: 20px;
+	/* margin-right: -10px; */
 	cursor: pointer;
+	margin-top: -1px;
+	/* margin-left: -50px; */
+	
 }
 .edit_history_data_content .editing_data .date .datepicker_container .valid {
-	border: 2px solid green;
+	color:inherit;
 }
 .edit_history_data_content .editing_data .date .datepicker_container .invalid {
 	border: 2px solid red;
 }
 .edit_history_data_content .editing_data .data  {
-	height: 26px;
 	line-height: 26px;
 	float: left;
 	top: 1px;
@@ -169,14 +211,24 @@ input[type="radio"]:checked + label {
 .edit_history_data_content .editing_data .data .prompt {
 	margin-right: 8px;
 	float: left;
+	margin-top: 16px;
+	line-height: 1.6em;
 }
 .edit_history_data_content .editing_data .data input {
 	color: #5C5C5C;
 	background-color: #FFFFFF;
-	border: 1px solid #9C9C9C;
+	border: 1px solid rgb(217,217,217);
+	border-radius: 3px;
+	padding-left: 10px;
+}
+
+.edit_history_data_content .editing_data .data input:focus {
+	border-color:#99cc33;
 }
+
 .edit_history_data_content .editing_data .data .valid {
-	border: 2px solid green;
+	/* border: 2px solid green; */
+	color: inherit;
 }
 .edit_history_data_content .editing_data .data .invalid {
 	border: 2px solid red;
@@ -186,17 +238,20 @@ input[type="radio"]:checked + label {
 	float: left;
 }
 .edit_history_data_content .editing_data .data .data_input {
-	width: 200px;
-	height: 17px;
-	line-height: 17px;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	margin-right: 8px;
+	float: right;
+    height: 28px;
+    line-height: 17px;
+    margin-right: 8px;
+    margin-top: 10px;
+    padding-bottom: 2px;
+    padding-top: 2px;
+    width: 120px;
 }
 .edit_history_data_content .editing_data .data_unit {
 	height: 26px;
 	line-height: 26px;
 	margin-right: 8px;
+	margin-top: 16px;
 }
 .edit_history_data_content .editing_data .reason {
 	height: 26px;
@@ -206,6 +261,7 @@ input[type="radio"]:checked + label {
 .edit_history_data_content .editing_data .reason .prompt {
 	margin-right: 8px;
 	float: left;
+	margin-top: 10px;
 }
 .edit_history_data_content .editing_data .reason input {
 	color: #5C5C5C;
@@ -216,12 +272,19 @@ input[type="radio"]:checked + label {
 	border: 2px solid green;
 }
 .edit_history_data_content .editing_data .reason .invalid {
-	border: 2px solid red;
 }
 .edit_history_data_content .editing_data .reason .reason_input {
 	width: 330px;
-	height: 17px;
+	height: 26px;
 	line-height: 17px;
 	padding-top: 2px;
 	padding-bottom: 2px;
+	margin-top: 7px;
+	border-radius: 3px;
+	border-color: rgb(217,217,217);
 }
+
+.edit_history_data_content .editing_data .reason .reason_input :focus{
+	
+	border-color:#99cc33;
+	}
diff --git a/97suifangqa/apps/indicator/static/css/nav.css b/97suifangqa/apps/indicator/static/css/nav.css
new file mode 100644
index 0000000..a103f90
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/css/nav.css
@@ -0,0 +1,1213 @@
+@charset "UTF-8";

+/**

+ * @file

+ * Blog specific styles

+ */

+/* line 10, ../../../sass/sass/blog.scss */

+body.scrolled-down.blog #blog-top-nav {

+  background-color: white;

+}

+/* line 13, ../../../sass/sass/blog.scss */

+body.scrolled-down.blog #blog-top-nav .background {

+  border-bottom: 1px solid #eee;

+}

+

+/* line 22, ../../../sass/sass/blog.scss */

+.blog .post-question input[type="text"] {

+  background-color: #8b8885;

+  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;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"].placeholder {

+  color: #eeeeee;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"]:focus.placeholder {

+  color: transparent;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"].input-placeholder {

+  color: #eeeeee;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"]:focus.input-placeholder {

+  color: transparent;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"]:-moz-placeholder {

+  color: #eeeeee;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"]:focus:-moz-placeholder {

+  color: transparent;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"]::-webkit-input-placeholder {

+  color: #eeeeee;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"]:focus::-webkit-input-placeholder {

+  color: transparent;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"]::-moz-placeholder {

+  color: #eeeeee;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"]:focus::-moz-placeholder {

+  color: transparent;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"]:-ms-input-placeholder {

+  color: #eeeeee;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+.blog .post-question input[type="text"]:focus:-ms-input-placeholder {

+  color: transparent;

+}

+/* line 32, ../../../sass/sass/blog.scss */

+.blog #sidebar-first #header {

+  position: absolute;

+  bottom: 30px;

+  text-align: center;

+  width: auto;

+ 

+}

+/* line 40, ../../../sass/sass/blog.scss */

+ #nav-ribbon {

+  font-size: 1.07143em;

+  line-height: 1.33333em;

+  margin-bottom: 1.5em;

+  color: white;

+  position: relative;

+  white-space: nowrap;

+  height: 33px;

+  min-width: 89px;

+  -webkit-transition: min-width 0.3s ease;

+  -webkit-transition-delay: 0s;

+  -moz-transition: min-width 0.3s ease 0s;

+  -o-transition: min-width 0.3s ease 0s;

+  transition: min-width 0.3s ease 0s;

+}

+/* line 56, ../../../sass/sass/blog.scss */

+ #nav-ribbon .controls-wrap,

+ #nav-ribbon .head-background,

+ #nav-ribbon .tail-cut {

+  height: 33px;

+}

+/* line 60, ../../../sass/sass/blog.scss */

+ #nav-ribbon .controls-wrap {

+  position: absolute;

+  padding-left: 20px;

+}

+/* line 67, ../../../sass/sass/blog.scss */

+ #nav-ribbon .head-background,

+ #nav-ribbon .links-wrap,

+ #nav-ribbon .tail {

+  background-color: #0063a8;

+}

+/* line 71, ../../../sass/sass/blog.scss */

+ #nav-ribbon .head-background {

+  position: absolute;

+  top: 0;

+  left: 0;

+  width: 20px;

+  -webkit-box-shadow: inset 20px 0px 20px -20px;

+  -moz-box-shadow: inset 20px 0px 20px -20px;

+  box-shadow: inset 20px 0px 20px -20px;

+}

+/* line 81, ../../../sass/sass/blog.scss */

+ #nav-ribbon .links-wrap,

+ #nav-ribbon .tail,

+ #nav-ribbon .tail-cut {

+  float: left;

+}

+/* line 85, ../../../sass/sass/blog.scss */

+ #nav-ribbon .links-wrap {

+  -webkit-transition: width 0.3s ease;

+  -webkit-transition-delay: 0s;

+  -moz-transition: width 0.3s ease 0s;

+  -o-transition: width 0.3s ease 0s;

+  transition: width 0.3s ease 0s;

+  width: 0px;

+  overflow: hidden;

+}

+/* line 93, ../../../sass/sass/blog.scss */

+ #nav-ribbon:hover .links-wrap, #nav-ribbon.active .links-wrap,

+ #nav-ribbon ul.links {

+  width: 174px;

+}

+/* line 100, ../../../sass/sass/blog.scss */

+ #nav-ribbon:hover, #nav-ribbon.active {

+  min-width: 263px;

+}

+/* line 105, ../../../sass/sass/blog.scss */

+ #nav-ribbon ul.links li a,

+#nav-ribbon .tail {

+  line-height: 33px;

+  text-align: center;

+}

+/* line 110, ../../../sass/sass/blog.scss */

+#nav-ribbon ul.links {

+  display: block;

+  white-space: nowrap;

+  margin: 0;

+  padding: 0;

+}

+/* line 115, ../../../sass/sass/blog.scss */

+#nav-ribbon ul.links li {

+  display: block;

+  padding: 0;

+  float: left;

+}

+/* line 119, ../../../sass/sass/blog.scss */

+#nav-ribbon ul.links li a {

+  width: 86px;

+  display: block;

+  color: white;

+  border-right: 1px solid #267ab5;

+}

+/* line 126, ../../../sass/sass/blog.scss */

+#nav-ribbon ul.links li a:hover, #nav-ribbon ul.links li a:active, #nav-ribbon ul.links li a.active {

+  text-decoration: none;

+  background-color: #00497f;

+}

+/* line 134, ../../../sass/sass/blog.scss */

+#nav-ribbon .tail {

+  width: 50px;

+  cursor: pointer;

+}

+/* line 139, ../../../sass/sass/blog.scss */

+#nav-ribbon .tail-cut {

+  width: 19px;

+  height: 33px;

+  background: url(../../static/images/nav-ribbon-tail-cut.png);

+}

+

+/* line 150, ../../../sass/sass/blog.scss */

+.blog-details #return-to-results-button {

+  visibility: hidden;

+}

+/* line 154, ../../../sass/sass/blog.scss */

+.blog-details.blog-results-detail #return-to-results-button {

+  visibility: visible;

+}

+/* line 159, ../../../sass/sass/blog.scss */

+.blog-details a.jargon:hover {

+  text-decoration: none;

+  border-bottom: 1px dashed;

+}

+/* line 163, ../../../sass/sass/blog.scss */

+.blog-details .jargon-explanations {

+  display: none;

+}

+/* line 168, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .region-wrap,

+.blog-details #content .region-wrap {

+  padding-top: 0.5em;

+  padding-left: 2em;

+  padding-right: 2em;

+}

+/* line 177, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav {

+  z-index: 10;

+  position: absolute;

+}

+/* line 181, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .breadcrumb {

+  margin-top: 1.5em;

+}

+/* line 184, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .breadcrumb ul.inline li {

+  padding-right: 0;

+}

+/* line 186, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .breadcrumb ul.inline li a.button {

+  padding-top: 0.5em;

+  padding-bottom: 0.5em;

+  padding-left:0.8em;

+  padding-right: 0.8em;

+  border-radius: 3px 3px 3px 3px;

+  font-weight: bold;

+}

+/* line 191, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .breadcrumb ul.inline li a.button.first {

+  background-image: url(../../images/breadcrumb-dark-grey-button-left-arrow-wbg.png);

+  background-position: center left;

+  background-repeat: no-repeat;

+  -webkit-border-radius: 0 3px 3px 0;

+  -moz-border-radius: 0 3px 3px 0;

+  -ms-border-radius: 0 3px 3px 0;

+  -o-border-radius: 0 3px 3px 0;

+  border-radius: 0 3px 3px 0;

+  border: none;

+  padding-left: 20px;

+}

+/* line 198, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .breadcrumb ul.inline li a.button.first:hover {

+  background-color: #4c4948;

+}

+/* line 211, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .section-name {

+  font-size: 18px;

+  color: #9fa0a0;

+}

+/* line 215, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .section-nav {

+  width: auto;

+}

+/* line 222, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .section-nav ul.links {

+  display: block;

+  width: auto;

+  margin: 0;

+}

+/* line 226, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .section-nav ul.links li {

+  margin-right: 3em;

+  padding: 0;

+}

+/* line 229, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .section-nav ul.links li a {

+  color: inherit;

+}

+/* line 231, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .section-nav ul.links li a.active {

+  color: #99cc33;

+  /*border-bottom: 1px dashed #99cc33;*/

+  text-decoration: none;

+}

+/* line 237, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .section-nav ul.links:hover li a.active {

+  color: inherit;

+  border-bottom: none;

+}

+/* 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: #99cc33;

+  /*border-bottom: 1px dashed #99cc33;*/

+  text-decoration: none;

+}

+/* line 250, ../../../sass/sass/blog.scss */

+.blog-details #blog-top-nav .background {

+  z-index: -1;

+  position: absolute;

+  top: 0;

+  bottom: -2px;

+  left: 0;

+  right: 0;

+  margin-left: 2em;

+  margin-right: 2em;

+  background-color: white;

+  border-bottom: 1px solid transparent;

+}

+/* line 265, ../../../sass/sass/blog.scss */

+.blog-details #content {

+  margin-top: 150px;

+  position: relative;

+}

+/* line 268, ../../../sass/sass/blog.scss */

+.blog-details #content .text {

+  font-size: 1.14286em;

+  line-height: 1.6875em;

+}

+/* line 270, ../../../sass/sass/blog.scss */

+.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 {

+  color: #4c4a49;

+}

+/* line 280, ../../../sass/sass/blog.scss */

+.blog-details #content .text .image-wrap {

+  border: 1px solid #c9caca;

+  margin-bottom: 1.14286em;

+}

+/* line 285, ../../../sass/sass/blog.scss */

+.blog-details #content .text a.enlarge-image {

+  cursor: pointer;

+  cursor: url(../../images/zoom.cur), auto;

+}

+/* line 290, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box {

+  z-index: 1;

+  position: absolute;

+  display: none;

+  position: absolute;

+  margin-top: 8px;

+  left: 20px;

+  right: 20px;

+  background-color: white;

+  border: 1px solid #8fc31f;

+  -webkit-border-radius: 2px;

+  -moz-border-radius: 2px;

+  -ms-border-radius: 2px;

+  -o-border-radius: 2px;

+  border-radius: 2px;

+  -webkit-box-shadow: 0px 0px 30px #999999;

+  -moz-box-shadow: 0px 0px 30px #999999;

+  box-shadow: 0px 0px 30px #999999;

+}

+/* line 105, ../../../sass/sass/_custom.scss */

+.blog-details #content .jargon-explanation-box.open {

+  display: block;

+}

+/* line 300, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box .content-wrap {

+  padding-left: 1.5em;

+  padding-right: 1.5em;

+  padding-top: 0.7em;

+}

+/* line 306, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box .content-wrap .jargon-details {

+  min-height: 150px;

+  max-height: 250px;

+  overflow: auto;

+}

+/* line 311, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box .content-wrap .references {

+  font-size: 0.8em;

+  font-style: italic;

+}

+/* line 316, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box .text-pointer {

+  z-index: 10;

+  position: absolute;

+  width: 20px;

+  height: 8px;

+  background-image: url(../../images/popup-text-pointer.png);

+  top: -8px;

+  margin-left: -10px;

+  left: 10px;

+}

+/* line 326, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box .close-box {

+  z-index: 1;

+  position: absolute;

+  width: 20px;

+  height: 20px;

+  background: url(../../images/grey-cross.png) no-repeat center center;

+  cursor: pointer;

+  right: 1.5em;

+  top: 1.5em;

+}

+/* line 336, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box h3.name {

+  margin: 0;

+  border-bottom: 1px solid #c9cacb;

+  margin-top: 0em;

+  margin-bottom: 1em;

+}

+/* line 342, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box .like-button {

+  display: block;

+  margin: 1em;

+  width: auto;

+}

+/* line 347, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box .like-button * {

+  vertical-align: middle;

+}

+/* line 350, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box .like-button a.login-button {

+  vertical-align: top;

+}

+/* line 356, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box .content-wrap,

+.blog-details #content .jargon-explanation-box .like-button {

+  visibility: hidden;

+}

+/* line 360, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box .loading-image {

+  visibility: visible;

+  position: absolute;

+  top: 50%;

+  left: 50%;

+  margin-top: -38.5px;

+  margin-left: -53.5px;

+}

+/* line 371, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box.loaded .content-wrap,

+.blog-details #content .jargon-explanation-box.loaded .like-button {

+  visibility: visible;

+}

+/* line 374, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box.loaded .loading-image {

+  visibility: hidden;

+}

+/* line 378, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box.modal {

+  position: fixed;

+  z-index: 2001;

+  padding: 0;

+  left: 50%;

+  margin-left: -350px;

+  width: 700px;

+  top: 50% !important;

+  -webkit-box-shadow: 0px 0px 30px #444444;

+  -moz-box-shadow: 0px 0px 30px #444444;

+  box-shadow: 0px 0px 30px #444444;

+}

+/* line 383, ../../../sass/sass/blog.scss */

+.blog-details #content .jargon-explanation-box.modal .text-pointer {

+  display: none;

+}

+/* line 390, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card-brief {

+  font-size: 0.875em;

+  line-height: 1.63265em;

+}

+/* line 393, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card {

+  font-size: 0.875em;

+  line-height: 1.30612em;

+  cursor: pointer;

+  border: 1px solid #c9caca;

+}

+/* line 397, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card .back .card-wrap {

+  height: 200px;

+  color: white;

+  background-color: #4c4948;

+  background-image: url(../../images/card-bg-grey.png);

+  background-repeat: no-repeat;

+  background-position: center center;

+  text-align: center;

+  line-height: 1.5em;

+}

+/* line 407, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card .back .card-wrap .content-wrap {

+  padding-top: 2em;

+}

+/* line 411, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card .front .card-wrap {

+  height: 200px;

+  position: relative;

+  overflow: hidden;

+}

+/* line 415, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card .front .card-wrap .card-title {

+  font-weight: normal;

+  background-color: #4c4948;

+  color: white;

+  margin: 0;

+  position: absolute;

+  bottom: 0;

+  left: 0;

+  right: 0;

+  width: auto;

+  line-height: 50px;

+  padding-left: 0.5em;

+  padding-right: 0.5em;

+  padding-top: 0;

+  padding-bottom: 0;

+}

+/* line 433, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card .front .card-wrap .card-subtitle {

+  font-size: 0.95em;

+  font-weight: normal;

+  color: white;

+  background-color: #3e3a39;

+  padding: 0;

+  margin: 0;

+  position: absolute;

+  bottom: 50px;

+  left: 0;

+  right: 0;

+  padding-left: 0.5em;

+  padding-top: 0.1em;

+  padding-bottom: 0.1em;

+}

+/* line 450, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card .front .card-wrap .card-details {

+  padding: 0.5em;

+}

+/* line 455, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card .front {

+  height: 200px;

+}

+/* line 459, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card .back {

+  height: 0;

+}

+/* line 463, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card .abstract {

+  display: none;

+}

+/* line 468, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card .front,

+.blog-details #content .cards .card .back {

+  overflow: hidden;

+  -webkit-transition: height 0.3s ease;

+  -webkit-transition-delay: 0s;

+  -moz-transition: height 0.3s ease 0s;

+  -o-transition: height 0.3s ease 0s;

+  transition: height 0.3s ease 0s;

+}

+/* line 475, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card:hover .front, .blog-details #content .cards .card:active .front {

+  height: 0;

+}

+/* line 478, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card:hover .back, .blog-details #content .cards .card:active .back {

+  height: 200px;

+}

+/* line 484, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card.green .back .card-wrap {

+  background-image: url(../../images/card-bg-green.png);

+  background-color: #8fc41f;

+}

+/* line 488, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card.green .front .card-wrap {

+  color: #8fc41f;

+}

+/* line 490, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card.green .front .card-wrap .card-title {

+  background-color: #8fc41f;

+}

+/* line 493, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card.green .front .card-wrap .card-subtitle {

+  background-color: #7cb617;

+}

+/* 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;

+}

+/* line 504, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card.blue .front .card-wrap {

+  color: #006699;

+}

+/* line 506, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card.blue .front .card-wrap .card-title {

+  background-color: #0063a8;

+}

+/* line 509, ../../../sass/sass/blog.scss */

+.blog-details #content .cards .card.blue .front .card-wrap .card-subtitle {

+  background-color: #00508f;

+}

+/* line 517, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first,

+.blog-details #sidebar-second {

+  position: absolute;

+  min-height: 650px;

+  height: auto;

+  top: 0;

+  bottom: 0;

+}

+/* line 525, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second #login {

+  margin-top: 1.5em;

+}

+/* line 528, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .social {

+  font-size: 1em;

+  line-height: 1.42857em;

+  margin-top: 3em;

+}

+/* line 532, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .social ul.buttons li {

+  padding: 0;

+}

+/* line 535, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .social ul.buttons .multi-segment-button .segment.first {

+  width: 60px;

+  white-space: nowrap;

+  overflow: hidden;

+}

+/* line 540, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .social ul.buttons .multi-segment-button {

+  font-weight: bold;

+}

+/* line 544, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .social ul.buttons #like-button .like-button {

+  background-image: url(../../images/grey-star.png);

+  background-repeat: no-repeat;

+  background-position: 10px center;

+}

+/* line 550, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .social ul.buttons #no-idea-button {

+  float: right;

+}

+/* line 552, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .social ul.buttons #no-idea-button .no-idea-button {

+  background-image: url(../../images/white-unhappy-face.png);

+  background-repeat: no-repeat;

+  background-position: 10px center;

+}

+/* line 561, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .comments {

+  margin-top: 2.5em;

+}

+/* line 563, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .comments ol {

+  font-size: 0.92857em;

+  line-height: 1.38462em;

+  max-height: 400px;

+  overflow: hidden;

+  overflow: auto;

+  counter-reset: comments-counter;

+  margin: 0;

+  padding: 0;

+}

+/* line 571, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .comments ol li:before {

+  -webkit-border-radius: 3px;

+  -moz-border-radius: 3px;

+  -ms-border-radius: 3px;

+  -o-border-radius: 3px;

+  border-radius: 3px;

+  width: 1.3em;

+  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;

+  float: left;

+  margin-left: -2em;

+  padding-left: 0.05em;

+  content: counter(comments-counter);

+  counter-increment: comments-counter;

+}

+/* line 581, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .comments ol li {

+  margin-left: 2em;

+  margin-bottom: 1em;

+}

+/* line 584, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .comments ol li a {

+  color: inherit;

+}

+/* line 592, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second #card-abstract {

+  margin-top: 3em;

+  -webkit-transition: all ease;

+  -webkit-transition-delay: 0.5s;

+  -moz-transition: all ease 0.5s;

+  -o-transition: all ease 0.5s;

+  transition: all ease 0.5s;

+  visibility: hidden;

+  opacity: 0;

+}

+/* line 124, ../../../sass/sass/_custom.scss */

+.blog-details #sidebar-second #card-abstract.show {

+  visibility: visible;

+  opacity: 1;

+}

+/* line 598, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .jargon-list {

+  font-size: 1em;

+  line-height: 1.71429em;

+}

+/* line 600, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .jargon-list ul {

+  margin: 0;

+  padding: 0;

+  max-height: 400px;

+  overflow: auto;

+}

+/* line 605, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .jargon-list ul li {

+  padding: 0;

+}

+/* line 607, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .jargon-list ul li a {

+  outline: 0;

+  display: block;

+  color: inherit;

+  text-decoration: none;

+  padding-left: 1.5em;

+  padding-top: 0.3em;

+  padding-bottom: 0.3em;

+}

+/* line 619, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-second .jargon-list ul li a:hover,

+.blog-details #sidebar-second .jargon-list ul li a .active {

+  background-color: #898989;

+  -webkit-border-radius: 3px;

+  -moz-border-radius: 3px;

+  -ms-border-radius: 3px;

+  -o-border-radius: 3px;

+  border-radius: 3px;

+  color: white;

+  text-decoration: none;

+}

+/* line 630, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first {

+  z-index: 10;

+  padding-top: 1.5em;

+  padding-bottom: 1.5em;

+}

+/* line 637, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first #nav-ribbon {

+  margin-left: -20px;

+}

+/* line 640, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first .post-question {

+  overflow: hidden;

+  width: auto;

+}

+/* line 643, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first .post-question .question {

+  width: 60%;

+}

+/* line 646, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first .post-question .submit {

+  float: right;

+  width: 30%;

+}

+/* line 651, ../../../sass/sass/blog.scss */

+.related-questions {

+  padding:15px 13px 15px 13px;

+  background-color: white;

+  margin-top: 0;

+  margin-bottom: 17px;

+  -webkit-box-shadow: 0px 0px 5px #bbbbbb;

+  -moz-box-shadow: 0px 0px 5px #bbbbbb;

+  box-shadow: 0px 0px 5px #bbbbbb;

+  -webkit-border-radius: 2px;

+  -moz-border-radius: 2px;

+  -ms-border-radius: 2px;

+  -o-border-radius: 2px;

+  border-radius: 3px;

+  width:300px;

+  font-size:15px;

+  line-height: 1.6em;

+}

+

+.related-questions:hover{

+	box-shadow:0px 0px 10px #898989;

+	-webkit-box-shadow: 0px 0px 10px #898989;

+  -moz-box-shadow: 0px 0px 10px #898989; 

+  -ms-box-shadow:0px 0px 10px #898989;

+  -o-box-shadow:0px 0px 10px #898989;

+}

+

+.related-questions span{

+	color: #a8a8a8;

+}

+/* line 658, ../../../sass/sass/blog.scss */

+.related-questions h3 {

+  margin: 0;

+  line-height: 1.5em;

+}

+/* line 665, ../../../sass/sass/blog.scss */

+.related-questions a {

+  color: #727171;

+}

+

+.related-questions a {

+  text-decoration: none;

+}

+/* line 669, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first .toc {

+  margin-top: 1em;

+}

+/* line 675, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first .toc .toc-title {

+  margin: 0;

+  padding-left: 1em;

+  border-bottom: 1px solid #c9caca;

+  -webkit-box-shadow: 0px 1px 0px 0px white;

+  -moz-box-shadow: 0px 1px 0px 0px white;

+  box-shadow: 0px 1px 0px 0px white;

+}

+/* line 681, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first .toc ul.links {

+  font-size: 16.38px;

+  margin: 0;

+  padding: 0;

+}

+/* line 685, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first .toc ul.links li {

+  list-style: none;

+  background-image: url(../../images/righticon.png);

+  background-repeat: no-repeat;

+  background-position: center right;

+  margin: 0;

+  padding-left: 1em;

+  border-bottom: 1px solid #c9caca;

+  -webkit-box-shadow: 0px 1px 0px 0px white;

+  -moz-box-shadow: 0px 1px 0px 0px white;

+  box-shadow: 0px 1px 0px 0px white;

+  -webkit-transition: 0.1s ease;

+  -webkit-transition-delay: 0s;

+  -moz-transition: 0.1s ease 0s;

+  -o-transition: 0.1s ease 0s;

+  transition: 0.1s ease 0s;

+}

+/* line 694, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first .toc ul.links li:hover, .blog-details #sidebar-first .toc ul.links li.active {

+  background-color: white;

+}

+/* line 698, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first .toc ul.links li a {

+  display: block;

+  color: inherit;

+  padding-top: 0.4em;

+  padding-bottom: 0.4em;

+}

+/* line 705, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first .toc ul.links li a:hover {

+  text-decoration: none;

+}

+/* line 714, ../../../sass/sass/blog.scss */

+.blog-details #sidebar-first {

+  background-color: #f3f2f0;

+}

+/* line 717, ../../../sass/sass/blog.scss */

+.blog-details .page-expand {

+  height: 0;

+}

+@media all and (min-width: 1300px) and (min-height: 670px) {

+  /* line 724, ../../../sass/sass/blog.scss */

+  .blog-details #sidebar-first,

+  .blog-details #sidebar-second,

+  .blog-details #blog-top-nav {

+    position: fixed;

+  }

+  /* line 727, ../../../sass/sass/blog.scss */

+  .blog-details .page-expand {

+    height: 100%;

+  }

+}

+/* line 732, ../../../sass/sass/blog.scss */

+.blog-details #back-to-top-button {

+  bottom: 50px;

+  left: 960px;

+}

+/* line 736, ../../../sass/sass/blog.scss */

+.blog-details .confirm-dialog {

+  padding-top: 4em;

+  min-width: 500px;

+  min-height: 80px;

+  text-align: center;

+}

+/* line 741, ../../../sass/sass/blog.scss */

+.blog-details .confirm-dialog .controls {

+  text-align: right;

+  position: absolute;

+  bottom: 2em;

+  right: 2em;

+}

+/* line 750, ../../../sass/sass/blog.scss */

+.blog-details.blog-results #sidebar-second .lists-container {

+  display: none;

+}

+

+/* line 759, ../../../sass/sass/blog.scss */

+.blog-list #content .region-wrap {

+  margin-top: 1.5em;

+}

+/* line 762, ../../../sass/sass/blog.scss */

+.blog-list #content #login {

+  position: absolute;

+  right: 0;

+  top: 0;

+}

+/* line 767, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-top-nav {

+  position: relative;

+  margin-top: 2em;

+  padding-top: 2em;

+}

+/* line 771, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-top-nav .search-type-nav {

+  vertical-align: bottom;

+  /*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 {

+  color: inherit;

+}

+/* line 780, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-top-nav .search-type-nav ul.links li a:hover,

+.blog-list #content #blog-list-top-nav .search-type-nav ul.links li a.active {

+  text-decoration: none;

+  color: #0063a8;

+  border-bottom: 1px solid #0063a8;

+}

+/* line 786, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-top-nav .search-type-nav ul.links li.first-level {

+  font-size: 1.5em;

+  padding-right: 50px;

+}

+/* line 791, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-top-nav .search-type-nav ul.links li.second-level a {

+  padding-bottom: 2px;

+}

+/* line 799, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-content .not-found {

+  text-align: center;

+  margin-top: 2em;

+}

+/* line 802, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-content .not-found .message {

+  font-size: 1.2em;

+  margin-top: 0.5em;

+}

+/* line 808, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-content ul.articles {

+  padding: 0;

+}

+/* line 810, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-content ul.articles li {

+  list-style: none;

+}

+/* line 815, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-content .articles .article {

+  margin-bottom: 40px;

+}

+/* line 819, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-content .articles .article .article-title {

+  font-weight: bold;

+  font-size: 1.42857em;

+  line-height: 1.45em;

+  color: black;

+  margin-bottom: 0.5em;

+}

+/* line 131, ../../../sass/sass/_custom.scss */

+.blog-list #content #blog-list-content .articles .article .article-title a {

+  color: inherit;

+}

+/* line 827, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-content .articles .article .excerpt {

+  font-size: 1.14286em;

+  line-height: 1.6875em;

+  margin-top: 0.5em;

+}

+/* line 833, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-content ul.rating-blocks li {

+  vertical-align: middle;

+  padding: 0;

+  display: -moz-inline-block;

+  display: inline-block;

+  color: transparent;

+  overflow: hidden;

+  width: 12px;

+  height: 12px;

+  background-color: #948b7a;

+  -webkit-border-radius: 2px;

+  -moz-border-radius: 2px;

+  -ms-border-radius: 2px;

+  -o-border-radius: 2px;

+  border-radius: 2px;

+  margin-right: -1px;

+}

+/* line 845, ../../../sass/sass/blog.scss */

+.blog-list #content #blog-list-content ul.rating-blocks li.filled {

+  background-color: #4a453d;

+}

+/* line 856, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first #header {

+  z-index: 2;

+}

+/* line 859, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first .region-wrap {

+  z-index: 2;

+  position: relative;

+  padding-left: 1em;

+  padding-right: 1em;

+}

+/* line 867, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first #nav-ribbon {

+  margin-top: 1em;

+  z-index: 2;

+  margin-left: -20px;

+}

+/* line 872, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first .hover-overlay {

+  color: white;

+  z-index: 1;

+  position: absolute;

+  top: 0;

+  left: 0;

+  right: 0;

+  bottom: 0;

+  background-color: #91908f;

+  background-color: rgba(0, 0, 0, 0.5);

+  visibility: hidden;

+  opacity: 0;

+  -webkit-transition: all 0.3s ease;

+  -webkit-transition-delay: 0s;

+  -moz-transition: all 0.3s ease 0s;

+  -o-transition: all 0.3s ease 0s;

+  transition: all 0.3s ease 0s;

+}

+/* line 885, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first .hover-overlay .region-wrap {

+  padding-left: 3.3em;

+  padding-top: 8em;

+  padding-right: 3.3em;

+}

+/* line 891, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first .hover-overlay .region-wrap h3 {

+  margin-bottom: 0;

+}

+/* line 894, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first .hover-overlay .region-wrap .user-info h3 {

+  margin-top: 0;

+}

+/* line 897, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first .hover-overlay .region-wrap ul {

+  margin: 0;

+  padding: 0;

+}

+/* line 900, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first .hover-overlay .region-wrap ul li {

+  list-style: none;

+}

+/* line 905, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first .hover-overlay a {

+  color: white;

+}

+/* line 909, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first .post-question {

+  z-index: 2;

+  padding-left: 1em;

+  padding-right: 1em;

+  overflow: hidden;

+  width: auto;

+}

+/* line 917, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first .post-question .question {

+  width: 60%;

+  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 {

+  float: right;

+  width: 30%;

+  border: none;

+}

+/* line 929, ../../../sass/sass/blog.scss */

+.blog-list #sidebar-first:hover .hover-overlay {

+  visibility: visible;

+  opacity: 1;

+}

+

+/* line 936, ../../../sass/sass/blog.scss */

+body.blog-index {

+  color: white;

+}

+/* line 938, ../../../sass/sass/blog.scss */

+body.blog-index #main {

+  position: relative;

+}

+/* line 940, ../../../sass/sass/blog.scss */

+body.blog-index #main .background {

+  z-index: -1000;

+  background: url(../../images/back_main.jpg) no-repeat 80%;

+  position: fixed;

+  top: 0;

+  left: 0;

+  right: 0;

+  bottom: 0;

+}

+/* line 949, ../../../sass/sass/blog.scss */

+body.blog-index #main #login {

+  position: absolute;

+  top: 15px;

+  right: -250px;

+}

+/* line 954, ../../../sass/sass/blog.scss */

+body.blog-index #main .post-question {

+  margin-top: 270px;

+}

+/* line 956, ../../../sass/sass/blog.scss */

+body.blog-index #main .post-question .question {

+  background-color: white;

+  border: 1px solid #d0d1d1;

+  color: black;

+  width: 400px;

+  -webkit-box-shadow: none;

+  -moz-box-shadow: none;

+  box-shadow: none;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question.placeholder {

+  color: #d0d1d1;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question:focus.placeholder {

+  color: transparent;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question.input-placeholder {

+  color: #d0d1d1;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question:focus.input-placeholder {

+  color: transparent;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question:-moz-placeholder {

+  color: #d0d1d1;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question:focus:-moz-placeholder {

+  color: transparent;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question::-webkit-input-placeholder {

+  color: #d0d1d1;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question:focus::-webkit-input-placeholder {

+  color: transparent;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question::-moz-placeholder {

+  color: #d0d1d1;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question:focus::-moz-placeholder {

+  color: transparent;

+}

+/* line 65, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question:-ms-input-placeholder {

+  color: #d0d1d1;

+}

+/* line 68, ../../../sass/sass/_custom.scss */

+body.blog-index #main .post-question .question:focus:-ms-input-placeholder {

+  color: transparent;

+}

+/* line 964, ../../../sass/sass/blog.scss */

+body.blog-index #main .post-question .submit {

+  width: 84px;

+  -webkit-box-shadow: none;

+  -moz-box-shadow: none;

+  box-shadow: none;

+  border: none;

+}

+/* 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;

+}

+/* line 979, ../../../sass/sass/blog.scss */

+body.blog-index #main #copyright {

+  position: fixed;

+  bottom: 75px;

+  left: 75px;

+}

+

+.blog-list #content #blog-list-content ul.articles .excerpt ol li{

+	list-style: decimal;

+}

diff --git a/97suifangqa/apps/indicator/static/css/new_delete_index.css b/97suifangqa/apps/indicator/static/css/new_delete_index.css
index fde8168..635f327 100644
--- a/97suifangqa/apps/indicator/static/css/new_delete_index.css
+++ b/97suifangqa/apps/indicator/static/css/new_delete_index.css
@@ -3,9 +3,9 @@
 	float: left;
 	position: relative;
 	z-index: 999;
-	width: 865px;
+	width: 900px;
 	height: 85px;
-	margin-left: 457px;
+	margin-left: 320px;
 }
 #login_container .logged-in {
 	float: right;
@@ -55,8 +55,9 @@
     margin-top: 10px;
     position: absolute;
     z-index: 999;
-    width: 168px;
-    height: 91px;
+    width: 170px;
+    height: 28px;
+    margin-left:-20px;
 }
 #login.logged-in .drop-down-menu .text-pointer {
     background: url("../images/login-menu-popup-pointer.png") no-repeat scroll 0 0 transparent;
@@ -98,6 +99,7 @@
 #new_delete_container {
 	float: left;
 	margin-left: 457px;
+	margin-top:-11px;
 	position: relative;
 	/*
 	position: absolute;
@@ -110,11 +112,15 @@
 }
 .new_delete_title .content {
 	float: left;
-	font-weight: bold;
+	font-weight: normal;
 	font-size: 20px;
-	color: #4A4A4A;
+	color: #a8a8a8;
 	height: 26px;
 	line-height: 26px;
+	margin-bottom: 10px;
+	cursor: default;
+	margin-top: -2px;
+
 }
 .new_delete_title .search {
 	float: right;
@@ -125,45 +131,69 @@
 }
 .new_delete_title .search input {
 	float: left;
-	height: 20px;
+	height: 30px;
 	line-height: normal;
-	width: 127px;
-	border: 1px solid #CACACA;
+	width: 150px;
+	border: 1px solid #d9d9d9;
 	background-color: #FFFFFF;
-	padding: 0;
-	border-radius: 2px;
+	padding-bottom:3px;
+	border-radius: 3px;
 	color: #000000;
 	position: relative;
 	top: 2px;
-	margin-right: 2px;
+	margin-left:-50px;
+	font-weight: normal;
+	margin-top: -7px;
+
+}
+.new_delete_title .search input:focus {
+	border-color:#99cc33;
+	outline:0;
 }
 .new_delete_title .search input::-moz-placeholder {
-	color: #9D9D9D;
-	font-weight: bold;
+	color: #72717;
+	font-weight: normal;
+}
+.new_delete_title .search input::placeholder {
+	color: #727171;
+	font-weight: normal;
+}
+.new_delete_title .search input::-webkit-placeholder {
+	color: #727171;
+	font-weight: normal;
 }
 .new_delete_title .search img {
 	float: right;
 	position: relative;
 	top: 2px;
 	cursor: pointer;
+	margin-top: -7px;
+
 }
 .index_navigation {
-	margin: 10px 0;
+	margin-top: 10px;
+	margin-bottom: 6px;
+	width: 705px;
 }
 .index_navigation .index_type {
 	float: left;
-	width: 77px;
-	height: 22px;
+	width: 90px;
+	height: 28px;
 	line-height: 22px;
 	text-align: center;
-	border: 1px solid #B5B5B5;
-	border-radius: 2px;
-	margin-right: 9px;
+	border: 1px solid #d9d9d9;
+	border-radius: 3px;
+	margin-right: 8.6px;
+	margin-top: 2px;
+	margin-bottom: 4px;
+	padding-top: 6px;
+	font-size: 15px;
 }
 .index_navigation .index_type a {
 	color: #7E7E7E;
 	cursor: pointer;
 	text-decoration: none;
+	margin-bottom:-10px;
 }
 /*
 .index_navigation #index_all {
@@ -186,10 +216,11 @@
 	float: left;
 	width: 302px;
 	height: 437px;
-	border: 1px solid #b6b6b6;
+	border: 1px solid #d9d9d9;
 	z-index: 1;
 	position: relative;
 	padding: 6px 12px 0 12px;
+	border-radius: 3px;
 }
 .show_indexes .add_concerned_icon {
 	float: left;
@@ -234,16 +265,22 @@
 }
 .index_line {
 	margin-top: 3px;
+	height: 23px;
+	border-radius: 3px;
+	padding-left: 5px;
+	padding-top:2px;
+	padding-bottom:2px;
 }
 .index_line .index_name, .index_line .index_category {
 	float: left;
-	font-size: 14px;
+	font-size: 15px;
 	width: 45px;
 	height: 20px;
-	line-height: 20px;
-	color: #4A4A4A;
-	font-weight: bold;
-	cursor: pointer;
+	line-height: 1.6em;
+	color: #909090;
+	font-weight: normal;
+	cursor: default;
+	
 }
 .index_lines .add .icon {
 	width: 20px;
@@ -265,7 +302,9 @@
 	left: 260px;
 }
 .index_lines .add, .index_lines .minus {
-	background: #8FC31F;
+	background: #8fc21f;
+	height: 23px;
+	margin-bottom:3px;
 }
 .index_line .index_name {
 	width: 185px;
@@ -298,12 +337,21 @@
 }
 .all_condition .index_all_letter div {
 	float: left;
-	color: #8F8F8F;
-	font-size: 15px;
-	margin-right: 7px;
+	color: #b3b3b2;
+	font-size: 16px;
+	margin-right: 8px;
+	margin-top:3px;
 	cursor: pointer;
+	font-weight: normal;
+	/* letter-spacing: 2px; */
+	border-color: #b3b3b3
+	
+}
+.all_condition .index_all_letter .disabled {
+	cursor: default;
+	color: #D9D9D9;
 }
-.all_condition .index_all_letter .letter_selected{
+.all_condition .index_all_letter .letter_selected {
 	color: #99CC33;
 }
 .index_letter_container {
@@ -318,7 +366,7 @@
 	height: 32px;
 	line-height: 32px;
 	font-weight: bold;
-	font-size: 32px;
+	font-size: 22px;
 	color: #4A4A4A;
 	border-bottom: 1px solid #BFBFBF;
 }
@@ -343,21 +391,26 @@
     margin-bottom: 10px;
 }
 .link_container .status_link {
-    width: 694px;
+     width: 105px;
     height: 37px;
     line-height: 37px;
-    border: 1px solid #B5B5B5;
-    border-radius: 2px;
+    border-radius: 3px;
     /* background-color: #F7F7F7; */
-    background-color: #F3F3F1;
+    background-color: #99cc33;
     text-align: center;
+    float: right;
+	font-color:white;
+}
+
+.link_container .status_link:hover{
+	background-color:#93C430;
+	cursor: default;
 }
+
 .link_container .status_link a {
-    color: #4A4A4A;
+    color: white;
     text-decoration: none;
-    font-weight: bold;
-    font-size: 19px;
-    letter-spacing: 1px;
+    font-size: 16px;
     cursor: pointer;
 }
 
diff --git a/97suifangqa/apps/indicator/static/css/normalize.css b/97suifangqa/apps/indicator/static/css/normalize.css
index ab1eadb..f9916ec 100644
--- a/97suifangqa/apps/indicator/static/css/normalize.css
+++ b/97suifangqa/apps/indicator/static/css/normalize.css
@@ -565,6 +565,8 @@ input[type="submit"] {
   /* 2 */
 }
 
+
+
 /* line 574, ../../../sass/sass/normalize.scss */
 .button,
 button,
@@ -586,9 +588,11 @@ input[type="reset"] {
   color: white;
   padding-left: 0.8em;
   padding-right: 0.8em;
-  height: 2.1em;
-  line-height: 2.1em;
+  padding-bottom: 0.5em;
+  height: 3em;
+  line-height: 1.5em;
   vertical-align: middle;
+  font-size: 16px;
 }
 /* line 588, ../../../sass/sass/normalize.scss */
 .button:hover,
@@ -648,8 +652,8 @@ a.button:visited {
 
 /* line 619, ../../../sass/sass/normalize.scss */
 input[type="text"] {
-  background-color: #8b8885;
-  border: 1px solid white;
+  background-color: white;
+
   -webkit-box-shadow: 0px 0px 2px white;
   -moz-box-shadow: 0px 0px 2px white;
   box-shadow: 0px 0px 2px white;
@@ -658,12 +662,18 @@ input[type="text"] {
   padding-top: 0;
   padding-bottom: 0;
   line-height: 1.95em;
-  height: 1.95em;
+  height: 29px;
   color: white;
+  font-size:15px;
 }
+input[type="text"]:focus {
+  border-color:#99cc33;
+  outline:0;
+}
+
 /* line 65, ../../../sass/sass/_custom.scss */
 input[type="text"].placeholder {
-  color: #eeeeee;
+  color: #a6a6a6;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 input[type="text"]:focus.placeholder {
@@ -671,7 +681,7 @@ input[type="text"]:focus.placeholder {
 }
 /* line 65, ../../../sass/sass/_custom.scss */
 input[type="text"].input-placeholder {
-  color: #eeeeee;
+  color: #a6a6a6;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 input[type="text"]:focus.input-placeholder {
@@ -679,7 +689,7 @@ input[type="text"]:focus.input-placeholder {
 }
 /* line 65, ../../../sass/sass/_custom.scss */
 input[type="text"]:-moz-placeholder {
-  color: #eeeeee;
+  color: #a6a6a6;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 input[type="text"]:focus:-moz-placeholder {
@@ -687,7 +697,7 @@ input[type="text"]:focus:-moz-placeholder {
 }
 /* line 65, ../../../sass/sass/_custom.scss */
 input[type="text"]::-webkit-input-placeholder {
-  color: #eeeeee;
+  color: #a6a6a6;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 input[type="text"]:focus::-webkit-input-placeholder {
@@ -695,7 +705,7 @@ input[type="text"]:focus::-webkit-input-placeholder {
 }
 /* line 65, ../../../sass/sass/_custom.scss */
 input[type="text"]::-moz-placeholder {
-  color: #eeeeee;
+  color: #a6a6a6;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 input[type="text"]:focus::-moz-placeholder {
@@ -703,7 +713,7 @@ input[type="text"]:focus::-moz-placeholder {
 }
 /* line 65, ../../../sass/sass/_custom.scss */
 input[type="text"]:-ms-input-placeholder {
-  color: #eeeeee;
+  color: #a6a6a6;
 }
 /* line 68, ../../../sass/sass/_custom.scss */
 input[type="text"]:focus:-ms-input-placeholder {
diff --git a/97suifangqa/apps/indicator/static/css/sheet_default.css b/97suifangqa/apps/indicator/static/css/sheet_default.css
index 82d8fbb..22e5afd 100644
--- a/97suifangqa/apps/indicator/static/css/sheet_default.css
+++ b/97suifangqa/apps/indicator/static/css/sheet_default.css
@@ -24,9 +24,10 @@ input[type="radio"]:checked + label {
 #login_container {
 	float: left;
 	position: relative;
-	width: 865px;
+	z-index: 999;
+	width: 900px;
 	height: 85px;
-	margin-left: 457px;
+	margin-left: 320px;
 }
 #login_container .logged-in {
 	float: right;
@@ -67,7 +68,7 @@ input[type="radio"]:checked + label {
     line-height: 1em;
 }
 #login.logged-in .drop-down-menu {
-    background-color: #FFFFFF;
+   background-color: #FFFFFF;
     border: 1px solid #C9C9C9;
     border-radius: 2px 2px 2px 2px;
     box-shadow: 0 0 10px rgba(85, 85, 85, 0.5);
@@ -76,8 +77,9 @@ input[type="radio"]:checked + label {
     margin-top: 10px;
     position: absolute;
     z-index: 999;
-    width: 168px;
-    height: 91px;
+    width: 170px;
+    height: 28px;
+    margin-left:-20px;
 }
 #login.logged-in .drop-down-menu .text-pointer {
     background: url("../images/login-menu-popup-pointer.png") no-repeat scroll 0 0 transparent;
@@ -131,10 +133,12 @@ input[type="radio"]:checked + label {
 	width: 696px;
 }
 .index_title {
-	color: #4a4a4a;
+	color: #a8a8a8;
 	font-size: 20px;
-	letter-spacing: 2px;
-	font-weight: bold;
+	font-weight: normal;
+	font-size:1.4em;
+	margin-bottom:10px;
+	margin-top:-10px;
 }
 .index_sub_title {
 	margin-top: 9px;
@@ -178,14 +182,17 @@ input[type="radio"]:checked + label {
 	float: left;
 }
 .detail_card_info .card_title .collapse_btn {
-	width: 80px;
-	height: 23px;
+	width: 100px;
+	height: 35px;
 	line-height: 23px;
 	font-size: 14px;
 	vertical-align: baseline;
 	position: relative;
 	bottom: -10px;
 	float: right;
+	margin-top:-12px;
+	padding-top:0.3em;
+	font-size: 15px;
 }
 .detail_card_info .search_data_div {
 	margin-top: 9px;
@@ -194,10 +201,36 @@ input[type="radio"]:checked + label {
 }
 .detail_card_info .search_data_div input[type='button'] {
 	width: 100px;
-	height: 23px;
 	line-height: 23px;
 	float: left;
+	text-align: center;	
+	padding-right:20px;
+	padding-top:5px; 
+	height: 35px;
+	font-size: 15px;
+	border-radius: 3px;
+	border-color: #d9d9d9;
+	font-color:#7e7e7e;
+	margin-right:5px;
+}
+
+.detail_card_info .search_data_div input[type='button']:hover{
+	 cursor: pointer;
+  -webkit-appearance: none;
+  background-color: #99cc33;
+  border: 1px solid #f3f2f0;
+  -webkit-box-shadow: 0px 0px 2px white;
+  -moz-box-shadow: 0px 0px 2px white;
+  box-shadow: 0px 0px 2px white;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  color: white;
+	
 }
+
 .detail_card_info .search_data_div .shift_date {
 	margin-left: 4px;
 }
@@ -216,20 +249,28 @@ input[type="radio"]:checked + label {
 }
 .detail_card_info .search_data_div .datepicker_container .datepicker {
 	background: #FFFFFF;
-	border: 1px solid #9C9C9C;
+	border: 1px solid #d9d9d9;
 	color: #B9B9B9;
-	width: 117px;
-	height: 17px;
-	line-height: 17px;
+	width: 110px;
+	height: 30px;
 	position: relative;
 	padding-top: 2px;
 	padding-bottom: 2px;
+	padding-left:10px;
+	border-radius:3px;
+	margin-left: 5px;
 }
+.detail_card_info .search_data_div .datepicker_container .datepicker:focus{
+	border-color: #99cc33;
+	outline:0;
+}
+
 .detail_card_info .search_data_div .datepicker_container .ui-datepicker-trigger {
 	position: absolute;
 	top: 2px;
 	right: 8px;
 	cursor: pointer;
+	margin-top: 6px;
 }
 .detail_card_info .chart {
 	height: 400px;
@@ -243,19 +284,23 @@ input[type="radio"]:checked + label {
 .detail_card_info .table_div table tr td {
 	border: 1px solid #CACACA;
 	text-align: center;
+	height: 40px;
 }
 .detail_card_info .table_div table .first_line {
 	background: #99CC33;
-	height: 29px;
+	height: 35px;
 	color: #FFFFFF;
+	font-size:16px;
 }
 .detail_card_info .table_div table .state .normal {
-	background-color: #B8DB70;
+	color:inherit; 
 	padding: 2px;
 }
 .detail_card_info .table_div table .state .abnormal {
-	background-color: #FFB3B3;
-	padding: 2px;
+	border-radius: 3px;
+	margin:3px 0 3px 0;
+	height: 35px;
+	color:#99cc33;
 }
 .detail_card_info .table_div table .state .unknown {
 	background-color: #B3D9FF;
@@ -269,19 +314,31 @@ input[type="radio"]:checked + label {
 	width: 107px;
 	height: 24px;
 	line-height: 24px;
+	color:#7d7d7d;
+	background-color: white;
+	font-size:15px;
+	margin:5px 19px 5px 0;
+	border-color:white;
 }
 .detail_card_info .see_more .see_more_btn:disabled {
-	background-color: #CCCCCC;
+	color:#7d7d7d;
+	background-color: white;
+	font-size:15px;
+	margin:5px 19px 5px 0;
+	border-color:white;
 }
 .index_card {
 	width: 328px;
 	height: 434px;
 	border: 1px solid #CACACA;
 	margin-top: 9px;
-	border-radius: 2px;
+	border-radius: 3px;
 	padding: 5px 5px 0 8px;
 	position: relative;
 }
+
+
+
 /* recommended indicator's card */
 #index_status_container .recommended {
 	width: 326px;
@@ -291,21 +348,24 @@ input[type="radio"]:checked + label {
 .index_card_fir {
 	float: left;
 }
+
 .index_card_sec {
 	float: right;
 }
 .index_card .card_title {
 	height: 40px;
 	line-height: 40px;
-	color: #7D7D7D;
+	/*color: #7D7D7D;*/
 	font-weight: bold;
 	font-size: 18px;
+	border-radius:5px;
 }
 .index_card .refer_range {
 	color: #4B4B4B;
 }
 .index_card .refer_range .refer_text {
 	margin-right: 5px;
+	margin-bottom:10px;
 }
 .index_card .refer_range .refer_value {
 	margin-right: 5px;
@@ -316,7 +376,7 @@ input[type="radio"]:checked + label {
 	margin-top: 7px;
 }
 .index_card .edit_data .explain_icon {
-	margin-right: 2px;
+	margin-right: 5px;
 	float: right;
 }
 .index_card .edit_data .small_edit_icon {
@@ -382,16 +442,30 @@ input[type="radio"]:checked + label {
 }
 .index_card .editing_data .data .data_input {
 	width: 165px;
-	height: 17px;
+	height: 26px;
+	border: 1px solid #d9d9d9;
 	line-height: 17px;
 	padding-top: 2px;
 	padding-bottom: 2px;
 	margin-right: 8px;
+	margin-top:-6px;
+	border-radius:3px;
+	-moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+	font-size:14px;
+	line-height: 20px;
+	vertical-align: middle;
 }
+.index_card .editing_data .data .data_input:focus {
+	border: 1px solid #99cc33;	
+}
+
 .index_card .editing_data .data_unit {
 	float: left;
 	height: 25px;
 	line-height: 25px;
+	margin-top:0px;
 }
 .index_card .editing_data .date .datepicker_container {
 	width: 148px;
@@ -400,24 +474,32 @@ input[type="radio"]:checked + label {
 	margin-top: 5px;
 }
 .index_card .editing_data .date .datepicker_container .datepicker {
-	background: #FFFFFF;
-	border: 1px solid #9C9C9C;
+	background: white;
+	border: 1px solid #d9d9d9;
 	color: #B9B9B9;
-	width: 131px;
-	height: 17px;
+	width: 165px;
+	height: 26px;
 	line-height: 17px;
 	position: relative;
 	padding-top: 2px;
 	padding-bottom: 2px;
+	margin-top:0px;
+	border-radius:3px;
 }
 .index_card .editing_data .date .datepicker_container .ui-datepicker-trigger {
 	position: absolute;
 	top: 2px;
 	right: 8px;
+	margin-top:5px;
+	margin-right:-30px;
 	cursor: pointer;
 }
+
+.index_card .editing_data .date .datepicker_container .datepicker:focus {
+	border-color:#99cc33;
+}
 .index_card .editing_data .date .datepicker_container .valid {
-	border: 2px solid green;
+	color: #000;
 }
 .index_card .editing_data .date .datepicker_container .invalid {
 	border: 2px solid red;
@@ -426,9 +508,9 @@ input[type="radio"]:checked + label {
 .index_card .editing_data .cancel_edit_icon {
 	float: right;
 	background:url(../images/cancel_edit.png) no-repeat;
-	width: 23px;
-	height: 23px;
-	margin-right: 3px;
+	width: 24px;
+	height: 24px;
+	margin-right: 5px;
 	cursor: pointer;
 }
 .index_card .editing_data .confirm_edit_icon {
@@ -436,6 +518,7 @@ input[type="radio"]:checked + label {
 	background:url(../images/confirm_edit.png) no-repeat;
 	width: 23px;
 	height: 23px;
+	margin-right:10px;
 	cursor: pointer;
 }
 
@@ -451,7 +534,7 @@ input[type="radio"]:checked + label {
 	height: 85px;
 	width: 85px;
 	float: left;
-	margin: 45px 0 0 135px;
+	margin: 45px 0 0 120px;
 	cursor: pointer;
 }
 .index_card .edit_icon_container .curve_icon {
@@ -459,14 +542,17 @@ input[type="radio"]:checked + label {
 	height: 125px;
 	width: 105px;
 	float: left;
+	margin-left: 15px;
 }
 .index_card .edit_icon_container .edit_text {
-	color: #4B4B4B;
+	color: #8E8E8E;
 	text-align: center;
 	height: 20px;
 	line-height: 20px;
-	margin-top: 11px;
+	margin-top: 20px;
 	margin-bottom: 100px;
+	margin-right: 5px;
+	font-size:15px
 }
 
 .index_card .chart {
@@ -488,6 +574,11 @@ input[type="radio"]:checked + label {
 	cursor: pointer;
 	text-decoration: none;
 }
+
+.index_card .card_bottom .understand_index a:hover, .index_card .card_bottom .simulation_sheet a:hover, .index_card .card_bottom .detail_history a:hover {
+	color: #99cc33;
+}
+
 .index_card .card_bottom .understand_index {
 	width: 120px;
 }
@@ -503,6 +594,8 @@ input[type="radio"]:checked + label {
 	right: 0;
 	margin: 5px 5px 0 0;
 	cursor: pointer;
+	margin-top:10px;
+	margin-right:10px;
 }
 .index_card .card_delete_hover {
 	background: url('../images/closed_hover.png') no-repeat;
@@ -511,7 +604,7 @@ input[type="radio"]:checked + label {
 	position: absolute;
 	top: -3px;
 	right: -2px;
-	margin: 5px 5px 0 0;
+	margin: 10px 10px 0 0;
 	cursor: pointer;
 }
 .act_card_container {
@@ -535,6 +628,8 @@ input[type="radio"]:checked + label {
 	letter-spacing: 1px;
 	cursor: pointer;
 }
+
+
 .move_div_2_left {
 	float: left;
 }
diff --git a/97suifangqa/apps/indicator/static/css/sidebar.css b/97suifangqa/apps/indicator/static/css/sidebar.css
index 8df3a1a..c5d3be9 100644
--- a/97suifangqa/apps/indicator/static/css/sidebar.css
+++ b/97suifangqa/apps/indicator/static/css/sidebar.css
@@ -5,7 +5,7 @@
 	padding: 1.5em 0;
 	position: absolute;
     z-index: 10;
-    width: 420px;
+    /*width: 420px;*/
     height: 1020px;
     background-color: #F3F3F1;
 }
@@ -79,8 +79,8 @@
 
 /* 对比容器样式 */
 #compare_container {
-	margin-top: 26px;
-	padding-left: 18px;
+	margin-top: -7px;
+	padding-left: 27px;
 	width: 383px;
 }
 #compare_container .post-question .searchdiv .question {
@@ -91,13 +91,14 @@
 }
 #compare_container .post-question .searchdiv .submit {
 	width: 72px;
-	height: 31px;
+	height: 35px;
 	border: 1px solid #cce79a;
 	vertical-align: baseline;
 	float: right;
+	
 }
 #compare_container .similar_container {
-	margin-top: 14px;
+	margin-top: 0px;
 	margin-left:15px;
 }
 .vertical_bar_component {
@@ -156,6 +157,16 @@
 	position: absolute;
 	z-index: 100;
 }
+
+#sidebar_container .submit{
+	margin-left: 40px;
+	margin-top: -5px;
+	width: 330px;
+	height: 45px;
+	line-height: 1em;
+	padding-top:0.5em;
+}
+
 #compare_container .similar_container .similar_content {
 	margin-left: 15px;
 	float: left;
@@ -168,7 +179,6 @@
 }
 #compare_container .similar_container .similar_content .specifix_content {
 	background: url("../images/dialog-default.png") no-repeat;
-	height: 47px;
 	width: 343px;
 	margin-left: -10px;
 	margin-bottom: 35px;
@@ -184,24 +194,22 @@
 	padding-left: 25px;
 	font-size: 15px;
 }
-#compare_container .compare_btn {
+/*compare_container .compare_btn {
 	border: 1px solid #7da625;
 	width: 380px;
 	height: 38px;
 	border-radius: 3px;
 	margin-top: 8px;
 	cursor: pointer;
-}
-#compare_container .compare_btn .compare_btn_in{
-	border: 1px solid #b8db71;
-	border-bottom: none;
-   	background: #8bb830;
+}*/
+#compare_btn_in{
+   	background: #99cc33;
    	background: -webkit-gradient(linear, left top, left bottom, from(#99cc33), to(#8bb830));
    	background: -webkit-linear-gradient(top, #99cc33, #8bb830);
    	background: -moz-linear-gradient(top, #99cc33, #8bb830);
    	background: -ms-linear-gradient(top, #99cc33, #8bb830);
    	background: -o-linear-gradient(top, #99cc33, #8bb830);
-   	width: 378px;
+   	width: 300px;
    	height: 36px;
    	line-height: 36px;
    	color: #FFF;
@@ -216,8 +224,9 @@
 	background: #8AB82E;
 	box-shadow: 0 0 10px rgba(85 85 85 0.5) inset;
 }
-#compare_container .logo_container {
-	margin-top: 30px;
-	text-align: center;
+#sidebar_container .logo_container {
+	margin-top: 20px;
+	margin-left:115px;
+
 }
 
diff --git a/97suifangqa/apps/indicator/static/images/addicon.png b/97suifangqa/apps/indicator/static/images/addicon.png
index 6ebf5eb..96a2c65 100644
--- a/97suifangqa/apps/indicator/static/images/addicon.png
+++ b/97suifangqa/apps/indicator/static/images/addicon.png
diff --git a/97suifangqa/apps/indicator/static/images/cancel_edit.png b/97suifangqa/apps/indicator/static/images/cancel_edit.png
index 1cd9303..9b2530e 100644
--- a/97suifangqa/apps/indicator/static/images/cancel_edit.png
+++ b/97suifangqa/apps/indicator/static/images/cancel_edit.png
diff --git a/97suifangqa/apps/indicator/static/images/confirm_edit.png b/97suifangqa/apps/indicator/static/images/confirm_edit.png
index 31f2658..2702737 100644
--- a/97suifangqa/apps/indicator/static/images/confirm_edit.png
+++ b/97suifangqa/apps/indicator/static/images/confirm_edit.png
diff --git a/97suifangqa/apps/indicator/static/images/last_edit_data.png b/97suifangqa/apps/indicator/static/images/last_edit_data.png
index 7d13181..1e615fe 100644
--- a/97suifangqa/apps/indicator/static/images/last_edit_data.png
+++ b/97suifangqa/apps/indicator/static/images/last_edit_data.png
diff --git a/97suifangqa/apps/indicator/static/images/minusicon.png b/97suifangqa/apps/indicator/static/images/minusicon.png
index 997a034..42851ff 100644
--- a/97suifangqa/apps/indicator/static/images/minusicon.png
+++ b/97suifangqa/apps/indicator/static/images/minusicon.png
diff --git a/97suifangqa/apps/indicator/static/images/pen.png b/97suifangqa/apps/indicator/static/images/pen.png
index 18aafdf..09b855b 100644
--- a/97suifangqa/apps/indicator/static/images/pen.png
+++ b/97suifangqa/apps/indicator/static/images/pen.png
diff --git a/97suifangqa/apps/indicator/static/images/pen_large.png b/97suifangqa/apps/indicator/static/images/pen_large.png
index ec75b6b..779684c 100644
--- a/97suifangqa/apps/indicator/static/images/pen_large.png
+++ b/97suifangqa/apps/indicator/static/images/pen_large.png
diff --git a/97suifangqa/apps/indicator/static/images/search.png b/97suifangqa/apps/indicator/static/images/search.png
index 303f228..29ea9b9 100644
--- a/97suifangqa/apps/indicator/static/images/search.png
+++ b/97suifangqa/apps/indicator/static/images/search.png
diff --git a/97suifangqa/apps/indicator/static/images/sheet/AFP.jpg b/97suifangqa/apps/indicator/static/images/sheet/AFP.jpg
new file mode 100644
index 0000000..527f207
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/AFP.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/PCR.jpg b/97suifangqa/apps/indicator/static/images/sheet/PCR.jpg
new file mode 100644
index 0000000..6e76089
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/PCR.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/PT.jpg b/97suifangqa/apps/indicator/static/images/sheet/PT.jpg
new file mode 100644
index 0000000..6085e53
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/PT.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/gene.jpg b/97suifangqa/apps/indicator/static/images/sheet/gene.jpg
new file mode 100644
index 0000000..224c592
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/gene.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/两对半.jpg b/97suifangqa/apps/indicator/static/images/sheet/两对半.jpg
new file mode 100644
index 0000000..1f2c2bc
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/两对半.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/肝功能.jpg b/97suifangqa/apps/indicator/static/images/sheet/肝功能.jpg
new file mode 100644
index 0000000..fa1144c
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/肝功能.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/肝穿刺表格形式二1.jpg b/97suifangqa/apps/indicator/static/images/sheet/肝穿刺表格形式二1.jpg
new file mode 100644
index 0000000..3680408
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/肝穿刺表格形式二1.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/肝脏硬度.jpg b/97suifangqa/apps/indicator/static/images/sheet/肝脏硬度.jpg
new file mode 100644
index 0000000..3b1c8ee
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/肝脏硬度.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/血细胞.jpg b/97suifangqa/apps/indicator/static/images/sheet/血细胞.jpg
new file mode 100644
index 0000000..a87265b
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/血细胞.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/表格1.jpg b/97suifangqa/apps/indicator/static/images/sheet/表格1.jpg
new file mode 100644
index 0000000..de00072
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/表格1.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/表格5.jpg b/97suifangqa/apps/indicator/static/images/sheet/表格5.jpg
new file mode 100644
index 0000000..deaadc2
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/表格5.jpg
diff --git a/97suifangqa/apps/indicator/static/javascripts/edit_history_data.js b/97suifangqa/apps/indicator/static/javascripts/edit_history_data.js
index d4ccdf5..898e904 100644
--- a/97suifangqa/apps/indicator/static/javascripts/edit_history_data.js
+++ b/97suifangqa/apps/indicator/static/javascripts/edit_history_data.js
@@ -21,8 +21,21 @@ $(document).ready(function(){
         maxDate: 0      // 0->today, 1->tomorrow
     });
 
+    // delete record {{{
     // delete button
     $("#delete_btn").bind("click", function(){
+        var this_edit_data_div = $(this).closest(".edit_data");
+        var this_delete_prompt_div = this_edit_data_div.siblings(".delete_prompt");
+        this_delete_prompt_div.show();
+        return false;
+    });
+    // cancel delete button
+    $("#cancel_delete_btn").bind("click", function(){
+        $(this).closest(".delete_prompt").hide();
+        return false;
+    });
+    // confirm delete button
+    $("#confirm_delete_btn").bind("click", function(){
         // delete record (ajax)
         var time = moment().valueOf();
         $.ajax({
@@ -51,13 +64,16 @@ $(document).ready(function(){
         });
         return false;
     });
+    // }}}
 
     // edit button
     $("#edit_btn").bind("click", function(){
         var this_edit_data_div = $(this).closest(".edit_data");
         var this_editing_data_div = this_edit_data_div.siblings(".editing_data");
-        this_editing_data_div.show();
+        var this_delete_prompt_div = this_edit_data_div.siblings(".delete_prompt");
+        this_delete_prompt_div.hide();
         this_edit_data_div.hide();
+        this_editing_data_div.show();
         return false;
     });
 
diff --git a/97suifangqa/apps/indicator/static/javascripts/new_delete_index.js b/97suifangqa/apps/indicator/static/javascripts/new_delete_index.js
index e216f09..635e9c7 100644
--- a/97suifangqa/apps/indicator/static/javascripts/new_delete_index.js
+++ b/97suifangqa/apps/indicator/static/javascripts/new_delete_index.js
@@ -22,6 +22,16 @@ $(document).ready(function(){
         }
     );
 
+    // 'all_condition' letter selectors {{{
+    // disable all letter selectors
+    $(".index_all_letter .letter").addClass("disabled");
+    $(".index_letter_container .letter_section").each(function() {
+        var l = $(this).attr('id').replace('sec_', '');
+        //console.log(l);
+        $(".index_all_letter #"+l).removeClass("disabled");
+    });
+    // }}}
+
     // login control kit {{{
     $(".drop-down-area").bind("click", function(){
         var drop_down_menu = $(".drop-down-menu");
@@ -144,8 +154,9 @@ $(document).ready(function(){
         $(".letter_selected").removeClass("letter_selected");
         $(this).addClass("letter_selected");
         var container = $(".index_letter_container");
-        var letterClass = $(this).text();
-        var scrollTo = $("."+letterClass);
+        var letterClass = $(this).attr('id');
+        //console.log(letterClass);
+        var scrollTo = $("#sec_"+letterClass);
         container.scrollTop(scrollTo.offset().top - container.offset().top + container.scrollTop());
         select_letter = letterClass;
         return false;