Skip to content

Commit 1a4f126

Browse files
committed
Merge branch 'master' into members
2 parents 0485579 + af8767c commit 1a4f126

File tree

5 files changed

+114
-89
lines changed

5 files changed

+114
-89
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
install:
66
# Investigate scoop?
7-
- choco install -y dart-sdk -version 1.11.0
7+
- choco install -y dart-sdk -version 1.11.1
88
- set PATH=%PATH%;C:\tools\dart-sdk\bin
99
- set PATH=%PATH%;%APPDATA%\Pub\Cache\bin
1010
- pub get

lib/resources/styles.css

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

2-
/* Palette generated by Material Palette - materialpalette.com/blue-grey/light-blue */
2+
/* Palette generated by Material Palette - materialpalette.com/blue/cyan */
33

4-
.dark-primary-color { background: #455A64; }
5-
.default-primary-color { background: #607D8B; }
6-
.light-primary-color { background: #CFD8DC; }
4+
.dark-primary-color { background: #1976D2; }
5+
.default-primary-color { background: #2196F3; }
6+
.light-primary-color { background: #BBDEFB; }
77
.text-primary-color { color: #FFFFFF; }
8-
.accent-color { background: #03A9F4; }
8+
.accent-color { background: #00BCD4; }
99
.primary-text-color { color: #212121; }
1010
.secondary-text-color { color: #727272; }
1111
.divider-color { border-color: #B6B6B6; }
@@ -22,6 +22,7 @@ body {
2222
-webkit-font-smoothing: antialiased;
2323
-webkit-text-size-adjust: 100%;
2424
overflow-x: hidden;
25+
color: #212121;
2526
}
2627

2728
nav {
@@ -46,7 +47,7 @@ nav .container {
4647
}
4748

4849
header {
49-
background-color: #607D8B;
50+
background-color: #2196F3;
5051
color: white;
5152
box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.37);
5253
}
@@ -113,29 +114,24 @@ p {
113114
margin-bottom: 1em;
114115
}
115116

116-
p,
117-
ul,
118-
li {
119-
color: #727272;
120-
}
121-
122117
p.no-docs {
123118
font-style: italic;
124119
}
125120

126-
a {
127-
color: #455A64;
121+
a, a:hover {
122+
color: #1976D2;
128123
}
129124

130125
pre {
131126
font-family: 'Source Code Pro', monospace;
132127
color: black;
133128
border-radius: 4px;
134-
font-size: 14px;
129+
font-size: 13px;
135130
word-wrap: normal;
136131
line-height: 1.4;
132+
background: #f7f7f7;
137133
border: 1px solid #f0f0f0;
138-
margin: 16px;
134+
margin: 16px 0 16px 0;
139135
padding: 8px;
140136
}
141137

@@ -198,7 +194,7 @@ header li {
198194
}
199195

200196
header h1 .kind {
201-
color: #CFD8DC;
197+
color: #DDDDDD;
202198
text-transform: uppercase;
203199
font-size: 13px;
204200
}
@@ -216,7 +212,7 @@ section.summary h2 {
216212
color: #727272;
217213
margin-bottom: 16px;
218214
padding-bottom: 4px;
219-
border-bottom: 1px solid #CFD8DC;
215+
border-bottom: 1px solid #DDDDDD;
220216
}
221217

222218
/* indents wrapped lines */
@@ -290,7 +286,7 @@ footer .container-fluid {
290286
}
291287

292288
.copyright a {
293-
color: #727272;
289+
color: #212121;
294290
}
295291

296292
.markdown h1 {
@@ -368,11 +364,11 @@ footer .container-fluid {
368364
}
369365

370366
.self-crumb {
371-
color: #CFD8DC;
367+
color: #DDDDDD;
372368
}
373369

374370
nav .self-name {
375-
color: #CFD8DC;
371+
color: #DDDDDD;
376372
display: none;
377373
}
378374

@@ -447,12 +443,7 @@ ul.subnav li {
447443
}
448444

449445
ul.subnav li a {
450-
color: #CFD8DC;
451-
}
452-
453-
ul.subnav li a:hover {
454446
color: #FFFFFF;
455-
text-decoration: none;
456447
}
457448

458449
ul.subnav li {
@@ -607,10 +598,6 @@ button {
607598

608599
/* source code method bodies */
609600

610-
.source-code pre {
611-
margin: 16px 0 16px 0;
612-
}
613-
614601
#overlay-under-drawer {
615602
display: none;
616603
}

pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ packages:
8888
markdown:
8989
description: markdown
9090
source: hosted
91-
version: "0.7.1+3"
91+
version: "0.7.2"
9292
matcher:
9393
description: matcher
9494
source: hosted

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
html: ^0.12.1
1414
http: ^0.11.0
1515
logging: '>=0.9.0 <0.12.0'
16-
markdown: ^0.7.1
16+
markdown: ^0.7.2
1717
mustache4dart: ^1.0.9
1818
path: ^1.3.0
1919
pub_cache: ^0.1.0

0 commit comments

Comments
 (0)