diff --git a/core/trunk/install/css/header.css b/core/trunk/install/css/header.css index 03c5e2d3dd11f507e2d650f1ff57a52196d5672a..0fb7269556c6375588dded0611717ab32c0ea702 100755 --- a/core/trunk/install/css/header.css +++ b/core/trunk/install/css/header.css @@ -19,7 +19,7 @@ #fullWrapper #header .logo { position: relative; - top: 10px; + top: 17px; right: 0px; float: right; -} \ No newline at end of file +} diff --git a/core/trunk/install/css/merged_css.css b/core/trunk/install/css/merged_css.css index feb13ad3b191ce643d4c95f472e151bdf04e0f88..1ca97dd28e8c17a9f4187793a7c8b41e3333bbce 100644 --- a/core/trunk/install/css/merged_css.css +++ b/core/trunk/install/css/merged_css.css @@ -238,6 +238,72 @@ } +/* footer.css */ +#fullWrapper #footer { + height: 125px; + width: 910px; + text-align: left; +} + + +/* general.css */ +#fullWrapper { + width: 960px; + box-shadow: 1px 1px 12px rgba(75, 75, 75, 1); + background-color: rgba(255, 255, 255, 1); +} + +.line { + height: 1px; + width: 910px; + background-color: rgba(0,0,0,0.6); +} + +h6 { + color: #777; + font-style: italic; +} + + + + +#titleLink { + color: #777; + font-size: 1em; + font-weight: normal; + padding-bottom: 0em; +} + + + +/* header.css */ +#fullWrapper #header { + height: 120px; + width: 910px; + text-align: left; +} + +#fullWrapper #header .headerName { + position: relative; + top: 18px; + left: 0px; + float: left; +} + +#fullWrapper #header .headerName h2 { + font-size: 70px; + font-family: 'Contrail One'; + color: rgba(81, 112, 144, 1); +} + +#fullWrapper #header .logo { + position: relative; + top: 17px; + right: 0px; + float: right; +} + + /* section.css */ #fullWrapper #section { } @@ -313,14 +379,6 @@ } -/* footer.css */ -#fullWrapper #footer { - height: 125px; - width: 910px; - text-align: left; -} - - /* tags.css */ body { margin: 0; @@ -361,60 +419,3 @@ a:hover { } -/* general.css */ -#fullWrapper { - width: 960px; - box-shadow: 1px 1px 12px rgba(75, 75, 75, 1); - background-color: rgba(255, 255, 255, 1); -} - -.line { - height: 1px; - width: 910px; - background-color: rgba(0,0,0,0.6); -} - -h6 { - color: #777; - font-style: italic; -} - - - - -#titleLink { - color: #777; - font-size: 1em; - font-weight: normal; - padding-bottom: 0em; -} - - - -/* header.css */ -#fullWrapper #header { - height: 120px; - width: 910px; - text-align: left; -} - -#fullWrapper #header .headerName { - position: relative; - top: 18px; - left: 0px; - float: left; -} - -#fullWrapper #header .headerName h2 { - font-size: 70px; - font-family: 'Contrail One'; - color: rgba(81, 112, 144, 1); -} - -#fullWrapper #header .logo { - position: relative; - top: 10px; - right: 0px; - float: right; -} - diff --git a/core/trunk/install/img/logo.png b/core/trunk/install/img/logo.png index 009be32904707af3a680936b4dc9fcc106804b30..f353ec3c9216631294f4502c351335fb20299a27 100755 Binary files a/core/trunk/install/img/logo.png and b/core/trunk/install/img/logo.png differ diff --git a/core/trunk/install/view/includes/header.php b/core/trunk/install/view/includes/header.php index ec8a3b58087b5b8de4a6708e6a6d26dd74aee2b4..9e27db941bc5dba2e2ba599ccc200d020a69bbab 100755 --- a/core/trunk/install/view/includes/header.php +++ b/core/trunk/install/view/includes/header.php @@ -4,5 +4,5 @@ </h2> </div> <div class="logo"> - <img src="img/logo.png" /> + <img src="img/logo.png" height="90px" /> </div>