Making good progress so far

csvalpha · Feb 24, 2021 · 1efd4d7 · 1efd4d7
1 parent e661d10
commit 1efd4d7
Show file tree

Hide file tree

Showing 48 changed files with 809 additions and 717 deletions.
diff --git a/images/logo.svg → 2020/images/logo.svg b/images/logo.svg → 2020/images/logo.svg
diff --git a/2020/images/ozoncongres_header.png b/2020/images/ozoncongres_header.png
diff --git a/...6506630989efd3e368ca4d91aff3b1c/app.sassc → ...6506630989efd3e368ca4d91aff3b1c/app.sassc b/...6506630989efd3e368ca4d91aff3b1c/app.sassc → ...6506630989efd3e368ca4d91aff3b1c/app.sassc
diff --git a/...6630989efd3e368ca4d91aff3b1c/footer.sassc → ...6630989efd3e368ca4d91aff3b1c/footer.sassc b/...6630989efd3e368ca4d91aff3b1c/footer.sassc → ...6630989efd3e368ca4d91aff3b1c/footer.sassc
diff --git a/...6630989efd3e368ca4d91aff3b1c/header.sassc → ...6630989efd3e368ca4d91aff3b1c/header.sassc b/...6630989efd3e368ca4d91aff3b1c/header.sassc → ...6630989efd3e368ca4d91aff3b1c/header.sassc
diff --git a/...506630989efd3e368ca4d91aff3b1c/main.sassc → ...506630989efd3e368ca4d91aff3b1c/main.sassc b/...506630989efd3e368ca4d91aff3b1c/main.sassc → ...506630989efd3e368ca4d91aff3b1c/main.sassc
diff --git a/...6506630989efd3e368ca4d91aff3b1c/nav.sassc → ...6506630989efd3e368ca4d91aff3b1c/nav.sassc b/...6506630989efd3e368ca4d91aff3b1c/nav.sassc → ...6506630989efd3e368ca4d91aff3b1c/nav.sassc
diff --git a/...06630989efd3e368ca4d91aff3b1c/style.sassc → ...06630989efd3e368ca4d91aff3b1c/style.sassc b/...06630989efd3e368ca4d91aff3b1c/style.sassc → ...06630989efd3e368ca4d91aff3b1c/style.sassc
diff --git a/...06630989efd3e368ca4d91aff3b1c/style.scssc → ...06630989efd3e368ca4d91aff3b1c/style.scssc b/...06630989efd3e368ca4d91aff3b1c/style.scssc → ...06630989efd3e368ca4d91aff3b1c/style.scssc
diff --git a/...0989efd3e368ca4d91aff3b1c/variables.sassc → ...0989efd3e368ca4d91aff3b1c/variables.sassc b/...0989efd3e368ca4d91aff3b1c/variables.sassc → ...0989efd3e368ca4d91aff3b1c/variables.sassc
diff --git a/css/app.css → 2020/old_css/app.css b/css/app.css → 2020/old_css/app.css
diff --git a/css/app.css.map → 2020/old_css/app.css.map b/css/app.css.map → 2020/old_css/app.css.map
diff --git a/2020/old_css/app.sass b/2020/old_css/app.sass
@@ -0,0 +1,40 @@
+body
+  margin: 0
+  font-family: "MyriadPro", serif
+  color: $color-secondary
+  overflow-x: hidden
+
+h1, h2, h3, h4, h5, h6
+  letter-spacing: 2px
+  text-transform: uppercase
+
+p, ul, ol
+  font-size: 20px
+
+article, aside
+  max-width: 900px
+  margin: 0 auto 15px
+
+.button
+  border: none
+  padding: 5px 20px
+  background-color: $color-secondary
+  color: $white
+  text-decoration: none
+
+  &:hover
+    scale: 105%
+
+.aside-components
+  display: flex
+  justify-content: space-between
+  flex-wrap: wrap
+
+  .aside-component
+    width: 30%
+
+    +breakpoint(small)
+      width: 48%
+
+    +breakpoint(mobile)
+      width: 100%
diff --git a/2020/old_css/footer.css b/2020/old_css/footer.css
diff --git a/css/footer.css.map → 2020/old_css/footer.css.map b/css/footer.css.map → 2020/old_css/footer.css.map
diff --git a/2020/old_css/footer.sass b/2020/old_css/footer.sass
@@ -0,0 +1,15 @@
+footer
+  background-color: $color-secondary
+  color: $white
+  display: flex
+  justify-content: center
+
+  p
+    font-size: 15px
+
+  a
+    color: $white
+    text-decoration: none
+
+    &:hover
+      color: $color-primary
diff --git a/2020/old_css/header.css b/2020/old_css/header.css
diff --git a/css/header.css.map → 2020/old_css/header.css.map b/css/header.css.map → 2020/old_css/header.css.map
diff --git a/2020/old_css/header.sass b/2020/old_css/header.sass
@@ -0,0 +1,26 @@
+header
+  background-color: $color-primary
+  height: calc(100vh - 80px)
+  padding: 10px 0
+  margin-top: 80px
+  overflow: hidden
+  position: relative
+  display: flex
+  align-items: center
+  justify-content: center
+
+  .header-logo
+    max-width: 100%
+    max-height: 80vh
+
+  +breakpoint(tablet)
+    margin-top: 64px
+    height: calc(100vh - 64px)
+
+  +breakpoint(mobile)
+    margin-top: 48px
+    height: calc(90vh - 48px)
+
+  +breakpoint(narrow)
+    margin-top: 48px
+    height: calc(80vh - 48px)
diff --git a/css/main.css → 2020/old_css/main.css b/css/main.css → 2020/old_css/main.css
diff --git a/css/main.css.map → 2020/old_css/main.css.map b/css/main.css.map → 2020/old_css/main.css.map
diff --git a/2020/old_css/main.sass b/2020/old_css/main.sass
@@ -0,0 +1,97 @@
+main
+  .main-row
+    padding: 25px
+
+    &.row-primary
+      background-color: $color-primary
+
+      h1, h2, h3, h4, h5, h6, p
+        color: $white
+
+    &.row-white
+      background-color: $white
+
+      h3
+        color: $black
+
+  .aside-enroll
+    margin-bottom: 0
+
+    .enroll-text
+      font-size: 30px
+
+    .button
+      float: right
+      font-size: 25px
+
+    +breakpoint(small)
+      text-align: center
+      .enroll-text
+        display: inline-block
+        width: 100%
+        margin-bottom: 10px
+      .button
+        float: none
+
+  article h1
+    +breakpoint(small)
+      font-size: 20px
+
+    +breakpoint(mobile)
+      font-size: 15px
+
+  .aside-video
+    position: relative
+    height: 550px
+    overflow-x: hidden
+
+    +breakpoint(tablet)
+      height: 0
+      padding-bottom: 56.25%
+      max-width: calc(100% - 50px)
+
+    iframe
+      position: absolute
+      top: 0
+      left: 0
+      width: 100%
+      height: 100%
+
+  .aside-program
+    ul
+      list-style: none
+      padding: 0
+
+  .aside-workshops
+    .aside-component h3
+      color: $color-secondary
+
+  .aside-association, .aside-address
+    text-align: center
+    margin-bottom: 0
+
+    h3, h4
+      margin: 0
+
+    a
+      text-decoration: none
+
+  .aside-association
+    color: $black
+
+  .aside-address
+    .link-address
+      color: $white
+
+      &:hover
+        color: $white
+
+    .link-mail
+      color: $color-secondary
+
+      +breakpoint(mobile)
+        font-size: 10px
+
+      &:hover
+        color: $color-secondary
+
diff --git a/2020/old_css/nav.css b/2020/old_css/nav.css
diff --git a/css/nav.css.map → 2020/old_css/nav.css.map b/css/nav.css.map → 2020/old_css/nav.css.map
diff --git a/2020/old_css/nav.sass b/2020/old_css/nav.sass
@@ -0,0 +1,27 @@
+nav
+  position: fixed
+  top: 0
+  left: 0
+  width: 100%
+  background-color: $color-secondary
+  font-size: 25px
+  letter-spacing: 1px
+  padding: 25px
+  box-sizing: border-box
+  z-index: 100
+
+  +breakpoint(tablet)
+    font-size: 20px
+    padding: 20px
+
+  +breakpoint(mobile)
+    font-size: 15px
+    padding: 15px
+
+  .nav-brand
+    color: $black
+    text-decoration: none
+
+  .nav-date
+    float: right
+    color: $black
diff --git a/2020/old_css/style.css b/2020/old_css/style.css
@@ -0,0 +1,18 @@
+/* Error: Undefined variable.
+ *   ,
+ * 4 |   color: $color-secondary
+ *   |          ^^^^^^^^^^^^^^^^
+ *   '
+ *   app.sass 4:10   @import
+ *   style.sass 2:9  root stylesheet */
+
+body::before {
+  font-family: "Source Code Pro", "SF Mono", Monaco, Inconsolata, "Fira Mono",
+      "Droid Sans Mono", monospace, monospace;
+  white-space: pre;
+  display: block;
+  padding: 1em;
+  margin-bottom: 1em;
+  border-bottom: 2px solid black;
+  content: "Error: Undefined variable.\a   \2577 \a 4 \2502    color: $color-secondary\a   \2502           ^^^^^^^^^^^^^^^^\a   \2575 \a   app.sass 4:10   @import\a   style.sass 2:9  root stylesheet";
+}
diff --git a/css/style.css.map → 2020/old_css/style.css.map b/css/style.css.map → 2020/old_css/style.css.map
diff --git a/2020/old_css/style.sass b/2020/old_css/style.sass
@@ -0,0 +1,6 @@
+@import "variables.css"
+@import "app"
+@import "nav.css"
+@import "header.css"
+@import "main"
+@import "footer"
diff --git a/2020/old_css/variables.css b/2020/old_css/variables.css
diff --git a/2020/old_css/variables.css.map b/2020/old_css/variables.css.map
diff --git a/2020/old_css/variables.sass b/2020/old_css/variables.sass
@@ -0,0 +1,18 @@
+$color-primary: #3570b8
+$color-secondary: #f08222
+$color-secondary-transparant: rgba(240, 130, 34, 0.5)
+$color-background: #ffffff
+$white: #ffffff
+$black: #000000
+
+@font-face
+  font-family: "MyriadPro"
+  src: url("../../fonts/MyriadPro-Regular.woff") format("woff")
+  font-style: normal
+  font-weight: normal
+
+$breakpoints: (tablet: "max-width: 900px", small: "max-width: 750px", mobile: "max-width: 500px", narrow: "max-width: 400px")
+
+@mixin breakpoint($key, $media: screen)
+  @media #{$media} and (unquote(map-get($breakpoints, $key)))
+    @content