##// END OF EJS Templates
Merged r15569 (#23107)....
Jean-Philippe Lang -
r15188:ee0d7ce7b96c
parent child
Show More
@@ -6,7 +6,7 end
6
6
7 gem "rails", "4.2.6"
7 gem "rails", "4.2.6"
8 gem "jquery-rails", "~> 3.1.4"
8 gem "jquery-rails", "~> 3.1.4"
9 gem "coderay", "~> 1.1.0"
9 gem "coderay", "~> 1.1.1"
10 gem "builder", ">= 3.0.4"
10 gem "builder", ">= 3.0.4"
11 gem "request_store", "1.0.5"
11 gem "request_store", "1.0.5"
12 gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
12 gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
@@ -1279,13 +1279,13 color: #555; text-shadow: 1px 1px 0 #fff;
1279 .syntaxhl .char { color:#D20 }
1279 .syntaxhl .char { color:#D20 }
1280 .syntaxhl .char .content { color:#D20 }
1280 .syntaxhl .char .content { color:#D20 }
1281 .syntaxhl .char .delimiter { color:#710 }
1281 .syntaxhl .char .delimiter { color:#710 }
1282 .syntaxhl .class { color:#258; font-weight:bold }
1282 .syntaxhl .class { color:#B06; font-weight:bold }
1283 .syntaxhl .class-variable { color:#369 }
1283 .syntaxhl .class-variable { color:#369 }
1284 .syntaxhl .color { color:#0A0 }
1284 .syntaxhl .color { color:#0A0 }
1285 .syntaxhl .comment { color:#385 }
1285 .syntaxhl .comment { color:#777 }
1286 .syntaxhl .comment .char { color:#385 }
1286 .syntaxhl .comment .char { color:#444 }
1287 .syntaxhl .comment .delimiter { color:#385 }
1287 .syntaxhl .comment .delimiter { color:#444 }
1288 .syntaxhl .constant { color:#258; font-weight:bold }
1288 .syntaxhl .constant { color:#036; font-weight:bold }
1289 .syntaxhl .decorator { color:#B0B }
1289 .syntaxhl .decorator { color:#B0B }
1290 .syntaxhl .definition { color:#099; font-weight:bold }
1290 .syntaxhl .definition { color:#099; font-weight:bold }
1291 .syntaxhl .delimiter { color:black }
1291 .syntaxhl .delimiter { color:black }
@@ -1297,23 +1297,24 color: #555; text-shadow: 1px 1px 0 #fff;
1297 .syntaxhl .error { color:#F00; background-color:#FAA }
1297 .syntaxhl .error { color:#F00; background-color:#FAA }
1298 .syntaxhl .escape { color:#666 }
1298 .syntaxhl .escape { color:#666 }
1299 .syntaxhl .exception { color:#C00; font-weight:bold }
1299 .syntaxhl .exception { color:#C00; font-weight:bold }
1300 .syntaxhl .float { color:#06D }
1300 .syntaxhl .float { color:#60E }
1301 .syntaxhl .function { color:#06B; font-weight:bold }
1301 .syntaxhl .function { color:#06B; font-weight:bold }
1302 .syntaxhl .function .delimiter { color:#024; font-weight:bold }
1302 .syntaxhl .function .delimiter { color:#059 }
1303 .syntaxhl .function .content { color:#037 }
1303 .syntaxhl .global-variable { color:#d70 }
1304 .syntaxhl .global-variable { color:#d70 }
1304 .syntaxhl .hex { color:#02b }
1305 .syntaxhl .hex { color:#02b }
1305 .syntaxhl .id { color:#33D; font-weight:bold }
1306 .syntaxhl .id { color:#33D; font-weight:bold }
1306 .syntaxhl .include { color:#B44; font-weight:bold }
1307 .syntaxhl .include { color:#B44; font-weight:bold }
1307 .syntaxhl .inline { background-color: hsla(0,0%,0%,0.07); color: black }
1308 .syntaxhl .inline { background-color: hsla(0,0%,0%,0.07); color: black }
1308 .syntaxhl .inline-delimiter { font-weight: bold; color: #666 }
1309 .syntaxhl .inline-delimiter { font-weight: bold; color: #666 }
1309 .syntaxhl .instance-variable { color:#33B }
1310 .syntaxhl .instance-variable { color:#33B }
1310 .syntaxhl .integer { color:#06D }
1311 .syntaxhl .integer { color:#00D }
1311 .syntaxhl .imaginary { color:#f00 }
1312 .syntaxhl .imaginary { color:#f00 }
1312 .syntaxhl .important { color:#D00 }
1313 .syntaxhl .important { color:#D00 }
1313 .syntaxhl .key { color: #606 }
1314 .syntaxhl .key { color: #606 }
1314 .syntaxhl .key .char { color: #60f }
1315 .syntaxhl .key .char { color: #60f }
1315 .syntaxhl .key .delimiter { color: #404 }
1316 .syntaxhl .key .delimiter { color: #404 }
1316 .syntaxhl .keyword { color:#939; font-weight:bold }
1317 .syntaxhl .keyword { color:#080; font-weight:bold }
1317 .syntaxhl .label { color:#970; font-weight:bold }
1318 .syntaxhl .label { color:#970; font-weight:bold }
1318 .syntaxhl .local-variable { color:#950 }
1319 .syntaxhl .local-variable { color:#950 }
1319 .syntaxhl .map .content { color:#808 }
1320 .syntaxhl .map .content { color:#808 }
@@ -1335,13 +1336,14 color: #555; text-shadow: 1px 1px 0 #fff;
1335 .syntaxhl .shell { background-color:hsla(120,100%,50%,0.06); }
1336 .syntaxhl .shell { background-color:hsla(120,100%,50%,0.06); }
1336 .syntaxhl .shell .content { color:#2B2 }
1337 .syntaxhl .shell .content { color:#2B2 }
1337 .syntaxhl .shell .delimiter { color:#161 }
1338 .syntaxhl .shell .delimiter { color:#161 }
1338 .syntaxhl .string .char { color: #46a }
1339 .syntaxhl .string { background-color:hsla(0,100%,50%,0.05); }
1339 .syntaxhl .string .content { color: #46a }
1340 .syntaxhl .string .char { color: #b0b }
1340 .syntaxhl .string .delimiter { color: #46a }
1341 .syntaxhl .string .content { color: #D20 }
1341 .syntaxhl .string .modifier { color: #46a }
1342 .syntaxhl .string .delimiter { color: #710 }
1342 .syntaxhl .symbol { color:#d33 }
1343 .syntaxhl .string .modifier { color: #E40 }
1343 .syntaxhl .symbol .content { color:#d33 }
1344 .syntaxhl .symbol { color:#A60 }
1344 .syntaxhl .symbol .delimiter { color:#d33 }
1345 .syntaxhl .symbol .content { color:#A60 }
1346 .syntaxhl .symbol .delimiter { color:#740 }
1345 .syntaxhl .tag { color:#070; font-weight:bold }
1347 .syntaxhl .tag { color:#070; font-weight:bold }
1346 .syntaxhl .type { color:#339; font-weight:bold }
1348 .syntaxhl .type { color:#339; font-weight:bold }
1347 .syntaxhl .value { color: #088 }
1349 .syntaxhl .value { color: #088 }
General Comments 0
You need to be logged in to leave comments. Login now