This repository was archived by the owner on Sep 28, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Feature/mvp #1
Open
jarmstrng
wants to merge
6
commits into
master
Choose a base branch
from
feature/mvp
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feature/mvp #1
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a283950
MVP-est landing page changes
jarmstrng e7744ce
Add Readme
jarmstrng 05c4dec
Add background image to landing page
deweydell b07af4b
Fix typo for sponsors class
deweydell 70da857
Add custom brand colors
deweydell d54e85e
Add sponsors widget to index page
deweydell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| # 2017.writespeakcode.com | ||
| 2017 Conference Website | ||
|
|
||
| ## Contributing | ||
|
|
||
| Please take a look at our [contributing](CONTRIBUTE.md) guidelines (coming soon!). | ||
|
|
||
| We have volunteers who work on our website to make sure it is up-to-date for all of our events. You are welcome to work on it too! | ||
|
|
||
| ## Installation | ||
|
|
||
| 1. `git clone https://github.com/WriteSpeakCode/2017_conf.git` | ||
| 1. Open `index_countdown.html` in your favorite browser | ||
| 1. Profit! | ||
|
|
||
| ## Create a pull request | ||
|
|
||
| - Create changes on a feature branch | ||
| - Submit a pull request to the `master` branch | ||
| - Ping `@jarmstrng` in a comment | ||
|
|
||
| ## Publish | ||
|
|
||
| Coming soon! | ||
|
|
||
| <!-- Our site is deployed to Heroku. If you have rights, you can publish | ||
| the site there. | ||
|
|
||
| 1. Ensure that your remote names match this guide. `upstream` = the official repository | ||
| and if you have a fork, it should be named `origin`. | ||
|
|
||
| ``` | ||
| $ git remote -vv | ||
|
|
||
| origin [email protected]:<yourname>/2016.writespeakcode.com.git (fetch) | ||
| origin [email protected]:<yourname>/2016.writespeakcode.com.git (push) | ||
| upstream [email protected]:WriteSpeakCode/2016.writespeakcode.com.git (fetch) | ||
| upstream [email protected]:WriteSpeakCode/2016.writespeakcode.com.git (push) | ||
| ``` | ||
|
|
||
| If yours don't match above, use `git remote rename <oldname> <newname>` to fix it. | ||
|
|
||
| 2. Add the Heroku staging and production apps as remotes to your localhost | ||
| git repository: | ||
|
|
||
| ``` | ||
| git remote add staging https://git.heroku.com/writespeakcode2016-staging.git | ||
| git remote add production https://git.heroku.com/writespeakcode2016-production.git | ||
| ``` | ||
|
|
||
| 3. Ensure that your master branch is in sync with the upstream GitHub repository, | ||
| and not your fork. If you run into trouble with this, ask on Slack for help. | ||
|
|
||
| You should see that master is tracking `[upstream/master]`. | ||
|
|
||
| ``` | ||
| $ git checkout master | ||
| $ git branch -vv | ||
|
|
||
| * master 5194208 [upstream/master] | ||
| ``` | ||
|
|
||
| 4. Ensure that what you are about to push to Heroku is already synchronized to GitHub. | ||
|
|
||
| You should see that your branch is up to date with `upstream/master`. | ||
| ``` | ||
| $ git checkout master | ||
| $ git status | ||
|
|
||
| Your branch is up-to-date with 'upstream/master' | ||
| ``` | ||
|
|
||
| 5. Push to the Heroku staging: | ||
|
|
||
| ``` | ||
| git push staging master | ||
| ``` | ||
|
|
||
| 6. Verify that the staging site looks right: https://writespeakcode2016-staging.herokuapp.com/ | ||
|
|
||
| 7. Push to Heroku production: | ||
|
|
||
| ``` | ||
| git push production master | ||
| ``` | ||
|
|
||
| 8. View the production website at: http://2016.writespeakcode.com/ --> | ||
|
|
||
| ## License | ||
|
|
||
| The code is available under the [MIT license](MIT-LICENSE). | ||
|
|
||
| ## Tips | ||
|
|
||
| [Eventicka II theme documentation](https://github.com/WriteSpeakCode/2017-raw-template/blob/master/documentation/index.html) | ||
|
|
||
| To hide or unhide an element, use `.hidden`. | ||
|
|
||
| Make updates to styling in `custom.css`. | ||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,19 +3,20 @@ | |
| <head> | ||
| <!-- ## SITE META ## --> | ||
| <meta charset="utf-8"> | ||
| <title>Eventicka II</title> | ||
| <title>2017 Write/Speak/Code Conference</title> | ||
| <meta name="description" content=""> | ||
| <meta name="author" content=""> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> | ||
| <link rel="shortcut icon" href="./includes/img/placeholder/favicon.ico"> | ||
|
|
||
| <!-- ## LOAD STYLSHEETS ## --> | ||
| <link rel="stylesheet" media="all" href="./assets/css/style.css"/> | ||
|
|
||
| <link rel="stylesheet" media="all" href="./assets/css/custom.css"/> | ||
|
|
||
| <!-- ## GOOGLE FONTS ## --> | ||
| <link href='https://fonts.googleapis.com/css?family=Titillium+Web:200,400' rel='stylesheet' type='text/css'> | ||
| <link href='https://fonts.googleapis.com/css?family=Dosis:300,500' rel='stylesheet' type='text/css'> | ||
|
|
||
| </head> | ||
|
|
||
| <body class="home static"> | ||
|
|
@@ -45,29 +46,29 @@ <h4>NAvigation</h4> | |
| </div> | ||
| </aside> | ||
| <!-- ## SITE NAV END ## --> | ||
|
|
||
| <!-- ## PRIMARY HEADER ## --> | ||
| <header id="qcHeader"> | ||
| <div class="qcContainer clearfix"> | ||
| <div id="qcNavLogo" class="col-6 col"> | ||
| <a href="index.html"> | ||
| <img src="./assets/img/placeholder/logo_white.png" alt="LOGO" /> | ||
| <a href="http://www.writespeakcode.com" target="_blank"> | ||
| <img src="./assets/img/WSClogos_stacked_coral-blush-gold_screen.png" width="200" alt="LOGO" /> | ||
| </a> | ||
| </div> | ||
| <div class="col-6 col"> | ||
| <div id="qcOpenNav" class="tips" title="NAVIGATION"></div> | ||
| <div id="qcOpenNav" class="tips hidden" title="NAVIGATION"></div> | ||
| </div> | ||
| </div> | ||
| </header> | ||
|
|
||
| <!-- ## FULLSCREEN SLIDES ## --> | ||
| <section id="slideContent"> | ||
|
|
||
| <!-- ## SLIDE TEXT ## --> | ||
| <div id="qcSlideText"> | ||
| <h1 id="slidecaption">Eventicka 2016 is here</h1> | ||
| <p id="slidedesc">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Enim, ut, autem, minima dolorum nemo corporis dolorem impedit deserunt error mollitia labore minus</p> | ||
| <h1 id="slidecaption">Write/Speak/Code 2017 conference is here</h1> | ||
| <p id="slidedesc">Join us for 4 intense days of workshops, seminars, and talks. Let's build the blueprint that will take your career to the next level!</p> | ||
|
||
|
|
||
| <!-- ## COUNTDOWN TIMER ## --> | ||
| <div id="qcCountdown" class="clearfix"> | ||
| <!-- ## DAYS ## --> | ||
|
|
@@ -104,23 +105,23 @@ <h1 id="slidecaption">Eventicka 2016 is here</h1> | |
| <div class="dash_title"><span>seconds</span></div> | ||
| </div> | ||
| </div> | ||
| <!-- ## COUNTDOWN TIMER END ## --> | ||
| <!-- ## COUNTDOWN TIMER END ## --> | ||
|
|
||
| <a id="slidelink" href="https://ti.to/write-speak-code/2017-conference/" target="_blank" class="qcTargetLink video">Buy Tickets</a> | ||
|
|
||
| <a id="slidelink" href="#" class="qcTargetLink video">Enter site</a> | ||
|
|
||
| </div> | ||
|
|
||
| </section> | ||
| <!-- ## FULLSCREEN SLIDES ## --> | ||
| <!-- ## FULLSCREEN SLIDES ## --> | ||
|
|
||
|
|
||
| <!-- ## LOAD JAVASCRIPTS ## --> | ||
| <script src="./assets/js/2.2.2.jquery.min.js" type="text/javascript"></script> | ||
| <script src="./assets/js/countdown.js" type="text/javascript"></script> | ||
| <script src="./assets/js/owl.carousel.min.js" type="text/javascript"></script> | ||
| <script src="./assets/js/library.js" type="text/javascript"></script> | ||
| <script src="./assets/js/init.js" type="text/javascript"></script> | ||
| <script src="./assets/js/init.js" type="text/javascript"></script> | ||
|
|
||
| </body> | ||
|
|
||
| </html> | ||
| </html> | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lateesha would also like us to remove the words "is here" to the header