-added new login screen

This commit is contained in:
martin 2011-01-29 13:47:06 -05:00
parent 43c66825b4
commit 7c70385528
5 changed files with 36 additions and 21 deletions

View file

@ -8,13 +8,17 @@ body {
margin: 0;
padding: 0;
}
body#login-page {
background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0;
margin: 60px 0 0 0;
padding: 0;
html, body {
height: 100%;
}
#login-page {
background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0;
margin: 0;
padding: 0;
height:100%;
text-align:center;
}
h2 {
color: #000000;
@ -288,20 +292,16 @@ fieldset.plain {
text-indent: 3px;
width:auto;
}
<<<<<<< HEAD
.auto-search {
background:#dddddd url(images/search_auto_bg.png) no-repeat 0 0;
text-indent:25px;
}
=======
>>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b
.input_text_area {
background:#dddddd url("images/input_bg.png") repeat-x scroll 0 0 ;
border: 1px solid #5b5b5b;
font-size: 13px;
text-indent: 3px;
}
<<<<<<< HEAD
.input_select {
background-color: #DDDDDD;
border: 1px solid #5b5b5b;
@ -312,8 +312,6 @@ fieldset.plain {
padding: 2px 2px 2px 0;
vertical-align: top;
}
=======
>>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b
label {
font-size:13px;
color:#5b5b5b;
@ -415,7 +413,6 @@ dl.inline-list dd {
border-width: 0px 1px 0 1px;
}
<<<<<<< HEAD
.DataTables_sort_wrapper .ui-icon {
display: block;
float: left;
@ -473,8 +470,6 @@ dl.inline-list dd {
margin-right:3px;
}
=======
>>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b
/*----END Data Table----*/
fieldset {
@ -493,17 +488,17 @@ input[type="checkbox"] {
padding:0;
width:13px;
height:13px;
<<<<<<< HEAD
}
/*---//////////////////// LOGIN ////////////////////---*/
.login_box {
margin:0 auto 0 auto;
margin: 0 auto 0 auto;
text-align:center;
width:420px;
border:1px solid #181818;
border-width: 0 0 1px 0;
padding:0;
padding-top:60px;
}
.login_box h2 {
@ -643,7 +638,7 @@ dt.block-display, dd.block-display {
height: 28px;
margin-top:12px;
}
.sticky {
/*.sticky {
padding:0;
width:100%;
z-index:2000;
@ -651,6 +646,8 @@ dt.block-display, dd.block-display {
top:0;
left:0;
margin-bottom:140px;
=======
>>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b
}*/
.sticky {
padding:0;
width:100%;
}