Skip to content
This repository was archived by the owner on Jul 21, 2019. It is now read-only.

Commit a81f797

Browse files
mattstrattonmattstratton
authored
Merge pull request #518 from devopsdays/fix-program-text
Tweak colors of program
2 parents 153795d + e61a9e5 commit a81f797

5 files changed

Lines changed: 112 additions & 11 deletions

File tree

‎config.codekit3‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10018,6 +10018,12 @@
1001810018
"rFN": 0,
1001910019
"uCM": 0
1002010020
},
10021+
"\/utils\/devopsdays-web\/bin\/hugo": {
10022+
"ft": 8192,
10023+
"oA": 2,
10024+
"oAP": "\/utils\/devopsdays-web\/bin\/hugo",
10025+
"oF": 0
10026+
},
1002110027
"\/utils\/devopsdays-web\/bin\/netlify-production.sh": {
1002210028
"ft": 8192,
1002310029
"oA": 2,
@@ -31094,6 +31100,24 @@
3109431100
"rFN": 0,
3109531101
"uCM": 0
3109631102
},
31103+
"\/utils\/devopsdays-web\/content\/events\/2017-dallas\/leadership.md": {
31104+
"cS": 0,
31105+
"eF": 1,
31106+
"eL": 1,
31107+
"eLB": 0,
31108+
"ema": 1,
31109+
"eSQ": 1,
31110+
"ft": 4096,
31111+
"oA": 1,
31112+
"oAP": "\/utils\/devopsdays-web\/content\/events\/2017-dallas\/leadership.html",
31113+
"oF": 0,
31114+
"oFM": 9,
31115+
"oS": 0,
31116+
"pHT": 0,
31117+
"pME": 1,
31118+
"rFN": 0,
31119+
"uCM": 0
31120+
},
3109731121
"\/utils\/devopsdays-web\/content\/events\/2017-dallas\/location.md": {
3109831122
"cS": 0,
3109931123
"eF": 1,
@@ -34856,6 +34880,24 @@
3485634880
"rFN": 0,
3485734881
"uCM": 0
3485834882
},
34883+
"\/utils\/devopsdays-web\/content\/events\/2017-ohio\/location.md": {
34884+
"cS": 0,
34885+
"eF": 1,
34886+
"eL": 1,
34887+
"eLB": 0,
34888+
"ema": 1,
34889+
"eSQ": 1,
34890+
"ft": 4096,
34891+
"oA": 1,
34892+
"oAP": "\/utils\/devopsdays-web\/content\/events\/2017-ohio\/location.html",
34893+
"oF": 0,
34894+
"oFM": 9,
34895+
"oS": 0,
34896+
"pHT": 0,
34897+
"pME": 1,
34898+
"rFN": 0,
34899+
"uCM": 0
34900+
},
3485934901
"\/utils\/devopsdays-web\/content\/events\/2017-ohio\/logo.png": {
3486034902
"ft": 32768,
3486134903
"iS": 32392,
@@ -46641,6 +46683,12 @@
4664146683
"oAP": "\/utils\/devopsdays-web\/data\/sponsors\/dellemc.yml",
4664246684
"oF": 0
4664346685
},
46686+
"\/utils\/devopsdays-web\/data\/sponsors\/deloitte-digital.yml": {
46687+
"ft": 8192,
46688+
"oA": 2,
46689+
"oAP": "\/utils\/devopsdays-web\/data\/sponsors\/deloitte-digital.yml",
46690+
"oF": 0
46691+
},
4664446692
"\/utils\/devopsdays-web\/data\/sponsors\/deloitte.yml": {
4664546693
"ft": 8192,
4664646694
"oA": 2,
@@ -55918,6 +55966,12 @@
5591855966
"oT": 1,
5591955967
"q": 100
5592055968
},
55969+
"\/utils\/devopsdays-web\/static\/events\/2017-boston\/Boston2017SponsorProspectus.pdf": {
55970+
"ft": 8192,
55971+
"oA": 2,
55972+
"oAP": "\/utils\/devopsdays-web\/static\/events\/2017-boston\/Boston2017SponsorProspectus.pdf",
55973+
"oF": 0
55974+
},
5592155975
"\/utils\/devopsdays-web\/static\/events\/2017-boston\/cycloramaskylight.jpg": {
5592255976
"ft": 16384,
5592355977
"iS": 118895,
@@ -56620,6 +56674,17 @@
5662056674
"opt": 0,
5662156675
"q": 100
5662256676
},
56677+
"\/utils\/devopsdays-web\/static\/events\/2017-edinburgh\/organizers\/matt.png": {
56678+
"ft": 32768,
56679+
"iS": 371167,
56680+
"oA": 1,
56681+
"oAP": "\/utils\/devopsdays-web\/static\/events\/2017-edinburgh\/organizers\/matt.png",
56682+
"oF": 0,
56683+
"oIPL": 0,
56684+
"opt": 0,
56685+
"oT": 1,
56686+
"q": 100
56687+
},
5662356688
"\/utils\/devopsdays-web\/static\/events\/2017-edinburgh\/organizers\/nick.jpg": {
5662456689
"ft": 16384,
5662556690
"iS": 38801,
@@ -57584,6 +57649,17 @@
5758457649
"oT": 1,
5758557650
"q": 100
5758657651
},
57652+
"\/utils\/devopsdays-web\/static\/events\/2017-ohio\/logo.png": {
57653+
"ft": 32768,
57654+
"iS": 32392,
57655+
"oA": 1,
57656+
"oAP": "\/utils\/devopsdays-web\/static\/events\/2017-ohio\/logo.png",
57657+
"oF": 0,
57658+
"oIPL": 0,
57659+
"opt": 0,
57660+
"oT": 1,
57661+
"q": 100
57662+
},
5758757663
"\/utils\/devopsdays-web\/static\/events\/2017-oslo\/logo-square.jpg": {
5758857664
"ft": 16384,
5758957665
"iS": 57313,
@@ -64657,6 +64733,17 @@
6465764733
"oT": 1,
6465864734
"q": 100
6465964735
},
64736+
"\/utils\/devopsdays-web\/static\/img\/sponsors\/deloitte-digital.png": {
64737+
"ft": 32768,
64738+
"iS": 39009,
64739+
"oA": 1,
64740+
"oAP": "\/utils\/devopsdays-web\/static\/img\/sponsors\/deloitte-digital.png",
64741+
"oF": 0,
64742+
"oIPL": 0,
64743+
"opt": 0,
64744+
"oT": 1,
64745+
"q": 100
64746+
},
6466064747
"\/utils\/devopsdays-web\/static\/img\/sponsors\/deloitte.png": {
6466164748
"ft": 32768,
6466264749
"iS": 6306,

‎static/css/site.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/css/site.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/scss/custom-variables.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
$navbar-light-color: #0082AB;
2+
3+
$devopsdays-gray: #bfbfc1;
4+
$devopsdays-blue: #0082AB;

‎static/scss/custom.scss‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -620,37 +620,48 @@ h3.program-page {
620620
}
621621

622622
.program-custom {
623-
background-color: #bfbfc1;
623+
background-color: lighten( $devopsdays-gray, 15% );
624+
color: #000;
624625
}
625626

626627
.program-talk {
627-
background-color: #0082AB;
628+
background-color: lighten( $devopsdays-blue, 50% );
629+
color: #000;
628630
}
629631

630632
.program-talk>a{
631-
color: #fff;
633+
color: #000;
632634
}
633635

634636
.program-ignite {
635-
background-color: #00C342;
636-
color: #fff;
637+
background-color: lighten(#00C342, 50%);
638+
color: #000;
637639
}
638640

639641
.program-ignite>ul>li{
640-
color: #fff;
642+
color: #000;
643+
}
644+
645+
.program-ignite>ul {
646+
margin-bottom: 0px;
641647
}
642648

643649
.program-ignite>ul>li>a{
644-
color: #fff;
650+
color: #000;
645651
}
646652

647653
.program-open-space {
648-
background-color: #FF8300;
654+
background-color: lighten( #FF8300, 20%);
649655
color: #000;
650656
}
651657

652658
.program-workshop {
653-
background-color: #99E6FF;
659+
background-color: #FFFA99;
660+
color: #000
661+
}
662+
663+
.program-workshop>a{
664+
color: #000;
654665
}
655666

656667
.program-row {

0 commit comments

Comments
 (0)