html: Don't hard-code colors in the C++ code, simplify CSS

luehmann · Jun 6, 2014 · 580a18f · 580a18f
1 parent ff0dd14
commit 580a18f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/data/bcov.css b/data/bcov.css
diff --git a/data/index.html b/data/index.html
@@ -59,10 +59,10 @@
     <tbody>
     <tr data-template>
       <td class="coverFile"><a href="{{link}}" title="{{title}}">{{summary_name}}</a></td>
-      <td class="coverPer"><span style='background-color:{{covered_color}};display:block;width:{{covered}}%'>{{covered}}%</td>
-      <td class="coverPerNum">{{covered_lines}}</td>
-      <td class="coverPerNum">{{uncovered_lines}}</td>
-      <td class="coverPerNum">{{total_lines}}</td>
+      <td class="coverPer"><span style="display:block;width:{{covered}}%" class="{{covered_class}}">{{covered}}%</td>
+      <td class="coverNum">{{covered_lines}}</td>
+      <td class="coverNum">{{uncovered_lines}}</td>
+      <td class="coverNum">{{total_lines}}</td>
     </tr>
     </tbody>
   </table>

diff --git a/src/html-writer.cc b/src/html-writer.cc
@@ -187,7 +187,7 @@ class HtmlWriter : public WriterBase
 					"{'link':'%s',"
 					"'title':'%s',"
 					"'summary_name':'%s',"
-					"'covered_color':'%s',"
+					"'covered_class':'%s',"
 					"'covered':'%.1f',"
 					"'covered_lines':'%d',"
 					"'uncovered_lines':'%d',"
@@ -295,7 +295,7 @@ class HtmlWriter : public WriterBase
 					"{'link':'%s/index.html',"
 					"'title':'%s',"
 					"'summary_name':'%s',"
-					"'covered_color':'%s',"
+					"'covered_class':'%s',"
 					"'covered':'%.1f',"
 					"'covered_lines':'%d',"
 					"'uncovered_lines':'%d',"
@@ -359,11 +359,11 @@ class HtmlWriter : public WriterBase
 		auto &conf = IConfiguration::getInstance();
 
 		if (percent >= conf.getHighLimit())
-			return "#CAD7FE";
+			return "lineCov";
 		else if (percent > conf.getLowLimit())
-			return "#FFEA20";
+			return "linePartCov";
 
-		return "#FF6230";
+		return "lineNoCov";
 	}
 
 	std::string getDateNow()