start with design implementation

2024-10-31 10:36:53 +00:00 · 2015-06-20 17:13:40 +02:00 · 2015-06-20 17:13:40 +02:00 · b387a67e4f
commit b387a67e4f
parent 190a44e103
20 changed files with 774 additions and 13 deletions
--- a/site/client/assets/sass/_base.scss
+++ b/site/client/assets/sass/_base.scss
@ -0,0 +1,34 @@
+* {
+  padding: 0;
+  box-sizing: border-box;
+}
+
+html,
+body {
+  height: 100%;
+}
+
+body {
+  width: 100%;
+  font-family: 'Titillium Web', sans-serif;
+}
+
+::-moz-selection {
+  background: rgba($main, .99);
+  color: #fff;
+  text-shadow: none;
+}
+
+::selection {
+  background: rgba($main, .99);
+  color: #fff;
+  text-shadow: none;
+}
+
+input, textarea {
+  font-family: 'Titillium Web', sans-serif;
+  outline: 0;
+}
+
+a { text-decoration: none; }
+ul { list-style: none; }
--- a/site/client/assets/sass/_fonts.scss
+++ b/site/client/assets/sass/_fonts.scss
@ -0,0 +1,18 @@
+@font-face {
+  font-family: 'Titillium Web';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Titillium WebLight'), local('TitilliumWeb-Light'), url(http://fonts.gstatic.com/s/titilliumweb/v4/anMUvcNT0H1YN4FII8wpr6YfJ4wTnNoNUCmOpdh16Tg.woff2) format('woff2'), url(http://fonts.gstatic.com/s/titilliumweb/v4/anMUvcNT0H1YN4FII8wpr1uKlGE8-OjkUKWan_M3D6s.woff) format('woff');
+}
+@font-face {
+  font-family: 'Titillium Web';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Titillium Web'), local('TitilliumWeb-Regular'), url(http://fonts.gstatic.com/s/titilliumweb/v4/7XUFZ5tgS-tD6QamInJTceHuglUR2dhBxWD-q_ehMME.woff2) format('woff2'), url(http://fonts.gstatic.com/s/titilliumweb/v4/7XUFZ5tgS-tD6QamInJTcZ_o9VAbKgK36i-4snuAuCM.woff) format('woff');
+}
+@font-face {
+  font-family: 'Titillium Web';
+  font-style: normal;
+  font-weight: 600;
+  src: local('Titillium WebSemiBold'), local('TitilliumWeb-SemiBold'), url(http://fonts.gstatic.com/s/titilliumweb/v4/anMUvcNT0H1YN4FII8wpr6d1JQt-lS5nD-1TJX2NNl0.woff2) format('woff2'), url(http://fonts.gstatic.com/s/titilliumweb/v4/anMUvcNT0H1YN4FII8wprx3QmhlKDgQgT1VN2Ed1WFo.woff) format('woff');
+}
--- a/site/client/assets/sass/_form.scss
+++ b/site/client/assets/sass/_form.scss
@ -0,0 +1,74 @@
+.icon-load {
+  background: url(../img/load.gif) #ca5a07 no-repeat;
+  width: 16px;
+  height: 16px;
+  float: right;
+  margin: 5px -7px 0 7px;
+  display: none;
+}
+
+.form-session {
+  float: left;
+}
+
+.field-session {
+  float: left;
+  padding: 10px 20px;
+  border: 0;
+  color: #8798ac;
+  font-size: 16px;
+  margin: 0 10px 0 0;
+  height: 48px;
+  width: 220px;
+
+  @include secondGradient();
+}
+
+.wrap-btn-action {
+  float: left;
+  padding: 10px 20px;
+  cursor: pointer;
+  height: 48px;
+
+  @include mainGradient();
+}
+
+.btn-action {
+  color: #fff;
+  font-size: 16px;
+  font-weight: 400;
+  border: 0;
+  background: transparent;
+  cursor: pointer;
+
+  float: left;
+  text-transform: uppercase;
+}
+
+.btn-second,
+.btn-none {
+  color: #fff;
+  font-size: 16px;
+  font-weight: 400;
+  border: 0;
+  padding: 10px 20px;
+  float: left;
+  position: relative;
+  cursor: pointer;
+  height: 48px;
+  text-transform: uppercase;
+  text-decoration: none;
+
+  @include secondGradient();
+}
+
+.btn-none {
+  background: transparent;
+  color: #8798ac;
+
+  @include transition(color);
+
+  &:hover {
+    color: #fff;
+  }
+}
--- a/site/client/assets/sass/_landing.scss
+++ b/site/client/assets/sass/_landing.scss
@ -0,0 +1,51 @@
+body.landing {
+  background: url(../img/landing-bg.jpg) center top no-repeat;
+  background-size: cover;
+}
+
+.wrap-landing {
+  max-width: 900px;
+  margin: 0 auto;
+}
+
+.logo-big {
+  margin: 0 auto;
+  display: block;
+}
+
+.container-landing {
+  float: left;
+  width: 100%;
+  margin: 12% 0 0 0;
+
+  //tablet: 9%
+}
+
+.teaser-landing {
+  text-align: center;
+  font-size: 21px;
+  font-weight: 300;
+  text-shadow: 0 0 10px rgba(#fff, .6);
+  color: #8798ac;
+  line-height: 29pt;
+  cursor: default;
+}
+
+.choose {
+  float: left;
+  color: #8798ac;
+  margin: 10px 30px;
+  cursor: default;
+}
+
+.container-form-landing {
+  margin: 40px 0;
+  opacity: 0;
+
+  &.active {
+    transition: all .4s ease-in-out .2s;
+
+    margin: 60px 0;
+    opacity: 1;
+  }
+}
--- a/site/client/assets/sass/_mixins.scss
+++ b/site/client/assets/sass/_mixins.scss
@ -0,0 +1,27 @@
+$main: #d96f1f;
+
+@mixin mainGradient() {
+  background: #da7020;
+  background: -moz-linear-gradient(left, #da7020 0%, #ca5907 100%);
+  background: -webkit-gradient(linear, left top, right top, color-stop(0%,#da7020), color-stop(100%,#ca5907));
+  background: -webkit-linear-gradient(left, #da7020 0%,#ca5907 100%);
+  background: -o-linear-gradient(left, #da7020 0%,#ca5907 100%);
+  background: -ms-linear-gradient(left, #da7020 0%,#ca5907 100%);
+  background: linear-gradient(to right, #da7020 0%,#ca5907 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#da7020', endColorstr='#ca5907',GradientType=1 );
+}
+
+@mixin secondGradient() {
+  background: #243141;
+  background: -moz-linear-gradient(left, #243141 0%, #334152 100%);
+  background: -webkit-gradient(linear, left top, right top, color-stop(0%,#243141), color-stop(100%,#334152));
+  background: -webkit-linear-gradient(left, #243141 0%,#334152 100%);
+  background: -o-linear-gradient(left, #243141 0%,#334152 100%);
+  background: -ms-linear-gradient(left, #243141 0%,#334152 100%);
+  background: linear-gradient(to right, #243141 0%,#334152 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#243141', endColorstr='#334152',GradientType=1 );
+}
+
+@mixin transition($type: all) {
+  transition: $type .3s ease-in-out 0s;
+}
--- a/site/client/assets/sass/_modal.scss
+++ b/site/client/assets/sass/_modal.scss
@ -0,0 +1,34 @@
+.wrap-modal {
+  max-width: 600px;
+  margin: 0 auto;
+}
+
+.modal {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(14,27,43,.8);
+  z-index: 10;
+  opacity: 0;
+  visibility: hidden;
+
+  &.active {
+    visibility: visible;
+    opacity: 1;
+    transition: all .3s ease-in-out 0s;
+  }
+}
+
+.modal-banner {
+  z-index: 20;
+  background: rgba(6,13,22,.95);
+  width: 100%;
+  color: #fff;
+  padding: 50px 0;
+  margin: 15% 0 0 0;
+  float: left;
+}
--- a/site/client/assets/sass/_normalize.scss
+++ b/site/client/assets/sass/_normalize.scss
@ -0,0 +1,427 @@
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+  font-family: sans-serif; /* 1 */
+  -ms-text-size-adjust: 100%; /* 2 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+  margin: 0;
+}
+
+/* HTML5 display definitions
+   ========================================================================== */
+
+/**
+ * Correct `block` display not defined for any HTML5 element in IE 8/9.
+ * Correct `block` display not defined for `details` or `summary` in IE 10/11
+ * and Firefox.
+ * Correct `block` display not defined for `main` in IE 11.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+  display: block;
+}
+
+/**
+ * 1. Correct `inline-block` display not defined in IE 8/9.
+ * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+ */
+
+audio,
+canvas,
+progress,
+video {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Address `[hidden]` styling not present in IE 8/9/10.
+ * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+ */
+
+[hidden],
+template {
+  display: none;
+}
+
+/* Links
+   ========================================================================== */
+
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+  outline: 0;
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ */
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+ */
+
+b,
+strong {
+  font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari and Chrome.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari, and Chrome.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+  background: #ff0;
+  color: #000;
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9/10.
+ */
+
+img {
+  border: 0;
+}
+
+/**
+ * Correct overflow not hidden in IE 9/10/11.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
+}
+
+/**
+ * Contain overflow in all browsers.
+ */
+
+pre {
+  overflow: auto;
+}
+
+/**
+ * Address odd `em`-unit font size rendering in all browsers.
+ */
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * Known limitation: by default, Chrome and Safari on OS X allow very limited
+ * styling of `select`, unless a `border` property is set.
+ */
+
+/**
+ * 1. Correct color not being inherited.
+ *    Known issue: affects color of disabled elements.
+ * 2. Correct font properties not being inherited.
+ * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  color: inherit; /* 1 */
+  font: inherit; /* 2 */
+  margin: 0; /* 3 */
+}
+
+/**
+ * Address `overflow` set to `hidden` in IE 8/9/10/11.
+ */
+
+button {
+  overflow: visible;
+}
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
+ * Correct `select` style inheritance in Firefox.
+ */
+
+button,
+select {
+  text-transform: none;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+  cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+
+/**
+ * Remove inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+input {
+  line-height: normal;
+}
+
+/**
+ * It's recommended that you don't attempt to style these elements.
+ * Firefox's implementation doesn't respect box-sizing, padding, or width.
+ *
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Fix the cursor style for Chrome's increment/decrement buttons. For certain
+ * `font-size` values of the `input`, it causes the cursor style of the
+ * decrement button to change from `default` to `text`.
+ */
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
+ *    (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  -moz-box-sizing: content-box;
+  -webkit-box-sizing: content-box; /* 2 */
+  box-sizing: content-box;
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari and Chrome on OS X.
+ * Safari (but not Chrome) clips the cancel button when the search input has
+ * padding (and `textfield` appearance).
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9/10/11.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+  border: 0; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Remove default vertical scrollbar in IE 8/9/10/11.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * Don't inherit the `font-weight` (applied by a rule above).
+ * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+ */
+
+optgroup {
+  font-weight: bold;
+}
+
+/* Tables
+   ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+td,
+th {
+  padding: 0;
+}
--- a/site/client/assets/sass/_sprite.scss
+++ b/site/client/assets/sass/_sprite.scss
--- a/site/client/assets/sass/app.scss
+++ b/site/client/assets/sass/app.scss
@ -0,0 +1,11 @@
+@import
+
+'normalize',
+'mixins',
+'fonts',
+'base',
+'sprite',
+
+'modal',
+'form',
+'landing';
--- a/site/client/gulpfile.js
+++ b/site/client/gulpfile.js
@ -1,16 +1,12 @@
 var elixir = require('laravel-elixir');

-/*
- |--------------------------------------------------------------------------
- | Elixir Asset Management
- |--------------------------------------------------------------------------
- |
- | Elixir provides a clean, fluent API for defining some basic Gulp tasks
- | for your Laravel application. By default, we are compiling the Less
- | file for our application, as well as publishing vendor resources.
- |
- */
+elixir.config.sourcemaps = false;
+
+elixir.config.cssOutput = './../public/assets/css';
+elixir.config.jsOutput = './../public/assets/js';
+elixir.config.assetsDir = 'assets/';
+elixir.config.publicDir = '../public/';

 elixir(function(mix) {
-    mix.less('app.less');
+  mix.sass('app.scss');
 });
--- a/site/client/views/app.blade.php
+++ b/site/client/views/app.blade.php
@ -0,0 +1,26 @@
+<!doctype html>
+<html>
+  <head>
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>Gwent Online</title>
+
+    <link href="{{ url('favicon.ico') }}" rel="icon" type="image/x-icon">
+    <link href="{{ url('assets/css/app.css') }}" rel="stylesheet">
+
+  </head>
+  <body class="{{ $section }}">
+
+    @yield('content')
+
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+    <script src="{{ url('assets/js/app.js') }}"></script>
+
+    <script>
+      $('.container-form-landing').addClass('active');
+    </script>
+
+  </body>
+</html>
--- a/site/client/views/partials/modals/login.blade.php
+++ b/site/client/views/partials/modals/login.blade.php
@ -0,0 +1,17 @@
+<div class="modal">
+  <div class="modal-banner">
+    <div class="wrap-modal">
+
+      <form class="form-session form-login">
+        <input type="text" placeholder="Username" class="field-session">
+        <input type="password" placeholder="Password" class="field-session">
+
+        <div class="wrap-btn-action btn-login-action">
+          <input type="submit" value="Login" class="btn-action">
+          <i class="icon-load"></i>
+        </div>
+      </form>
+
+    </div>
+  </div>
+</div>
--- a/site/client/views/tpl/landing.blade.php
+++ b/site/client/views/tpl/landing.blade.php
@ -0,0 +1,37 @@
+@extends('app')
+
+@section('content')
+
+    @include('partials.modals.login')
+
+    <section class="container-landing">
+      <div class="wrap-landing">
+        <img src="{{ url('assets/img/logo-big.png') }}" width="243" height="85" alt="Gwent" class="logo-big">
+
+        <p class="teaser-landing">
+          Play The Witcher Gwent Card-Game online!<br>
+          Play with randomly generated teams, or build your own!
+        </p>
+
+        <div class="container-form-landing">
+
+          <form class="form-session">
+            <input type="text" placeholder="Username" class="field-session" autofocus>
+            <input type="password" placeholder="Password" class="field-session">
+
+            <div class="wrap-btn-action btn-register-action">
+              <input type="submit" value="Register" class="btn-action">
+              <i class="icon-load"></i>
+            </div>
+          </form>
+
+          <span class="choose">or</span>
+
+          <a href="#" class="btn-second btn-guest">Play as guest</a>
+          <a href="#" class="btn-none btn-login">Login</a>
+
+        </div>
+      </div>
+    </section>
+
+@stop
--- a/site/public/assets/css/app.css
+++ b/site/public/assets/css/app.css
--- a/site/public/assets/img/landing-bg.jpg
+++ b/site/public/assets/img/landing-bg.jpg
--- a/site/public/assets/img/load.gif
+++ b/site/public/assets/img/load.gif
--- a/site/public/assets/img/logo-big.png
+++ b/site/public/assets/img/logo-big.png
--- a/site/public/assets/js/core.js
+++ b/site/public/assets/js/core.js
@ -0,0 +1,7 @@
+$('.register-btn').on('click', function() {
+  $('.icon-load').show();
+});
+
+$('.btn-login').on('click', function() {
+  $('.overlay').addClass('active');
+});
--- a/site/server/app/Http/routes.php
+++ b/site/server/app/Http/routes.php
@ -1,5 +1,6 @@
 <?php

  get('/', function() {
-    return 'hi gwent';
+    return view('tpl.landing')
+      ->withSection('landing');
  });
--- a/site/server/config/view.php
+++ b/site/server/config/view.php
@ -14,7 +14,7 @@ return [
    */

    'paths' => [
-        realpath(base_path('../client/resources/views')),
+        realpath(base_path('../client/views')),
    ],

    /*