Permalink
Browse files

Merge pull request #4 from creatrice/master

last changes
  • Loading branch information...
2 parents a327d49 + c81a7f5 commit 83a0435026cd9582f104f23ddc6affcd1a6882f6 @tsloughter committed Jan 23, 2012
View
Deleted file not rendered
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -1,40 +0,0 @@
-/**
- * @author Ida Swarczewskaja (CSS & design)
- */
-
-/** Mobile Portrait: width 320px **/
-
-@media only screen and (max-width: 767px) {
- .topbar {}
- .hero-unit {}
- .container, .container-fluid, .modal, .footer { width: 300px; }
- .container {margin-bottom:10px;}
-
- /* Columns */
- .span1, .span2, .span3, .span4, .span5, .span6, .span7, .span8, .span9, .span10, .span11, .span12, .span12, .span13, .span14, .span15,
- .span16, .span17, .span18, .span19, .span20, .span21, .span22, .span23, .span24, .span-one-third, .span-two-thirds { width: 300px; }
-
- /* Offsets */
- .row > .offset1, .row > .offset2, .row > .offset3, .row > .offset4, .row > .offset5, .row > .offset6, .row > .offset7, .row > .offset8,
- .row > .offset9, .row > .offset10, .row > .offset11, .row > .offset12, .row > .offset-one-third, .row > .offset-two-thirds { margin-left: 0; }
-
- .content form, .content h1 {margin-left:0px;}
-
- input.xlarge, #login_box input {width:265px;}
- .btn.large, button[type="submit"] {width:277px;font-size:18px;}
- input#new_todo{width:285px;}
- ul#todo_list .icon.icon-remove {display:inline-block;}
- ul#todo_list input[type="checkbox"]{margin-right:6px;}
-}
-
-/** Mobile Landscape: width 480px **/
-
-@media only screen and (min-width: 480px) and (max-width: 767px) {
- .container, .container-fluid, .modal, .footer { width: 420px; }
- .container {margin-bottom:10px;}
-
- /* Columns */
- .span1, .span2, .span3, .span4, .span5, .span6, .span7, .span8, .span9, .span10, .span11, .span12, .span12, .span13, .span14, .span15, .span16, .span17, .span18, .span19, .span20, .span21, .span22, .span23, .span24, .span-one-third, .span-two-thirds{ width: 420px; }
-
- .content form, .content h1 {margin-left:0px;}
-}
View
@@ -135,7 +135,7 @@ ul#todo_list li:first-child {border-top:none;}
ul#todo_list li:hover {background-color:rgba(0,0,0,0.05);}
ul#todo_list input[type="checkbox"]{
float:left;
- margin:4px 15px;
+ margin:4px 10px 4px 0;
position:relative;
display:inline-block;
}
@@ -148,7 +148,7 @@ ul#todo_list .icon.icon-remove {
ul#todo_list .display:hover .icon.icon-remove {display:inline-block;}
-.todo_content {padding:0 5px;font-size:18px; line-height:22px;color:#6C6B66;}
+.todo_content {padding:0 3px;font-size:18px; line-height:22px;color:#6C6B66;}
/* Edit input */
#todo_list .editing .display, #todo_list .edit {display: none;}
@@ -167,6 +167,7 @@ ul#todo_list .display:hover .icon.icon-remove {display:inline-block;}
-moz-box-shadow: inset 0 1px 1px rgba(255, 255, 255, 0.5), 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 1px rgba(255, 255, 255, 0.5), 0 1px 1px rgba(0, 0, 0, 0.05);
}
+
#todo_stats .todo_count {margin:5px 0;}
.bold {font-weight:bold;}
@@ -190,25 +191,26 @@ ul#todo_list .display:hover .icon.icon-remove {display:inline-block;}
@media only screen and (max-width: 480px) {
body {min-height:auto;width:100%;height:100%;}
- .container, .container-fluid, .footer { width: 300px; }
+ .container, .container-fluid, .footer { width: 300px;}
+ .content {text-shadow: 0 1px 1px rgba(255, 255, 255, 0.3);}
/* Columns */
.span1, .span2, .span3, .span4, .span5, .span6, .span7, .span8, .span9, .span10,
.span11, .span12, .span12, .span13, .span14, .span15, .span16, .span17, .span18,
- .span19, .span20, .span21, .span22, .span23, .span24, .span-one-third, .span-two-thirds { width: 300px; }
+ .span19, .span20, .span21, .span22, .span23, .span24, .span-one-third, .span-two-thirds {width: 300px;}
/* Offsets */
.row > .offset1, .row > .offset2, .row > .offset3, .row > .offset4, .row > .offset5,
.row > .offset6, .row > .offset7, .row > .offset8, .row > .offset9, .row > .offset10,
- .row > .offset11, .row > .offset12, .row > .offset-one-third, .row > .offset-two-thirds { margin-left: 0; }
+ .row > .offset11, .row > .offset12, .row > .offset-one-third, .row > .offset-two-thirds {margin-left: 0;}
/* Inputs width */
input.xlarge, #login_box input {width:265px;}
.btn.large {width:277px;font-size:18px;}
input#new_todo{width:285px;}
+ ul#todo_list input.xlarge {width:210px;}
/* Todo list */
- ul#todo_list .icon.icon-remove {display:inline-block;}
ul#todo_list input[type="checkbox"]{font-size:20px;margin: 3px 6px 0 0;-webkit-appearance:checkbox;}
.well .btn {padding:5px 8px 6px 8px;}
}
@@ -219,18 +221,20 @@ ul#todo_list .display:hover .icon.icon-remove {display:inline-block;}
html {height:100%;}
body {min-height:auto;width:100%;height:100%;}
- .container, .container-fluid, .footer { width: 460px;}
+ .container, .container-fluid, .footer {width: 460px;}
+ ul#todo_list input.xlarge {width:265px;}
/* Columns */
.span1, .span2, .span3, .span4, .span5, .span6, .span7, .span8, .span9, .span10,
.span11, .span12, .span12, .span13, .span14, .span15, .span16, .span17, .span18,
- .span19, .span20, .span21, .span22, .span23, .span24, .span-one-third, .span-two-thirds{ width: 460px; }
+ .span19, .span20, .span21, .span22, .span23, .span24, .span-one-third, .span-two-thirds{width: 460px;}
}
/** Tablet **/
@media only screen and (min-width: 768px) and (max-width: 959px) {
html {height:100%;}
body {width:100%;height:100%;}
+ .content {text-shadow: 0 1px 1px rgba(255, 255, 255, 0.3);}
/* Todo list */
ul#todo_list input[type="checkbox"]{font-size:20px;margin: 3px 6px 0 0;-webkit-appearance:checkbox;}
View
@@ -1,42 +0,0 @@
-/** Tablet Portrait: width of 768px **/
-
-@media only screen and (min-width: 768px) and (max-width: 959px) {
- .container, .container-fluid { width: 768px; }
-
- /* Columns */
- .span1 { width: 28px; }
- .span2 { width: 76px; }
- .span3{ width: 124px; }
- .span4 { width: 172px; }
- .span5 { width: 220px; }
- .span6 { width: 268px; }
- .span7 { width: 316px; }
- .span8 { width: 364px; }
- .span9 { width: 412px; }
- .span10 { width: 460px; }
- .span11 { width: 508px; }
- .span12 { width: 556px; }
- .span13 { width: 604px; }
- .span14 { width: 652px; }
- .span15 { width: 700px; }
- .span16, .span17, .span18, .span19, .span20, .span21, .span22, .span23, .span24 { width: 748px; }
-
- .span-one-third { width: 236px; }
- .span-two-thirds { width: 492px; }
-
- /* Offsets */
- .row > .offset1 { margin-left: 48px; }
- .row > .offset2 { margin-left: 96px; }
- .row > .offset3 { margin-left: 144px; }
- .row > .offset4 { margin-left: 192px; }
- .row > .offset5 { margin-left: 240px; }
- .row > .offset6 { margin-left: 288px; }
- .row > .offset7 { margin-left: 336px; }
- .row > .offset8 { margin-left: 348px; }
- .row > .offset9 { margin-left: 432px; }
- .row > .offset10 { margin-left: 480px; }
- .row > .offset11 { margin-left: 528px; }
- .row > .offset12 { margin-left: 576px; }
- .row > .offset-one-third { margin-left: 236px;}
- .row > .offset-two-thirds {margin-left: 492px;}
-}
View
@@ -88,7 +88,7 @@ module Todo {
}
function make_editable(string id, string value) {
- line = <input id={id^"_input"} class="todo_content" onnewline={function(_){update_todo(id, Dom.get_value(#{id^"_input"}))}} value={ value } />
+ line = <input id={id^"_input"} class="xlarge todo_content" onnewline={function(_){update_todo(id, Dom.get_value(#{id^"_input"}))}} value={ value } />
Dom.show(#{id^"_destroy"});
_ = Dom.put_replace(#{id^"_todo"}, Dom.of_xhtml(line));
update_counts()
View
@@ -156,9 +156,9 @@ module User {
<div class="content">
<h1>Login</h1>
{loginbox()}
- <div class="well">No account?
- <a href="/user/new"><strong>Sign Up</strong></a> or
- <a href="{login_url}"><img src="/resources/fb_connect.png" /></a>
+ <div class="well">
+ <p class="pull-left">No account? <a href="/user/new"><strong>Sign Up</strong></a></p>
+ <a class="pull-right" href="{login_url}"><img src="/resources/fbconnect.png" /></a>
</div>
</div>
{footer()}
@@ -195,8 +195,10 @@ module User {
login(Dom.get_value(#username), Dom.get_value(#password))
}}>Create</button>
</form>
- <div class="well">Already user? <a href="/login"><strong>Login here</strong></a> or
- <a href="{login_url}"><img src="/resources/fb_connect.png" /></a></div>
+ <div class="well">
+ <p class="pull-left">Already user? <a href="/login"><strong>Login here</strong></a></p>
+ <a class="pull-right" href="{login_url}"><img src="/resources/fbconnect.png" /></a>
+ </div>
</div>
{footer()}
</>

0 comments on commit 83a0435

Please sign in to comment.