tonyair
/
silverstripe-simple
mirror of https://github.com/silverstripe/silverstripe-simple
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'forms-fixed'

This commit is contained in:
Ingo Schommer 2012-03-29 10:25:53 +02:00
parent 38a01e74bf 52b06ec3da
commit 7d35016bcc
4 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
css/Form.css
View File

@ -8,14 +8,14 @@ form .bad {background-color:#f9d0d0; border-color:#be0000;}
.checkbox, .radio{margin-top:1px;}
#MemberLoginForm_LoginForm_action_dologin, #ExternalLoginForm_LoginForm_action_dologin, .Actions .action{padding:6px 20px;}
#MemberLoginForm_LoginForm{max-width:500px;}
#MemberLoginForm_LoginForm_action_dologin, .Actions .action{padding:6px 20px;}
#MemberLoginForm_LoginForm, #MemberLoginForm_LostPasswordForm {max-width:500px;}
#ForgotPassword a{margin-top:15px;}
#ForgotPassword {margin-top:6px;}
div.field{width:100%; float:left; margin-bottom:20px;}
.ui-widget{font-family:Arial, Helvetica, sans-serif;}
form label.left {float:left; width:25%; padding-right:5%; margin-top:4px; display:block; font-size:13px;}
form label.left {float:left; width:25%; padding-right:5%; margin-top:3px; display:block; font-size:13px;}
form .middleColumn {float:right; width:70% !important;}
form .middleColumn .middleColumn{width:100% !important;}
.listbox option{padding:3px 0;}
@ -30,7 +30,12 @@ form input.numeric{padding:5px 1%; width:50px;}
form #DMYDate-month, form #DMYDate-day{width:25px;}
form .checkboxset li, form .optionset li{margin-bottom:5px;}
@media only screen and (max-width: 700px) {
form .middleColumn {float:right; width:100% !important;;}
form label.left, #MemberLoginForm_LoginForm label{margin-bottom:8px;}
}
@media only screen and (min-width: 700px) {
#MemberLoginForm_LoginForm #Remember, #MemberLoginForm_LoginForm .Actions, #MemberLoginForm_LostPasswordForm .Actions{padding-left:30%;}
}

9
css/layout.css
View File

@ -1,6 +1,7 @@
header:after, .main:after, #Root:after {height:0;content:".";display:block;clear:both;visibility:hidden;}
body{background:#ededed; min-width:240px;-webkit-text-size-adjust:none; font-family:Arial, Helvetica, sans-serif;}
.ie7 body, .ie8 body{min-width:860px;}
::-moz-selection{background:#b80000; color:#fff; text-shadow:none;}
::selection {background:#b80000; color:#fff; text-shadow:none;}
@ -20,10 +21,10 @@ a.btn:hover{background:#d80000; color:#fff;}
.content a{border-bottom:1px dashed #b80000;}
.brand{float:left;}
.brand h1{font-size:50px; font-family:"Helvetica Neue LT Pro", "Helvetica LT Std", Helvetica, Arial, sans-serif;color:#fff; font-weight:bold;}
.brand h1{font-size:50px; font-family: "HelveticaNeueLTPro-Bd", "Helvetica Neue LT Pro Bold", "HelveticaNeueBold", "HelveticaNeue-Bold", "Helvetica Neue Bold", "Helvetica Neue LT Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; color:#fff; font-weight:600; font-stretch:normal; line-height:1em;}
.brand, .brand:hover{color:#fff;}
.header .primary ul{float:right; margin:27px -15px 0 0; white-space:nowrap;}
.header .primary ul{float:right; margin:24px -15px 0 0; white-space:nowrap;}
.header .primary li{float:left; padding-bottom:20px; margin:0 5px;}
.header .primary li a{color:#888; font-size:15px; font-family:Helvetica, Arial, sans-serif; padding:6px 8px; border-radius:4px; font-weight:bold; display:block; -moz-transition:color 0.2s; -webkit-transition:color 0.2s; transition:color 0.2s;}
.header .primary li a:hover{color:#fff;}
@ -32,7 +33,7 @@ a.btn:hover{background:#d80000; color:#fff;}
.inner{max-width:1100px; margin:0 auto; padding:0 30px; overflow-x:hidden;}
.ie6 .inner {width:960px;}
.ie7 .inner, .ie7 .inner{min-width:800px;}
.main{background:#fff; padding:50px 0 60px;}
aside{float:left; width:20%; margin-top:17px;}
@ -49,7 +50,7 @@ aside{float:left; width:20%; margin-top:17px;}
.content-container{float:right; width:75%; padding-bottom:20px;}
.no-sidebar .content-container{float:left;}
.header{background:#161616;}
.header .inner{padding-top:50px;}
.header .inner{padding-top:55px;}
.footer{color:#999; background:#ededed; padding:20px 0; font-size:11px; line-height:22px;}
.footer a{color:#999;}

4
css/typography.css
View File

@ -10,8 +10,8 @@
font-style: normal;
}
body {font-size:13px; font-family:Arial, Helvetica, sans-serif;}
h1,h2,h3,h4,h5,h6 {font-family:"CamboRegular", Georgia, "Times New Roman", Times, serif; font-weight:normal; color:#b80000;}
body {font-size:13px; font-family:Arial, Helvetica, sans-serif;}
h1, h2,h3,h4,h5,h6 {font-family:"CamboRegular", Georgia, "Times New Roman", Times, serif; font-weight:normal; color:#b80000;}
p {margin:0 0 17px; font-size:13px; line-height:21px;}
em {font-style:normal;}
a {color:#b80000; text-decoration:none;}

33
templates/Includes/MemberLoginForm.ss
View File

@ -1,33 +0,0 @@
<% if IncludeFormTag %>
<form $FormAttributes class="form login-form">
<% end_if %>
<% if Message %>
<p id="{$FormName}_error" class="message $MessageType">$Message</p>
<% else %>
<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
<% end_if %>
<fieldset>
<% if Legend %><legend>$Legend</legend><% end_if %>
<% loop Fields %>
<div class="field $type">
<% if type != checkbox %><% if IsHidden != true %><label for="$id">$Title</label><% end_if %><% end_if %>
<div class="middleColumn">$Field</div>
<% if type == checkbox %><label for="$id">$Title</label><% end_if %>
<% if Message %><span class="message $MessageType">$Message</span><% end_if %>
</div>
<% end_loop %>
<% if Actions %>
<div class="Actions">
<div class="middleColumn">
<% loop Actions %>
$Field
<% end_loop %>
</div>
</ul>
<% end_if %>
</fieldset>
<% if IncludeFormTag %>
</form>
<% end_if %>