maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #117 from BNoiZe/master

Browse Source 
Fixes for installtion screen
This commit is contained in:
BNoiZe
2013-10-04 18:56:18 +02:00
parent c2b35d81c6
commit 6d12ad9986
106 changed files with 186 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
templates/Sparkle/assets/css/main.css vendored
View File

@@ -1,33 +1,13 @@
@charset "UTF-8";
/* RESET */
html,body,div,ul,ol,li,dl,dt,dd,h1,h2,h3,h4,h5,h6,pre,form,p,blockquote,fieldset,input {
margin:0;
padding:0;
}
h1,h2,h3,h4,h5,h6,pre,code,address,caption,cite,code,em,strong,th {
font-size:1em;
font-weight:400;
font-style:normal;
}
ul,ol {
list-style:none;
}
fieldset,img {
border:none;
}
caption,th {
text-align:left;
}
table {
border-collapse:collapse;
border-spacing:0;
}
html,body,div,ul,ol,li,dl,dt,dd,h1,h2,h3,h4,h5,h6,pre,form,p,blockquote,fieldset,input { margin:0; padding:0; }
h1,h2,h3,h4,h5,h6,pre,code,address,caption,cite,code,em,strong,th { font-size:1em; font-weight:400; font-style:normal; }
ul,ol { list-style:none; }
fieldset,img { border:none; }
caption,th { text-align:left; }
table { border-collapse:collapse; border-spacing:0; }
article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section { display:block; }
/* TYPE */
html,body {
@@ -36,23 +16,11 @@ html,body {
color:#333;
}
/*Opera Fix*/
body:before {
content:"";
float:left;
width:0;
margin-top:-32767px;
}
body {
margin:0;
padding:0;
}
article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section {
display:block;
}
.dark {
background-color: #e9edf0;
border-bottom:1px solid #d1d5d8;
@@ -66,22 +34,21 @@ h1 {
display:none;
}
h2, h3 {
margin: 0 0 1em 0;
padding: 0;
font-weight: bold;
}
h2 {
font-size:17px;
font-weight: bold;
margin:0;
margin-bottom:1em;
padding:0;
}
h3 {
font-size: 15px;
font-weight: bold;
margin: 0;
margin-bottom: 1em;
padding: 0;
}
img {
border:0;
vertical-align:middle;
@@ -91,29 +58,22 @@ td a {
text-decoration:none;
}
.bradius,.ui-corner-all {
/*background: none repeat scroll 0 0 #FFFFFF;*/
.bradius {
border-radius: 5px 5px 5px 5px;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
/*padding: 40px;*/
}
.bradiusodd {
border-radius: 5px 5px 5px 5px !important;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
box-shadow: rgba(0, 0, 0, 0.34902) 0px 1px 3px 0px;
}
.topheader {
background: #f6f9fb;
background: #e9edf0;
background: rgba(234,238,240,0.9);
top: 0px;
width: 100%;
padding-left:5px;
padding-top:2px;
padding: 2px 0 0 5px;
box-shadow: 0 1px 8px rgba(0, 0, 0, 0.35);
position:fixed;
z-index: 100;
}
.topheaderinfo {
.topheader_navigation {
float: right;
margin: 35px 40px 0 0;
}
@@ -155,7 +115,6 @@ ul.topheadernav li ul li a:hover {
color: #111;
}
nav {
float:left;
width:230px;
@@ -165,42 +124,29 @@ nav div:first-child {
display: none;
}
/* FOOTER */
footer {
clear:both;
text-align:center;
color:rgb(136, 136, 136);
color: #888;
font-size:10px !important;
margin-top:10px;
margin-bottom:10px;
margin: 10px 0;
}
footer a,footer a:active,footer a:visited {
text-decoration:none;
color:rgb(136, 136, 136);
color: #888;
}
footer a:hover {
text-decoration:underline;
}
.login {
.login, .install {
background-color:#fff;
margin-top:9%;
margin-left:auto;
margin-right:auto;
margin-bottom:12px;
width:600px;
/*border:1px solid #999;*/
margin: 9%;
margin-left: auto;
margin-right: auto;
margin-bottom: 12px;
width: 600px;
}
.install {
background-color:#fff;
margin-top:20px;
margin-left:auto;
margin-right:auto;
margin-bottom:12px;
width:800px;
border:1px solid #999;
width: 800px;
}
.fullform,.midform,.tinyform {
@@ -229,15 +175,14 @@ footer a:hover {
.installsec table {
width:100%;
padding:0 10px;
border-spacing:4px;
margin: 15px 0 15px 0;
}
.installsec h2 {
margin-left:15px;
}
.installstatus {
width:150px;
display: block;
border-bottom: 1px solid #d1d5d8;
margin: 0;
padding: 5px 15px 15px 15px;
}
.tinyform,.loginsec {
@@ -287,7 +232,6 @@ footer a:hover {
.fullform label {
float:left;
width:26em;
/* margin-right: 1em; */
margin-top:6px;
text-align:right;
}
@@ -346,6 +290,10 @@ p.submit {
padding-top:10px;
padding-left:10px;
}
.installsec aside {
text-align: right;
padding: 10px;
}
.messagewrapper {
width:650px;
@@ -377,7 +325,7 @@ p.submit {
* error message display
*/
.errorcontainer {
background:url(../img/icons/bad_big.png) 10px center no-repeat #ffedef;
background:url(../img/icons/error_big.png) 10px center no-repeat #ffedef;
border:1px solid #ffc2ca;
padding:10px 10px 10px 68px!important;
margin: 10px 0 10px 0 !important;
@@ -493,7 +441,9 @@ a:hover {
margin:0;
padding:0 0 0 20px;
}
.menuelement h4 a {
color: #000;
}
.menuelement ul {
list-style:none;
margin:3px 0 0px;
@@ -509,32 +459,20 @@ a:hover {
* main container
*/
.main {
/* same value as nav-width */
margin-left:240px;
margin-right:10px;
margin-top:105px;
margin-bottom:0;
background-color:#fff;
padding: 30px 30px 30px 30px;
/*border:1px solid #666;*/
min-height:400px;
/* background:-webkit-gradient(linear,left top,right top,color-stop(0.16,#dcdcdc),color-stop(1,#fff));
background:-moz-linear-gradient(left center,#dcdcdc 16%,#fff 100%);
/* For Internet Explorer 5.5 - 7
filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#dcdcdc,endColorStr=#ffffff,GradientType=1);
/* For Internet Explorer 8
-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#dcdcdc,endColorstr=#ffffff,GradientType=1)";*/
}
.noborder {
width:100%;
border-spacing:0;
background-color:#f8f8f8;
border-collapse:separate;
border-top:0;
border-left:0;
border-right:0;
border-bottom:1px solid #666;
border: 0;
}
.noborder td {
@@ -606,10 +544,6 @@ table tbody tr:last-child td {
min-height: 20px;
}
.formlabeltd {
}
.formtable label {
float:none;
display:block;
@@ -643,7 +577,6 @@ table tfoot td {
height:25px;
border-top: 1px solid #d1d5d8;
background-color: #f2f8fa;
/*border-right:1px solid #666;*/
}
.tfootleft {
@@ -735,9 +668,7 @@ select {
background:#fff;
padding:4px;
border:1px solid #d9d9d9;
height: 26px;
margin-bottom: 5px;
border-radius: 0;
}
.customer_add {
@@ -926,11 +857,6 @@ label.nobr {
margin: 0 10px 0 0;
}
caption {
font-weight:700;
margin-bottom:.2em;
}
.scrollup {
width:40px;
height:40px;
@@ -941,4 +867,4 @@ caption {
display:none;
text-indent:-9999px;
background: url(../img/top.png) no-repeat;
}
}