Commit 20e542bfa7b3891f2453447bef3341cc54e32788
Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge
Showing
3 changed files
with
58 additions
and
52 deletions
setup/wizard/resources/graphics/background.gif
0 → 100644
914 Bytes
setup/wizard/resources/wizard.css
100755 → 100644
| 1 | -* { margin:0; padding:0; } | 1 | +* { margin: 0; padding: 0; } |
| 2 | 2 | ||
| 3 | body { | 3 | body { |
| 4 | background: white; | 4 | background: white; |
| @@ -49,52 +49,64 @@ td { | @@ -49,52 +49,64 @@ td { | ||
| 49 | padding: 2px 5px; | 49 | padding: 2px 5px; |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | -.container { | 52 | +/* *** Layout Styles *** */ |
| 53 | + | ||
| 54 | +#outer-wrapper { | ||
| 55 | + text-align: left; | ||
| 53 | border: solid 1px #A1A1A1; | 56 | border: solid 1px #A1A1A1; |
| 54 | margin: 50px; | 57 | margin: 50px; |
| 55 | margin-top: 20px; | 58 | margin-top: 20px; |
| 56 | - text-align: left; | ||
| 57 | - z-index: -1; | ||
| 58 | } | 59 | } |
| 59 | 60 | ||
| 60 | -.header { | 61 | +#header { |
| 61 | background: url("graphics/gradient.png") repeat-y; | 62 | background: url("graphics/gradient.png") repeat-y; |
| 62 | background-position: top right; | 63 | background-position: top right; |
| 63 | height: 60px; | 64 | height: 60px; |
| 64 | } | 65 | } |
| 65 | 66 | ||
| 66 | -.logo { | ||
| 67 | - background: url("graphics/logo.png") no-repeat; | ||
| 68 | - background-position: top left; | ||
| 69 | - height: inherit; | ||
| 70 | - width: 200px; | ||
| 71 | - margin-left: 10px; | 67 | +#wrapper { |
| 68 | + background: white url("graphics/background.gif") repeat-y left; | ||
| 72 | } | 69 | } |
| 73 | 70 | ||
| 74 | -.content { | ||
| 75 | - /*background: #F1F1F1;*/ | 71 | +#container { |
| 72 | + width: 100%; | ||
| 73 | + background: white url("graphics/background.gif") repeat-y left; | ||
| 74 | + float: right; | ||
| 75 | + margin-left: -200px; | ||
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | -.left { | ||
| 79 | - position: relative; | ||
| 80 | - float: left; | ||
| 81 | - width: 200px; | ||
| 82 | - text-align: center; | ||
| 83 | - /*background: url("graphics/left.png") repeat-y;*/ | ||
| 84 | - background-position: top left; | ||
| 85 | - /*background: #F1F1F1;*/ | ||
| 86 | - height: inherit; | ||
| 87 | - padding-bottom: 20px; | ||
| 88 | - padding-top: 40px; | 78 | +#content { |
| 79 | + margin-left: 200px; | ||
| 80 | + padding: 10px; | ||
| 81 | + padding-top: 0; | ||
| 89 | } | 82 | } |
| 90 | 83 | ||
| 91 | -.right { | ||
| 92 | - position: relative; | ||
| 93 | - float: left; | ||
| 94 | - padding: 20px; | ||
| 95 | - min-width: 600px; | ||
| 96 | - width: 800px; | ||
| 97 | - background: white; | 84 | +#sidebar { |
| 85 | + width: 200px; | ||
| 86 | + float: left; | ||
| 87 | + padding-top: 10px; | ||
| 88 | + padding-bottom: 10px; | ||
| 89 | +} | ||
| 90 | + | ||
| 91 | +#footer { | ||
| 92 | + background: url("graphics/footer.png") repeat-x; | ||
| 93 | + height: 50px; | ||
| 94 | + clear: both; | ||
| 95 | +} | ||
| 96 | + | ||
| 97 | +.clearing { | ||
| 98 | + height: 0; | ||
| 99 | + clear: both; | ||
| 100 | +} | ||
| 101 | + | ||
| 102 | +/* Content Styles */ | ||
| 103 | + | ||
| 104 | +.logo { | ||
| 105 | + background: url("graphics/logo.png") no-repeat; | ||
| 106 | + background-position: top left; | ||
| 107 | + height: inherit; | ||
| 108 | + width: 200px; | ||
| 109 | + margin-left: 10px; | ||
| 98 | } | 110 | } |
| 99 | 111 | ||
| 100 | .menu { | 112 | .menu { |
| @@ -187,12 +199,6 @@ td { | @@ -187,12 +199,6 @@ td { | ||
| 187 | color: #EC7725; | 199 | color: #EC7725; |
| 188 | } | 200 | } |
| 189 | 201 | ||
| 190 | -.footer { | ||
| 191 | - background: url("graphics/footer.png") repeat-x; | ||
| 192 | - height: 50px; | ||
| 193 | - clear: both; | ||
| 194 | -} | ||
| 195 | - | ||
| 196 | .powered-by { | 202 | .powered-by { |
| 197 | background: url("graphics/powered-by-kt.png") no-repeat; | 203 | background: url("graphics/powered-by-kt.png") no-repeat; |
| 198 | background-position: center left; | 204 | background-position: center left; |
setup/wizard/templates/wizard.tpl
| @@ -6,29 +6,29 @@ | @@ -6,29 +6,29 @@ | ||
| 6 | </head> | 6 | </head> |
| 7 | 7 | ||
| 8 | <body> | 8 | <body> |
| 9 | -<div class="container"> | ||
| 10 | - <div class="header"> | 9 | + |
| 10 | +<div id="outer-wrapper"> | ||
| 11 | + <div id="header"> | ||
| 11 | <div class="logo"></div> | 12 | <div class="logo"></div> |
| 12 | </div> | 13 | </div> |
| 13 | - <div class="content"> | ||
| 14 | 14 | ||
| 15 | - <div class="left"> | ||
| 16 | - <?php echo $left; ?> | ||
| 17 | - </div> | ||
| 18 | - <div class="right"> | ||
| 19 | - | ||
| 20 | - <?php echo $content; ?> | ||
| 21 | -<!-- | ||
| 22 | - <div class="buttons"> | ||
| 23 | - <a href="index.php?step_name=&step=previous" class="next">Previous</a> | ||
| 24 | - <a href="index.php?step_name=&step=next" class="next">Next</a> | 15 | + <div id="wrapper"> |
| 16 | + <div id="container"> | ||
| 17 | + <div id="content"> | ||
| 18 | + <?php echo $content; ?> | ||
| 25 | </div> | 19 | </div> |
| 26 | - --> | ||
| 27 | </div> | 20 | </div> |
| 21 | + | ||
| 22 | + <div id="sidebar"> | ||
| 23 | + <?php echo $left; ?> | ||
| 24 | + </div> | ||
| 25 | + <div class="clearing"> </div> | ||
| 28 | </div> | 26 | </div> |
| 29 | - <div class="footer"> | 27 | + |
| 28 | + <div id="footer"> | ||
| 30 | <div class="powered-by"></div> | 29 | <div class="powered-by"></div> |
| 31 | </div> | 30 | </div> |
| 32 | </div> | 31 | </div> |
| 32 | + | ||
| 33 | </body> | 33 | </body> |
| 34 | </html> | 34 | </html> |
| 35 | \ No newline at end of file | 35 | \ No newline at end of file |