Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:rollstudio/DjangoDash

  • Loading branch information...
commit 061c363e2687c28eab9266d09b27129e5e3a374e 2 parents cad1cd6 + 8a1c78f
@patrick91 patrick91 authored
View
BIN  assets/design/ipsedixit.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
39 assets/html/css/style.css
@@ -113,10 +113,19 @@ transition: color 0.4s ease-in;}
#middle_column{width:25%; background:#FBFBFB;overflow:hidden;}
#middle_column ul#wrapper{list-style-type:none; width:400%;height:100%; }
#middle_column ul#wrapper li{width:25%;height:100%; }
+#middle_column ul#wrapper h3{font-size:40px; margin-top:12px;line-height:40px;margin-bottom:20px;}
#middle_column #about{float:left;position:relative;font-size:11px;}
-#middle_column #about h3{font-size:40px; margin-top:12px;line-height:40px;margin-bottom:20px;}
#middle_column #about .view {position:absolute; bottom: 80px;left:20px;}
#middle_column #about .view a{text-decoration:none;color:#FF3399; font-weiht:bold; font-size:25px; letter-spacing:-2px;}
+#middle_column .signin_list{width:100%;list-style-type:none;margin-top:20px;}
+#middle_column .signin_list li{margin:0 0 4px 0;width:auto!important;}
+#middle_column .signin_list li a{padding:0 1px; line-height:12px; border:1px solid #000; color:#000; text-decoration:none;font-weight:bold;}
+#middle_column .signin_list li a:hover{border:1px solid #666; color:#666;}
+
+#middle_column .signup_list{width:100%;list-style-type:none;margin-top:20px;}
+#middle_column .signup_list li{margin:0 0 4px 0;width:auto!important;}
+#middle_column .signup_list li a{padding:0 1px; line-height:12px; border:1px solid #666; color:#666; text-decoration:none;font-weight:bold;}
+#middle_column .signup_list li a:hover{border:1px solid #666; color:#666;}
#right_column{width:25%; background:#F1F1F1;overflow:hidden;}
#right_column ul#wrapper{height:100%;list-style-type:none; }
@@ -135,13 +144,39 @@ transition: color 0.4s ease-in;}
#middle_column .prev_next a.next.disabled, #middle_column .prev_next a.next:hover{ background:url(../img/prev_next_middle.png) no-repeat 38px center;}
/*#middle_column .prev_next a.next:hover{background:url(../img/prev_next_middle.png) no-repeat 38px top;}*/
+#form_signin {margin-top: 40px;}
+#form_signin p{margin:0 0 4px 0;font-size:12px;}
+#form_signin legend{font-size: 30px;margin-top: 12px;line-height: 40px;margin-bottom: 20px;}
+#form_signin fieldset{border:none;}
+#form_signin label{display:block; float:left; text-align:right; width:40%;font-weight:bold; margin-right:10px;}
+#form_signin .checkbox_signin{background:none; border:1px solid #000;width:15px; height:15px;}
+#form_signin .forgot_signin{margin-top:-20px;}
+#form_signin .forgot_signin a{color:#666;text-decoration:none;font-weight:bold;}
+.submit_form{float:right; border:1px solid #000;padding:0px 16px 0 1px;background:url(../img/submit.png) no-repeat right center;font-family:Helvetica,"Arial Black",Arial,Gadget,sans-serif;text-transform:uppercase;font-size:14px;font-weight:bold;}
+#form_register {margin-top: 40px;}
+#form_register p{margin:0 0 4px 0;font-size:12px;}
+#form_register legend{font-size: 30px;margin-top: 12px;line-height: 40px;margin-bottom: 20px;}
+#form_register fieldset{border:none;}
+#form_register label{display:block; float:left; text-align:right; width:40%;font-weight:bold; margin-right:10px;}
+.input_signin{background:none; border:1px solid #000;width:50%;font-family:Helvetica,"Arial Black",Arial,Gadget,sans-serif;text-transform:uppercase;font-size:10px;font-weight:bold;}
+
+#form_your_id {margin-top: 40px;}
+#form_your_id ul{width:100%;list-style-type:none;}
+#form_your_id p{margin:0 0 10px 0;font-size:12px;position:relative;}
+#form_your_id legend{font-size: 30px;margin-top: 12px;line-height: 40px;margin-bottom: 20px;}
+#form_your_id fieldset{border:none;}
+#form_your_id label{display:block; float:left; text-align:right; width:40%;font-weight:bold; margin-right:10px;}
+#form_your_id .errorlist{position:absolute;left:0; top:11px;font-size:10px; color:#666;text-align:right; width:40%;font-weight:bold; margin-right:10px;}
+#form_your_id .helptext{font-weight:bold;}
+#form_your_id .submit_form{margin-right:41px;}
+
#right_column .prev_next a.prev{ background:url(../img/prev_next_right.png) no-repeat 44px 3px}
#right_column .prev_next a.prev.disabled, #right_column .prev_next a.prev:hover{ background:url(../img/prev_next_right.png) no-repeat -16px 3px;}
#right_column .prev_next a.next{ background:url(../img/prev_next_right.png) no-repeat 44px -17px}
#right_column .prev_next a.next.disabled, #right_column .prev_next a.next:hover{ background:url(../img/prev_next_right.png) no-repeat -16px -17px;}
#right_column .share{margin-top:20px;}
-#right_column .share a{float:left; margin-right:3px;color:#999; border:1px solid #999; padding:0px 20px 0px 1px; line-height:14px;text-decoration:none;font-weight:bold; background:url(../img/share.png) no-repeat right 2px; }
+#right_column .share a{float:left; margin-right:3px;color:#999; border:1px solid #999; padding:0px 20px 0px 1px; line-height:14px;text-decoration:none;font-weight:bold; background:url(../img/share.png) no-repeat right 0px; }
#right_column .share ul{list-style-type:none;}
#right_column .share li{display:inline;}
#right_column .share li a{float:left; display:block; width:15px; height:15px;font-size:1px; text-indent:-9999px;margin-right:3px; padding:0;border:none;}
View
BIN  assets/html/img/submit.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
157 assets/html/index.html
@@ -37,7 +37,7 @@
</ul>
</nav>
<div class="main_dixit">
- <h3>Dixit5</h3>
+ <h3>ID 5</h3>
<div class="dixit_text">
ETIAM ULTRICES PULVINAR ALIQUET. DONEC NEC MAGNA LIBERO. PHASELLUS ULLAMCORPER ANTE IN ARCU IACULIS EGET CONSECTETUR NIBH ALIQUAM. <br />
PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS.
@@ -53,7 +53,7 @@
</div>
<div id="middle_column">
<ul id="wrapper">
- <li id="about">
+ <li id="about" style="display:none;">
<div class="container">
<h3>About <br/>the project</h3>
<div class="content">
@@ -65,6 +65,151 @@
<a href="#" title="Write your Dixit">Write your Dixit</a>
</div>
</li>
+ <li id="login" style="display:none;">
+ <div class="container">
+ <h3>LOGIN</h3>
+ <div class="content">
+ PLEASE SIGN IN WITH ONE OF YOUR EXISTING THIRD PART ACCOUNTS. OR, SIGN UP FOR A LOCALHOST ACCOUNT AND SIGN IN BELOW:
+ <ul class="signin_list">
+ <li><a href="#" title="Sign in with Facebook">Facebook</a></li>
+ <li><a href="#" title="Sign in with Twitter">Twitter</a></li>
+ <li><a href="#" title="Sign in with Google +">Google +</a></li>
+ </ul>
+
+ <ul class="signup_list">
+ <li><a href="#" title="Sign in">Sign in</a></li>
+ <li><a href="#" title="Register">Register</a></li>
+ </ul>
+
+ <form id="form_signin" method="" action="">
+ <legend>SIGN IN</legend>
+ <fieldset>
+ <p class="clearfix"><label for="login_signin">LOGIN</label><input type="text" id="login_signin" class="input_signin"></p>
+ <p class="clearfix"><label for="password_signin">Password</label><input type="password" id="password_signin" class="input_signin"></p>
+ <p class="clearfix"><label for="remember_signin">Remember me</label><input type="checkbox" id="remember_signin" class="checkbox_signin"></p>
+ <p class="clearfix"><input type="submit" id="submit_signin" value="send" class="submit_form"></p>
+ <p class="clearfix forgot_signin"><label><a href="#">FORGOT PASSWORD?</a></label></p>
+ </fieldset>
+ </form>
+
+ <form id="form_register" method="" action="">
+ <legend>Register</legend>
+ <fieldset>
+ <p class="clearfix"><label for="login_register">USERNAME</label><input type="text" id="login__register" class="input_signin"></p>
+ <p class="clearfix"><label for="password_register">Password</label><input type="password" id="password_register" class="input_signin"></p>
+ <p class="clearfix"><label for="password_register_2">Password (again)</label><input type="password" id="password_register_2" class="input_signin"></p>
+ <p class="clearfix"><label for="email">Email</label><input type="text" id="email_register" class="input_signin"></p>
+ <p class="clearfix"><input type="submit" id="submit_signin" value="sign up" class="submit_form"></p>
+ </fieldset>
+ </form>
+ </div>
+ </div>
+ </li>
+ <li id="your_id">
+ <div class="container">
+ <h3>YOUR ID</h3>
+ <div class="content">
+ SED VITAE EUISMOD NISI. PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS.
+ <form id="form_your_id" method="" action="">
+ <legend></legend>
+ <fieldset>
+ <div style='display:none'><input type='hidden' name='csrfmiddlewaretoken' value='lca5zwMmGLNoo6Pc96KzWlvdYtpIRYvt' /></div>
+ <p>
+ <label for="id_body">*Body:</label> <textarea id="id_body" rows="10" cols="40" name="body" class="input_signin"></textarea>
+ <span class="errorlist">This field is required.</span>
+ </p>
+ <p>
+ <label for="id_author">*Author:</label> <input type="text" name="author" id="id_author" class="input_signin"/>
+ <span class="errorlist">This field is required.</span>
+ </p>
+ <p><label for="id_language">*Language:</label>
+ <select name="language" id="id_language"class="input_signin">
+ <option value="" selected="selected">---------</option>
+ <option value="ar">Arabic</option>
+ <option value="az">Azerbaijani</option>
+ <option value="bg">Bulgarian</option>
+ <option value="bn">Bengali</option>
+ <option value="bs">Bosnian</option>
+ <option value="ca">Catalan</option>
+ <option value="cs">Czech</option>
+ <option value="cy">Welsh</option>
+ <option value="da">Danish</option>
+ <option value="de">German</option>
+ <option value="el">Greek</option>
+ <option value="en">English</option>
+ <option value="en-gb">British English</option>
+ <option value="eo">Esperanto</option>
+ <option value="es">Spanish</option>
+ <option value="es-ar">Argentinian Spanish</option>
+ <option value="es-mx">Mexican Spanish</option>
+ <option value="es-ni">Nicaraguan Spanish</option>
+ <option value="et">Estonian</option>
+ <option value="eu">Basque</option>
+ <option value="fa">Persian</option>
+ <option value="fi">Finnish</option>
+ <option value="fr">French</option>
+ <option value="fy-nl">Frisian</option>
+ <option value="ga">Irish</option>
+ <option value="gl">Galician</option>
+ <option value="he">Hebrew</option>
+ <option value="hi">Hindi</option>
+ <option value="hr">Croatian</option>
+ <option value="hu">Hungarian</option>
+ <option value="id">Indonesian</option>
+ <option value="is">Icelandic</option>
+ <option value="it">Italian</option>
+ <option value="ja">Japanese</option>
+ <option value="ka">Georgian</option>
+ <option value="kk">Kazakh</option>
+ <option value="km">Khmer</option>
+ <option value="kn">Kannada</option>
+ <option value="ko">Korean</option>
+ <option value="lt">Lithuanian</option>
+ <option value="lv">Latvian</option>
+ <option value="mk">Macedonian</option>
+ <option value="ml">Malayalam</option>
+ <option value="mn">Mongolian</option>
+ <option value="nb">Norwegian Bokmal</option>
+ <option value="ne">Nepali</option>
+ <option value="nl">Dutch</option>
+ <option value="nn">Norwegian Nynorsk</option>
+ <option value="pa">Punjabi</option>
+ <option value="pl">Polish</option>
+ <option value="pt">Portuguese</option>
+ <option value="pt-br">Brazilian Portuguese</option>
+ <option value="ro">Romanian</option>
+ <option value="ru">Russian</option>
+ <option value="sk">Slovak</option>
+ <option value="sl">Slovenian</option>
+ <option value="sq">Albanian</option>
+ <option value="sr">Serbian</option>
+ <option value="sr-latn">Serbian Latin</option>
+ <option value="sv">Swedish</option>
+ <option value="sw">Swahili</option>
+ <option value="ta">Tamil</option>
+ <option value="te">Telugu</option>
+ <option value="th">Thai</option>
+ <option value="tr">Turkish</option>
+ <option value="tt">Tatar</option>
+ <option value="uk">Ukrainian</option>
+ <option value="ur">Urdu</option>
+ <option value="vi">Vietnamese</option>
+ <option value="zh-cn">Simplified Chinese</option>
+ <option value="zh-tw">Traditional Chinese</option>
+ </select>
+ <span class="errorlist">This field is required.</span>
+ </p>
+ <p>
+ <label for="id_source">*Source:</label> <input id="id_source" type="text" name="source" maxlength="200" class="input_signin" />
+ <span class="errorlist">This field is required.</span>
+ </p>
+ <p><label for="id_tags">Tags:</label> <input type="text" name="tags" id="id_tags" class="input_signin" placeholder="A comma-separated list of tags." /> <br /><span class="helptext"></span></p>
+ <input type="submit" value="Submit" class="submit_form" />
+ </fieldset>
+ </form>
+ </div>
+ </div>
+ </li>
</ul>
<div class="prev_next">
<a href="#" title="prev" class="prev disabled">prev</a>
@@ -75,7 +220,7 @@
<ul id="wrapper" style="height:400%"> <!--(@partick: calcola altezza come numero item più due zeri)-->
<li>
<div class="container">
- <h3>Dixit4</h3>
+ <h3>ID 4</h3>
<div class="dixit_text">
ETIAM ULTRICES PULVINAR ALIQUET. DONEC NEC MAGNA LIBERO. PHASELLUS ULLAMCORPER ANTE IN ARCU IACULIS EGET CONSECTETUR NIBH ALIQUAM. <br />
PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS.
@@ -98,7 +243,7 @@
</li>
<li>
<div class="container">
- <h3>Dixit3</h3>
+ <h3>ID 3</h3>
<div class="dixit_text">
ETIAM ULTRICES PULVINAR ALIQUET. DONEC NEC MAGNA LIBERO. PHASELLUS ULLAMCORPER ANTE IN ARCU IACULIS EGET CONSECTETUR NIBH ALIQUAM. <br />
PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS.
@@ -121,7 +266,7 @@
</li>
<li>
<div class="container">
- <h3>Dixit2</h3>
+ <h3>ID 2</h3>
<div class="dixit_text">
ETIAM ULTRICES PULVINAR ALIQUET. DONEC NEC MAGNA LIBERO. PHASELLUS ULLAMCORPER ANTE IN ARCU IACULIS EGET CONSECTETUR NIBH ALIQUAM. <br />
PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS.
@@ -144,7 +289,7 @@
</li>
<li>
<div class="container">
- <h3>Dixit1</h3>
+ <h3>ID 1</h3>
<div class="dixit_text">
ETIAM ULTRICES PULVINAR ALIQUET. DONEC NEC MAGNA LIBERO. PHASELLUS ULLAMCORPER ANTE IN ARCU IACULIS EGET CONSECTETUR NIBH ALIQUAM. <br />
PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS.
Please sign in to comment.
Something went wrong with that request. Please try again.