diff options
| author | Jules Laplace <jules@okfoc.us> | 2015-11-22 22:25:39 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2015-11-22 22:25:39 -0500 |
| commit | 4ae4be56b03eedc20a0f9ac65c970d4c426a8cb6 (patch) | |
| tree | d72782a812e848bc7689cc06f0e97b76e12ffffb | |
| parent | afde9fd65fd6221b47504cc2c32d7f80c8654aa4 (diff) | |
| parent | 2a1512a57e2eb98a2e6d95094c49a90de09019cf (diff) | |
Merge branch 'master' of github.com:okfocus/stone-island
| -rw-r--r-- | StoneIsland/www/css/blogs.css | 13 | ||||
| -rw-r--r-- | StoneIsland/www/css/nav.css | 2 | ||||
| -rw-r--r-- | StoneIsland/www/index.html | 22 |
3 files changed, 29 insertions, 8 deletions
diff --git a/StoneIsland/www/css/blogs.css b/StoneIsland/www/css/blogs.css index c8a04a1c..239e99bf 100644 --- a/StoneIsland/www/css/blogs.css +++ b/StoneIsland/www/css/blogs.css @@ -186,4 +186,17 @@ ul.links { padding:0; font-weight:bold; font-size:14px; +} + +/* NOTE: not really sure how this is going to work on the archive page + based on the pdf mockup */ + +.archive .above { + width:calc(100vw - 80px); + box-sizing:border-box; + margin:0 auto; +} + +.archive h2 { +font-size:32px }
\ No newline at end of file diff --git a/StoneIsland/www/css/nav.css b/StoneIsland/www/css/nav.css index eb5451bc..baed216f 100644 --- a/StoneIsland/www/css/nav.css +++ b/StoneIsland/www/css/nav.css @@ -79,7 +79,7 @@ font-size: 14px; letter-spacing:1.25px; color: #bbb; - padding: 4px 0 5px 20px + padding: 4px 0 7px 20px } #nav .social { diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index e300683f..894565f8 100644 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -110,6 +110,7 @@ </div> <div id="footer"> + <!-- 'Cancel' i think needs to go BACK in the navigation.. rather than jumping to the home screen --> <div class="cancel">CANCEL</div> <div class="ok">OK</div> </div> @@ -308,9 +309,13 @@ <div id="logout"> <div class="scroll"> <h1>LOGOUT</h1> - <span class="msg"> - You are now logged out. - </span> + <div class="container"> + <div class="container-fill"> + <span class="container-message msg"> + You are now logged out. + </span> + </div> + </div> </div> </div> @@ -324,7 +329,8 @@ <input type="text" name="Surname" placeholder="LAST NAME" required> <input type="email" name="Email" placeholder="EMAIL ADDRESS" required> <input type="email" name="ConfirmEmail" placeholder="CONFIRM EMAIL ADDRESS" required> - <input type="date" name="Birthday" placeholder="BIRTHDAY" required> + <!-- NOTE: mm/dd/yyyy is pushed over to the left because of the dropdown arrow --> + <input type="text" onfocus="(this.type='date')" name="Birthday" placeholder="BIRTHDAY (MM/DD/YYYY)" required> <div class="select-wrapper"> <span>GENDER</span> @@ -651,10 +657,12 @@ <script type="text/html" id="creditcard_template"> <input type="text" name="Number" placeholder="CREDIT CARD NUMBER" required> <div class="half-input"> - <input type="number" name="ExpirationMonth" placeholder="EXPIRATION MONTH" required> - <input type="number" name="ExpirationYear" placeholder="EXPIRATION YEAR" required> - <input type="number" name="CVV" placeholder="SECURITY CODE" required> + <!-- NOTE text shifted to the left because of dropdown arrow --> + <input type="text" onfocus="(this.type='number')" name="ExpirationMonth" placeholder="EXPIRATION MONTH" required> + <input type="text" onfocus="(this.type='number')" name="ExpirationYear" placeholder="EXPIRATION YEAR" required> </div> + <!-- NOTE text shifted to the left because of dropdown arrow --> + <input type="text" onfocus="(this.type='number')" name="CVV" placeholder="SECURITY CODE" required> <span class="address"></span> </script> |