diff options
| -rw-r--r-- | src/components/competition-element.js | 2 | ||||
| -rw-r--r-- | src/components/mao-competitions.js | 4 | ||||
| -rw-r--r-- | src/components/mao-forums.js | 2 | ||||
| -rw-r--r-- | src/components/mao-home.js | 62 | ||||
| -rw-r--r-- | src/components/mao-tutoring.js | 2 |
5 files changed, 55 insertions, 17 deletions
diff --git a/src/components/competition-element.js b/src/components/competition-element.js index 2da6db5..b3a34f5 100644 --- a/src/components/competition-element.js +++ b/src/components/competition-element.js @@ -84,7 +84,7 @@ class CompetitionElement extends LitElement { } registerComp() { - if(confirm('Are you sure you want to register for ' + this.name.replace(/[0-9]/g, '') + 'regional?')) { + if(confirm('Are you sure you want to register for ' + this.name.replace(/[0-9]/g, '') + ' regional?')) { this.dispatchEvent(new CustomEvent('register-comp')); } } diff --git a/src/components/mao-competitions.js b/src/components/mao-competitions.js index ce43002..9dedca6 100644 --- a/src/components/mao-competitions.js +++ b/src/components/mao-competitions.js @@ -161,8 +161,6 @@ class MaoCompetitions extends connect(store)(PageViewElement) { <div class="card-content"> <h2 class="underline">Nationals</h2> <p class="footer-comp">July</p> - <p>This competition includes schools from many different states. - filler filler filler filler filler filler filler filler filler</p> </div> <div class="card-actions" hidden="${!props.signedIn}"> @@ -198,8 +196,6 @@ class MaoCompetitions extends connect(store)(PageViewElement) { <div class="card-content"> <h2 class="underline">States</h2> <p class="footer-comp">April 11-14</p> - <p>This competition includes schools from many different regions in Florida. - filler filler filler filler filler filler filler filler filler</p> </div> <div class="card-actions" hidden="${!props.signedIn}"> diff --git a/src/components/mao-forums.js b/src/components/mao-forums.js index d4bee3c..0b2a4af 100644 --- a/src/components/mao-forums.js +++ b/src/components/mao-forums.js @@ -59,7 +59,7 @@ class MaoForums extends connect(store)(PageViewElement) { word-break: break-all; } - .card-content > h3, p { + .card-content > h3 { word-break: break-all; } diff --git a/src/components/mao-home.js b/src/components/mao-home.js index 5238319..9f8daf4 100644 --- a/src/components/mao-home.js +++ b/src/components/mao-home.js @@ -22,6 +22,23 @@ class MaoHome extends PageViewElement { return html` ${SharedStyles} + <style> + paper-card { + width: 100%; + } + + .home-grid { + display: grid; + grid-gap: 1px; + grid-template-columns: 1fr; + } + + @media (min-width: 460px) { + .home-grid { + grid-template-columns: 1fr 1fr; + } + </style> + <section class="img-section"> <div class="container"> <img src="http://www.advancedroofingandsheetmetal.com/wp-content/uploads/2016/02/community-school-naples.jpg" alt="Maths"> @@ -29,17 +46,42 @@ class MaoHome extends PageViewElement { </div> </section> - <section class="img-section"> - <div class="container"> - <img src="https://i.imgur.com/BkbHV33.jpg" alt="Maths"> - <div class="centered">Because... Math Is Beautiful</div> - </div> - </section> + <section> + <div class="home-grid"> + <paper-card elevation=0> + <div class="card-content"> + <h2 class="underline"> + Announcements + </h2> + <p> + Welcome to the beta release of the website. We have high hopes for this website. + </p> + <p> + If you haven't yet, please add this to your home screen. It will act like an app. Cool! + </p> + </div> + </paper-card> - <section class="img-section"> - <div class="container"> - <img src="https://nerdymamma.com/wp-content/uploads/2017/01/Six-Simple-Phrases-to-Encourage-Girls-to-Love-Science-Math-3.jpg" alt="Maths"> - <div class="centered">CSN Encourages Math Through MAØ</div> + <paper-card elevation=0> + <div class="card-content"> + <h2 class="underline"> + Meeting Dates + </h2> + <p> + We will meet once a week on an undecided date. + </p> + </div> + + <div class="card-actions"> + <div> + <h3>Upcoming Dates</h3> + <ul> + <li>Club Presentations:\tSeptember 5th</li> + <li>Club Fair (Sign Up!):\tSeptember 6th</li> + </ul> + </div> + </div> + </paper-card> </div> </section> `; diff --git a/src/components/mao-tutoring.js b/src/components/mao-tutoring.js index 77454e5..08bdef5 100644 --- a/src/components/mao-tutoring.js +++ b/src/components/mao-tutoring.js @@ -275,7 +275,7 @@ class MaoTutoring extends connect(store)(PageViewElement) { <div role="listbox"> <paper-icon-item> <iron-icon icon="communication:call" slot="item-icon"></iron-icon> - (440)-256-1593 + (813) 458-9988 </paper-icon-item> <a class="paper-item-link" href="mailto:mbinkowski2020@communityschoolnaples.org" tabindex="-1"> <paper-icon-item> |