Skip to content

Commit

Permalink
Merge pull request #156 from cypress-io/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
Jennifer Shehane authored Oct 20, 2017
2 parents c0f6299 + 4930ae9 commit 392d028
Show file tree
Hide file tree
Showing 8 changed files with 540 additions and 61 deletions.
2 changes: 1 addition & 1 deletion source/faq/questions/general-questions-faq.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ No. But if you're wanting to test parts of your application that are not easily

No. In fact Cypress' architecture is very different from Selenium in a few critical ways:

- Cypress runs in the context of the browser. With Cypress it's much easier to accurately test the browser, but harder to talk to the outside work. In Selenium it's the exact opposite, it runs outside of the browser where your application is running. Although Cypress has a few commands that give you access to the outside world - like {% url `cy.request()` request %} and {% url `cy.exec()` exec %}.
- Cypress runs in the context of the browser. With Cypress it's much easier to accurately test the browser, but harder to talk to the outside world. In Selenium it's the exact opposite, it runs outside of the browser where your application is running. Although Cypress has a few commands that give you access to the outside world - like {% url `cy.request()` request %} and {% url `cy.exec()` exec %}.
- With Selenium - aka WebDriver, you either get 100% simulated events (with Selenium RC) or you got 100% native events with Selenium WebDriver. However, with Cypress, you actually get both. For the most part we use simulated events; We can reproduce them with nearly 100% fidelity, they are much faster, and guaranteed to work the same way every time. However we do use automation API's for things like Cookies where we extend outside of the JavaScript sandbox and interact with the underlying browser API's. This gives us flexibility to determine which type of event to use in specific situations. We've yet to add native input events though.

## {% fa fa-angle-right %} If Cypress runs in the browser, doesn't that mean it's sandboxed?
Expand Down
1 change: 1 addition & 0 deletions themes/cypress/layout/partial/after_footer.swig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
{{ js('js/toc') }}
{{ js('js/mobile_nav') }}
{{ js('js/ac_tracking') }}
{{ js('js/form_ac') }}
{% if config.algolia[page.lang] %}
<!-- Algolia -->
{{ js('js/vendor/docsearch') }}
Expand Down
115 changes: 95 additions & 20 deletions themes/cypress/layout/partial/footer.swig
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,110 @@
<footer id="footer" class="wrapper">
<footer class="wrapper">
<div class="inner">
<div class="bottom">
<div class="row">
<div id="footer-copyright">
&copy; {{ moment(Date.now()).year() }} {{ config.author }}
<div class="top">
<div class="footer-nav">
<h5>Get Started</h5>
<ul>
<li>
<a href="https://on.cypress.io/why-cypress">Why Cypress</a>
</li>
<li>
<a href="https://on.cypress.io/installing-cypress">Install Cypress</a>
</li>
<li>
<a href="https://on.cypress.io/writing-your-first-test">Write your first test</a>
</li>
<li>
<a href="https://on.cypress.io/testing-your-app">Test your app</a>
</li>
</ul>
</div>
<div class="footer-nav">
<h5>Support</h5>
<ul>
<li>
<a href="https://docs.cypress.io">Documentation</a>
</li>
<li>
<a href="https://on.cypress.io/chat">Chat</a>
</li>
<li>
<a href="https://on.cypress.io/faq">FAQ</a>
</li>
<li>
<a href="https://on.cypress.io/examples">Examples</a>
</li>
</ul>
</div>
<div class="footer-nav">
<h5>Developers</h5>
<ul>
<li>
<a href="https://github.com/cypress-io/cypress">Github repo</a>
</li>
<li>
<a href="https://on.cypress.io/contributing">Contribute</a>
</li>
<li>
<a href="https://on.cypress.io/changelog">Changelog</a>
</li>
<li>
<a href="https://on.cypress.io/roadmap">Roadmap</a>
</li>
</ul>
</div>
<div id="footer-social">
<ul class="list-unstyled list-inline">
<div class="footer-nav">
<h5>Company</h5>
<ul>
<li>
<a href="https://www.cypress.io/about">About</a>
</li>
<li>
<a class="footer-link" href="https://github.com/{{ config.github_main_repo }}">
<i class="fa fa-github" title="Github Repo"></i>
</a>
<a href="https://www.cypress.io/jobs">Jobs</a>
</li>
<li>
<a class="footer-link" href="https://twitter.com/{{ config.twitter_username }}">
<i class="fa fa-twitter" title="@{{ config.twitter_username }}"></i>
</a>
<a href="https://on.cypress.io/terms-of-use">Terms</a>
</li>
<li>
<a class="footer-link" href="https://facebook.com/{{ config.facebook_username }}">
<i class="fa fa-facebook" title="Facebook"></i>
</a>
<a href="https://on.cypress.io/privacy-policy">Privacy</a>
</li>
<li>
<a href="mailto:{{ config.email }}">
<i class="fa fa-envelope" title="Email us"></i>
</a>
<a href="https://on.cypress.io/blogs-media">Media</a>
</li>
</ul>
</div>
<div class="footer-form">
<h5>Send updates to my inbox</h5>
{{ partial('partial/subscribe-form') }}
<div id="footer-social">
<ul class="list-unstyled list-inline">
<li>
<a href="https://github.com/{{ config.github_main_repo }}">
<i class="fa fa-github" title="Github Repo"></i>
</a>
</li>
<li>
<a href="https://twitter.com/{{ config.twitter_username }}">
<i class="fa fa-twitter" title="@{{ config.twitter_username }}"></i>
</a>
</li>
<li>
<a href="https://facebook.com/{{ config.facebook_username }}">
<i class="fa fa-facebook" title="Facebook"></i>
</a>
</li>
<li>
<a href="mailto:{{ config.email }}">
<i class="fa fa-envelope" title="Email us"></i>
</a>
</li>
</ul>
</div>
</div>
</div>
<div class="bottom">
<p id="footer-copyright">
&copy; {{ moment(Date.now()).year() }} {{ config.author }}
</p>
</div>
</div>
</div>
</footer>
2 changes: 1 addition & 1 deletion themes/cypress/layout/partial/header.swig
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<header id="header" class="wrapper">
<div id="header-inner" class="inner">
<h1 id="logo-wrap">
<a href="/" id="logo">
<a href="https://www.cypress.io" id="logo">
<img src="/{{ config.logo }}" alt="Cypress"/>
</a>
</h1>
Expand Down
23 changes: 23 additions & 0 deletions themes/cypress/layout/partial/subscribe-form.swig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<div class="ac-footer-form">
<form method="POST" action="https://cypressio.activehosted.com/proc.php" id="_form_1019_" class="form-horizontal" novalidate>
<input type="hidden" name="u" value="1019" />
<input type="hidden" name="f" value="1019" />
<input type="hidden" name="s" />
<input type="hidden" name="c" value="0" />
<input type="hidden" name="m" value="0" />
<input type="hidden" name="act" value="sub" />
<input type="hidden" name="v" value="2" />
<div class="_form-content form-group">
<input class="form-control input-md required email" type="text" name="email" placeholder="Your email address" required/>
<div>
<button id="_form_1019_submit" class="input-md button btn btn-success btn-block" type="submit">
Subscribe
</button>
</div>
<div class="_clear-element">
</div>
</div>
<div class="_form-thank-you" style="display:none;">
</div>
</form>
</div>
140 changes: 102 additions & 38 deletions themes/cypress/source/css/_partial/footer.scss
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,41 @@
#footer {
padding: 10px 0 15px;
color: $white_60;
font-family: $font-title;
footer.wrapper {
color: #fff;
position: relative;
background: $color-background;
text-align: center;
font-size: 14px;
clear: both;
flex-shrink: 0; /* Prevent Chrome, Opera, and Safari from letting these items shrink to smaller than their content's default minimum size. */

&:before {
content: "";
display: table;
input.form-control {
background-color: #fff;
border: 1px solid #ddd;
padding: 12px;
height: 36px;
font-size: 1em;
margin-bottom: 10px;
border-radius: 10px;
margin-right: 10px;
font-size: 0.9em;

&:focus {
box-shadow: none;
border: 1px solid darken(white, 50%);
}
}

&:after {
content: "";
display: table;
clear: both;
.btn-success {
border-radius: 20px;
padding: 10px 20px;
color: white;
border: 0;
font-size: 0.9em;
font-weight: bold;
background-color: $color-green;
border-color: $color-green;

&:hover, &:focus, &:active, &:active:hover {
color: white;
background-color: darken($color-green, 5%);
border-color: darken($color-green, 5%);
}
}

a {
Expand All @@ -28,42 +47,87 @@
}
}

.bottom {
color: #878B97;
font-weight: 300;
padding-top: 20px;
overflow: auto;
.top {
padding: 40px 0;
color: #fff;
display: flex;
flex-direction: row;

a {
color: #878B97;
margin-left: 10px;
.footer-nav {
flex: 1 0 0;

}

&:hover {
color: $white;
.footer-form {
flex: 2 0 0
}

#footer-social {
li {
display: inline;
}
}

h5 {
margin-top: 40px;
font-size: 0.95em;
font-weight: bold;
color: #fff;
}

ul {
padding-left: 0;
margin-left: 0;
list-style: none;
-webkit-margin-before: 0;
-webkit-margin-after: 0;
-webkit-margin-start: 0px;
-webkit-margin-end: 0px;
-webkit-padding-start: 0;

i {
font-size: 20px;
a {
font-size: 0.85em;
color: #b2b4b6;
line-height: 2em;

&:hover {
color: $white;
}
}
}

.form-group{
display: flex;
flex-direction: row;
}
}
}
#footer-copyright {
line-height: 1.4;
a {
font-weight: bold;

.bottom {
color: #a2a4a6;
font-weight: 300;
text-align: center;
display: flex;
justify-content: center;
}
}

#footer-social {
float: right;
margin-top: 20px;
a {
color: #b2b4b6;
margin-right: 10px;

ul {
list-style: none;
}
&:hover {
color: $white;
}

li {
float: left;
margin-left: 10px;
i {
font-size: 30px;
}
}
}

#footer-copyright {
margin-bottom: 20px;
font-size: 0.9em;
}
2 changes: 1 addition & 1 deletion themes/cypress/source/css/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $color-default: #444;
$color-border: #e3e3e3;
$color-link: #3B94D9;
$color-link-hover: #0369b3;
$color-background: #24262F;
$color-background: #172432;

$highlight-background: #f7f7f7;
$highlight-current-line: #efefef;
Expand Down
Loading

0 comments on commit 392d028

Please sign in to comment.