Site
/
initfest
11
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Resolving conflict

This commit is contained in:
Krasimir Tsonev 2015-10-19 08:45:22 +03:00
parent 63abd8c466 bdc1b00258
commit a21d3cddb9
1 changed files with 366 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
css/styles.css
View File

@ -438,7 +438,7 @@ nav .selected {
width: 100%;
}
@media all and (max-width: 660px) {
@media all and (max-width: 600px) {
.grid .col2, .grid .col3, .grid .col4, .grid .col-left, .grid .col-right {
width: 100%;
float: none;
@ -751,14 +751,99 @@ a.button:hover { opacity: 0.8; }
background: #FFF;
}
.schedule-social {
background: #EDD7A7;
background: #decf72;
}
/* Social track 2015 */
.schedule-14 {
background: #decf72;
}
.schedule-technical {
background: #A4D183;
background: #953c4f;
color: #FFF;
}
.schedule-technical a {
color: #FFF;
}
/* Technical track 2015 */
.schedule-12 {
background: #953c4f;
color: #FFF;
}
.schedule-12 a {
color: #FFF;
}
.schedule-workshop {
background: #E2E0E9;
}
.schedule-civic {
background: #6548a3;
color: #FFF;
}
.schedule-civic a {
color: #FFF;
}
/* Civic hacking track 2015 */
.schedule-13 {
background: #6548a3;
color: #FFF;
}
.schedule-13 a {
color: #FFF;
}
.schedule-advanced-technical {
background: #750023;
color: #FFF;
}
.schedule-advanced-technical a {
color: #FFF;
}
/* Advanced technical track 2015 */
.schedule-15 {
background: #750023;
color: #FFF;
}
.schedule-15 a {
color: #FFF;
}
.schedule-open-biz {
background: #9a9d29;
color: #FFF;
}
.schedule-open-biz a {
color: #FFF;
}
/* Open-biz track 2015 */
.schedule-10 {
background: #9a9d29;
color: #FFF;
}
.schedule-10 a {
color: #FFF;
}
.schedule-misc {
background: #ede6b6;
}
/* Misc track 2015 */
.schedule-16 {
background: #ede6b6;
}
.schedule-open-art {
background: #88cbf0;
}
/* OpenArt track 2015*/
.schedule-11 {
background: #88cbf0;
}
.schedule-en::after {
content: " ";
background: url('../img/en_US.png');
@ -775,21 +860,6 @@ a.button:hover { opacity: 0.8; }
display: block;
margin: 0.3em auto 0.3em auto;
}
.schedule-civic {
background: #E8AAAB;
}
.schedule-advanced-technical {
background: #91C4DF;
}
.schedule-open-biz {
background: #DECDCB;
}
.schedule-misc {
background: #B0E9EC;
}
.schedule-open-art {
background: #ED9134;
}
.schedule-avatar {
float: left;
padding: 0.3em;