Merge branch 'higher-contrast' into dev

kangas · kangas · commit b155d69eedd4 · 2015-05-29T17:18:39.000-04:00
diff --git a/scout-server/res/images/fake-sidebar-controls.png b/scout-server/res/images/fake-sidebar-controls.png
diff --git a/scout-style/10strap.less b/scout-style/10strap.less
@@ -56,7 +56,7 @@ hr.inverse {
 code {
   font-family: Menlo, monospace;
   color: @gray1;
-  background-color: @gray8;
+  background-color: @gray6;  // @worldhack: was @gray8
 }
 
 input,
diff --git a/scout-style/images/fake-sidebar-controls.png b/scout-style/images/fake-sidebar-controls.png
diff --git a/scout-style/sidebar.less b/scout-style/sidebar.less
@@ -20,6 +20,7 @@
       padding: 5px 5px 5px 30px;
       height: auto;
       background: @pw;
+      border-color: @gray6;
     }
     input[type=search] {
       border-radius: 18px;
diff --git a/scout-style/variables.less b/scout-style/variables.less
@@ -2,7 +2,7 @@
 // Variables
 // --------------------------------------------------
 @sidebar-bg: @pw;
-@sidebar-border: @gray7;
+@sidebar-border: @gray6; // @worldhack: was @gray7
 @sidebar-width: 220px;
 
 @octicons-font-path: "fonts";
diff --git a/scout-ui/src/home/index.less b/scout-ui/src/home/index.less
@@ -63,7 +63,7 @@
 
     hr.field-divider {
       margin-bottom: 12px;
-      border-top: 1px solid @gray7;
+      border-top: 1px solid @gray6;  // @worldhack: was @gray7
     }
 
     .schema-field-list {
diff --git a/scout-ui/src/minicharts/index.less b/scout-ui/src/minicharts/index.less
@@ -6,7 +6,7 @@
 @mc-blue4: lighten(@mc-blue0, 30%);
 @mc-blue5: lighten(@mc-blue0, 37.5%);
 
-@mc-bg: #F2F4F5;
+@mc-bg: @gray6;   // @worldhack: was #F2F4F5
 @mc-fg: @mc-blue0;
 
 div.minichart.unique {
@@ -66,7 +66,7 @@ svg.minichart {
   font-size: 10px;
 
   text {
-    fill: @gray4;
+    fill: @gray2; // @worldhack: was @gray4
     font-weight: bold;
   }
 
@@ -129,11 +129,11 @@ svg.minichart {
 
   .legend {
     text {
-      fill: @gray5;
+      fill: @gray4; // @worldhack: was @gray5
     }
 
     line {
-      stroke: @gray7;
+      stroke: @gray6; // @worldhack: was @gray7
     }
     shape-rendering: crispEdges;
   }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ hr.inverse {`
`56`	`56`	`code {`
`57`	`57`	`font-family: Menlo, monospace;`
`58`	`58`	`color: @gray1;`
`59`		`- background-color: @gray8;`
	`59`	`+ background-color: @gray6; // @worldhack: was @gray8`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`input,`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`padding: 5px 5px 5px 30px;`
`21`	`21`	`height: auto;`
`22`	`22`	`background: @pw;`
	`23`	`+ border-color: @gray6;`
`23`	`24`	`}`
`24`	`25`	`input[type=search] {`
`25`	`26`	`border-radius: 18px;`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`
`64`	`64`	`hr.field-divider {`
`65`	`65`	`margin-bottom: 12px;`
`66`		`- border-top: 1px solid @gray7;`
	`66`	`+ border-top: 1px solid @gray6; // @worldhack: was @gray7`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`.schema-field-list {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`@mc-blue4: lighten(@mc-blue0, 30%);`
`7`	`7`	`@mc-blue5: lighten(@mc-blue0, 37.5%);`
`8`	`8`
`9`		`-@mc-bg: #F2F4F5;`
	`9`	`+@mc-bg: @gray6; // @worldhack: was #F2F4F5`
`10`	`10`	`@mc-fg: @mc-blue0;`
`11`	`11`
`12`	`12`	`div.minichart.unique {`
`@@ -66,7 +66,7 @@ svg.minichart {`
`66`	`66`	`font-size: 10px;`
`67`	`67`
`68`	`68`	`text {`
`69`		`- fill: @gray4;`
	`69`	`+ fill: @gray2; // @worldhack: was @gray4`
`70`	`70`	`font-weight: bold;`
`71`	`71`	`}`
`72`	`72`
`@@ -129,11 +129,11 @@ svg.minichart {`
`129`	`129`
`130`	`130`	`.legend {`
`131`	`131`	`text {`
`132`		`- fill: @gray5;`
	`132`	`+ fill: @gray4; // @worldhack: was @gray5`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`line {`
`136`		`- stroke: @gray7;`
	`136`	`+ stroke: @gray6; // @worldhack: was @gray7`
`137`	`137`	`}`
`138`	`138`	`shape-rendering: crispEdges;`
`139`	`139`	`}`