diff --git a/css/general.css b/css/general.css index 62be721..739c07f 100644 --- a/css/general.css +++ b/css/general.css @@ -343,9 +343,10 @@ nav ul li { } @media (max-width: 470px) { #nav-logo { - content: url(/img/Gilroy-Hacks-Logo-icon-tp.ico); - height: 50px; - width: 50px; + content: url(/img/logo_mini.png); + height: 45px; + width: 45px; + margin: 7px 0 0 5px; } #logo { height: 2300px; @@ -1595,16 +1596,18 @@ section { flex-flow: row wrap; justify-content: center; max-width: 1300px; - width: 90%; + width: 95%; margin: auto; - background-color: rgb(29, 27, 36); - border-radius: 10px; } .schedule-element { padding: 20px 20px; - width: 100%; + margin-top: 20px; + width: 95%; + min-width: 300px; max-width: 650px; + background-color: rgb(29, 27, 36); + border-radius: 10px; } .time-column-header { @@ -1613,6 +1616,213 @@ section { text-decoration: underline; } +.schedule-container { + display: grid; + margin: auto; + grid-gap: 0.2rem; + grid-template-columns: 4rem repeat(4, 1fr); + grid-template-rows: repeat(14, 1fr); + grid-template-areas: "time800 stage stage stage stage" "time900 stage stage stage stage" "time1000 stage stage stage stage" "time1100 stage stage stage stage" "time1200 stage stage stage stage" "time1300 stage stage stage stage" "time1400 stage stage stage stage" "time1500 stage stage stage stage" "time1600 stage stage stage stage" "time1700 stage stage stage stage" "time1800 stage stage stage stage" "time1900 stage stage stage stage" "time2000 stage stage stage stage" "time2100 stage stage stage stage"; +} + +/** + * Time + */ +.time { + display: flex; + justify-content: flex-end; + height: 100%; + padding: 0 0.5rem; +} + +.time span { + position: relative; + bottom: 10px; +} + +.time.start-800 { + grid-area: time800; +} +.time.start-900 { + grid-area: time900; +} +.time.start-1000 { + grid-area: time1000; +} +.time.start-1100 { + grid-area: time1100; +} +.time.start-1200 { + grid-area: time1200; +} +.time.start-1300 { + grid-area: time1300; +} +.time.start-1400 { + grid-area: time1400; +} +.time.start-1500 { + grid-area: time1500; +} +.time.start-1600 { + grid-area: time1600; +} +.time.start-1700 { + grid-area: time1700; +} +.time.start-1800 { + grid-area: time1800; +} +.time.start-1900 { + grid-area: time1900; +} +.time.start-2000 { + grid-area: time2000; +} +.time.start-2100 { + grid-area: time2100; +} + +/** + * Event + */ +.event { + display: flex; + justify-content: center; + flex-direction: column; + padding: 0.2rem 1rem; + background-color: rgb(157, 0, 149); + border-radius: 0.2rem; + font-size: 18px; + border-top: thin solid rgb(68, 68, 68); +} +.event span { + display: block; + width: 100%; + font-size: 14px; + color: rgb(177, 177, 177); +} +.event.empty { + background-color: unset; +} + +.event.start-800 { + grid-row-start: time800; +} +.event.start-900 { + grid-row-start: time900; +} +.event.start-1000 { + grid-row-start: time1000; +} +.event.start-1100 { + grid-row-start: time1100; +} +.event.start-1200 { + grid-row-start: time1200; +} +.event.start-1300 { + grid-row-start: time1300; +} +.event.start-1400 { + grid-row-start: time1400; +} +.event.start-1500 { + grid-row-start: time1500; +} +.event.start-1600 { + grid-row-start: time1600; +} +.event.start-1700 { + grid-row-start: time1700; +} +.event.start-1800 { + grid-row-start: time1800; +} +.event.start-1900 { + grid-row-start: time1900; +} +.event.start-2000 { + grid-row-start: time2000; +} +.event.start-2100 { + grid-row-start: time2100; +} +.event.end-800 { + grid-row-end: time800; +} +.event.end-900 { + grid-row-end: time900; +} +.event.end-1000 { + grid-row-end: time1000; +} +.event.end-1100 { + grid-row-end: time1100; +} +.event.end-1200 { + grid-row-end: time1200; +} +.event.end-1300 { + grid-row-end: time1300; +} +.event.end-1400 { + grid-row-end: time1400; +} +.event.end-1500 { + grid-row-end: time1500; +} +.event.end-1600 { + grid-row-end: time1600; +} +.event.end-1700 { + grid-row-end: time1700; +} +.event.end-1800 { + grid-row-end: time1800; +} +.event.end-1900 { + grid-row-end: time1900; +} +.event.end-2000 { + grid-row-end: time2000; +} +.event.end-2100 { + grid-row-end: time2100; +} +.event.length-1 { + grid-column-end: span 1; +} +.event.length-2 { + grid-column-end: span 2; +} +.event.length-3 { + grid-column-end: span 3; +} +.event.length-4 { + grid-column-end: span 4; +} +.event.small { + font-size: 16px; +} + +.event.logistics { + background-color: rgb(147, 29, 141); +} +.event.hacking { + background-color: rgb(53, 53, 199); +} +.event.food { + background-color: #03833b; +} +.event.workshop { + background-color: rgb(109, 40, 194); +} +.event.game { + background-color: rgb(105, 94, 139); +} + + #map-article { margin: 20px auto 0; width: 90%; diff --git a/css/schedule.css b/css/schedule.css deleted file mode 100644 index 967693a..0000000 --- a/css/schedule.css +++ /dev/null @@ -1,202 +0,0 @@ -.schedule-container { - display: grid; - margin: auto; - grid-gap: 0.2rem; - grid-template-columns: 4rem repeat(4, 1fr); - grid-template-rows: repeat(14, 1fr); - grid-template-areas: "time800 stage stage stage stage" "time900 stage stage stage stage" "time1000 stage stage stage stage" "time1100 stage stage stage stage" "time1200 stage stage stage stage" "time1300 stage stage stage stage" "time1400 stage stage stage stage" "time1500 stage stage stage stage" "time1600 stage stage stage stage" "time1700 stage stage stage stage" "time1800 stage stage stage stage" "time1900 stage stage stage stage" "time2000 stage stage stage stage" "time2100 stage stage stage stage"; -} - -/** - * Time - */ -.time { - display: flex; - justify-content: flex-end; - height: 100%; - padding: 0 0.5rem; -} -.time.start-800 { - grid-area: time800; -} -.time.start-900 { - grid-area: time900; -} -.time.start-1000 { - grid-area: time1000; -} -.time.start-1100 { - grid-area: time1100; -} -.time.start-1200 { - grid-area: time1200; -} -.time.start-1300 { - grid-area: time1300; -} -.time.start-1400 { - grid-area: time1400; -} -.time.start-1500 { - grid-area: time1500; -} -.time.start-1600 { - grid-area: time1600; -} -.time.start-1700 { - grid-area: time1700; -} -.time.start-1800 { - grid-area: time1800; -} -.time.start-1900 { - grid-area: time1900; -} -.time.start-2000 { - grid-area: time2000; -} -.time.start-2100 { - grid-area: time2100; -} - -/** - * Event - */ -.event { - display: flex; - justify-content: center; - flex-direction: column; - padding: 0.5rem 1rem; - background-color: orange; - border-radius: 0.2rem; - font-size: 0.8rem; - font-weight: bold; - line-height: 1.4; - border-top: thin solid rgb(68, 68, 68); -} -.event span { - display: block; - width: 100%; - font-size: 0.8em; - font-weight: normal; -} -.event.empty { - background-color: unset; -} - -.event.start-800 { - grid-row-start: time800; -} -.event.start-900 { - grid-row-start: time900; -} -.event.start-1000 { - grid-row-start: time1000; -} -.event.start-1100 { - grid-row-start: time1100; -} -.event.start-1200 { - grid-row-start: time1200; -} -.event.start-1300 { - grid-row-start: time1300; -} -.event.start-1400 { - grid-row-start: time1400; -} -.event.start-1500 { - grid-row-start: time1500; -} -.event.start-1600 { - grid-row-start: time1600; -} -.event.start-1700 { - grid-row-start: time1700; -} -.event.start-1800 { - grid-row-start: time1800; -} -.event.start-1900 { - grid-row-start: time1900; -} -.event.start-2000 { - grid-row-start: time2000; -} -.event.start-2100 { - grid-row-start: time2100; -} -.event.end-800 { - grid-row-end: time800; -} -.event.end-900 { - grid-row-end: time900; -} -.event.end-1000 { - grid-row-end: time1000; -} -.event.end-1100 { - grid-row-end: time1100; -} -.event.end-1200 { - grid-row-end: time1200; -} -.event.end-1300 { - grid-row-end: time1300; -} -.event.end-1400 { - grid-row-end: time1400; -} -.event.end-1500 { - grid-row-end: time1500; -} -.event.end-1600 { - grid-row-end: time1600; -} -.event.end-1700 { - grid-row-end: time1700; -} -.event.end-1800 { - grid-row-end: time1800; -} -.event.end-1900 { - grid-row-end: time1900; -} -.event.end-2000 { - grid-row-end: time2000; -} -.event.end-2100 { - grid-row-end: time2100; -} -.event.length-1 { - grid-column-end: span 1; -} -.event.length-2 { - grid-column-end: span 2; -} -.event.length-3 { - grid-column-end: span 3; -} -.event.length-4 { - grid-column-end: span 4; -} -.event.stage-earth { - background-color: #ffa726; -} -.event.stage-mercury { - background-color: #9ccc65; -} -.event.stage-venus { - background-color: #ff8a65; -} -.event.stage-mars { - background-color: #b3e5fc; -} -.event.stage-jupiter { - background-color: #81d4fa; -} -.event.stage-saturn { - background-color: #26c6da; -} - -/*# sourceMappingURL=schedule.css.map */ diff --git a/css/schedule.css.map b/css/schedule.css.map deleted file mode 100644 index 272289a..0000000 --- a/css/schedule.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sourceRoot":"","sources":["schedule.scss"],"names":[],"mappings":"AAKA;EACC;EACA;EAEA;EACA;EACA,qBACC;;;AAgBF;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;AAGC;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AAIF;EACC;EACA;;;AAIF;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;;AAIA;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AAKD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AAKD;EACC;;AADD;EACC;;AADD;EACC;;AADD;EACC;;AAIF;EACC;;AAED;EACC;;AAED;EACC;;AAED;EACC;;AAED;EACC;;AAED;EACC","file":"schedule.css"} \ No newline at end of file diff --git a/css/schedule.scss b/css/schedule.scss deleted file mode 100644 index 4059dab..0000000 --- a/css/schedule.scss +++ /dev/null @@ -1,109 +0,0 @@ -$blockTimes: 800, 900, 1000, 1100, 1200, 1300, - 1400, 1500, 1600, 1700, 1800, 1900, 2000, - 2100; -$blockLengths: 1, 2, 3, 4; - -.schedule-container { - display: grid; - grid-gap: 0.2rem; - - grid-template-columns: 5rem repeat(4, 1fr); - grid-template-rows: repeat(14, 1fr); - grid-template-areas: - "time800 stage stage stage stage" - "time900 stage stage stage stage" - "time1000 stage stage stage stage" - "time1100 stage stage stage stage" - "time1200 stage stage stage stage" - "time1300 stage stage stage stage" - "time1400 stage stage stage stage" - "time1500 stage stage stage stage" - "time1600 stage stage stage stage" - "time1700 stage stage stage stage" - "time1800 stage stage stage stage" - "time1900 stage stage stage stage" - "time2000 stage stage stage stage" - "time2100 stage stage stage stage" -} - -/** - * Time - */ -.time { - display: flex; - align-items: center; - justify-content: flex-end; - border-top: thin dotted #ccc; - height: 100%; - padding: 0 0.5rem; - - @each $time in $blockTimes { - &.start-#{$time} { - grid-area: time#{$time}; - } - } - - &[class*="30"]:not(.start-1300) { - font-size: 0.8rem; - color: #ccc; - } -} - -/** - * Event - */ -.event { - display: flex; - justify-content: center; - flex-direction: column; - padding: 0.5rem 1rem; - background-color: orange; - border-radius: 0.2rem; - font-size: 0.8rem; - font-weight: bold; - line-height: 1.4; - - span { - display: block; - width: 100%; - font-size: 0.8em; - font-weight: normal; - } - - @each $time in $blockTimes { - &.start-#{$time} { - grid-row-start: time#{$time}; - } - } - - @each $time in $blockTimes { - &.end-#{$time} { - grid-row-end: time#{$time}; - } - } - - @each $length in $blockLengths { - &.length-#{$length} { - grid-column-end: span #{$length}; - } - } - - &.stage-earth { - background-color: #ffa726; - } - &.stage-mercury { - background-color: #9ccc65; - } - &.stage-venus { - background-color: #ff8a65; - } - &.stage-mars { - background-color: #b3e5fc; - } - &.stage-jupiter { - background-color: #81d4fa; - } - &.stage-saturn { - background-color: #26c6da; - } -} diff --git a/img/logo_mini.png b/img/logo_mini.png new file mode 100644 index 0000000..3faa715 Binary files /dev/null and b/img/logo_mini.png differ diff --git a/index.html b/index.html index 1fe36de..3f12d1c 100644 --- a/index.html +++ b/index.html @@ -15,7 +15,6 @@
"Grab a team and make something cool."
- GHacks Team