From 0826387d6131ad25a3717da25278c453c0301794 Mon Sep 17 00:00:00 2001 From: David McReynolds Date: Fri, 13 Dec 2013 13:06:45 -0800 Subject: [PATCH] fixed default main layout to match new branding --- assets/css/main.css | 134 +++++++++------------- assets/images/_template_icons.svg | 22 ++-- fuel/application/views/_blocks/footer.php | 23 ++-- fuel/application/views/_blocks/header.php | 55 +++------ fuel/application/views/_install.php | 69 ++--------- fuel/application/views/_layouts/main.php | 6 +- 6 files changed, 101 insertions(+), 208 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 16daede4f..d47f008ed 100755 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,82 +1,52 @@ -/*************************************************************** -RESET BROWSER VALUES SO EVERYONE IS THE SAME -***************************************************************/ -@import url(reset.css); -@import url(common.css); - - -/*************************************************************** -TAG STYLES -***************************************************************/ -body { background: #dc4812; font-family: Arial, 'Lucida Grande', sans-serif; color: #fff; } -h1 { font-size: 30px; } -h2 { font-size: 24px; color: #fff; margin-bottom: 15px; } -h3 { font-size: 16px; color: #ea5b17; margin-bottom: 5px; font-weight: normal; } -h4 { font-size: 12px; margin-bottom: 5px; } -a { color: #dc461c; } -p { margin-bottom: 15px; line-height: 16px; } -blockquote { font-style: italic; margin-bottom: 20px; } -cite { display: block; font-size: 12px; color: #e95c18; margin-top: 10px; } -input { padding: 2px; } -ul { margin: 0 0 20px 15px; } -li { list-style: disc; } -input, textarea { border: 1px solid #ccc; } -textarea { font-family: Arial, 'Lucida Grande', sans-serif; color: #333; font-size: 12px; } - - -/*************************************************************** -GENERIC CLASSES -***************************************************************/ -.left { float: left; } -.right { float: right; } -.block { margin-bottom: 30px; } -a.readmore { display: block; } -table.form td { padding: 3px 5px 3px 0; } - - -/*************************************************************** -SPECIFIC AREAS -***************************************************************/ -div#error_404 { margin: -100px 0 0 340px; } -div#container { background: #000 url(http://www.getfuelcms.com/assets/images/bg_waves.jpg) no-repeat top center; } -div#container_inner { position: relative; width: 960px; margin: auto; } -div#header { width: 840px; height: 370px; margin: auto; position: relative; } - -/* top nav*/ -div#topnav { position: absolute; top: 10px; right: 0px; z-index: 10; } -div#topnav, div#topnav a { color: #5a7995; font-size: 12px; } -div#topnav li { float: left; display: block; border-right: 1px solid #5a6e7f; } -div#topnav li a { display: block; margin: 0 10px; line-height: 12px; text-decoration: none; } -div#topnav li.last { border: none; } - -/* logo */ -a#daylight_logo { position: absolute; top: 20px; left: 0px; background: transparent url(http://www.getfuelcms.com/assets/images/logo_daylight.png) no-repeat center center; width: 166px; height: 30px; display: block; } -a#fuel_logo { display: block; text-indent: -10000px; overflow: hidden; position: absolute; top: 60px; left: 0px; background: transparent url(http://www.getfuelcms.com/assets/images/logo_fuel.png) no-repeat center center; height: 340px; width: 340px; } - -div#fuel_intro { padding-top: 120px; margin-left: 360px; position: relative; } -div#fuel_intro h1#fuel_cms { background: transparent url(http://www.getfuelcms.com/assets/images/fuel_cms.png) no-repeat center center; width: 247px; height: 53px; text-indent: -10000px; overflow: hidden; margin-bottom: 10px;} -div#fuel_intro div#fuel_tagline { background: transparent url(http://www.getfuelcms.com/assets/images/hdr_tagline.png) no-repeat center center; width: 338px; height: 46px; margin-bottom: 5px; } -div#fuel_intro div#fuel_text { font-size: 13px; margin-left: 30px; position: relative; } -div#fuel_intro div#fuel_text p { margin-bottom: 10px; } - -div#main { width: 724px; margin: auto; padding: 40px 30px 30px 30px; } -div#main h3 { color: #f93; font-weight: bold; font-size: 14px; margin-bottom: 0px; } -div#main li { background-repeat: no-repeat; padding-left: 44px; } - -div#main_inner { width: 400px; float: right; } - -div#features { padding-top: 120px; } -div#for_clients { width: 342px; float: left; padding-right: 20px; } -div#for_developers { width: 342px; float: left; padding-left: 20px;} - -/* footer */ -div#footer { color: #fff; background: transparent url(http://www.getfuelcms.com/assets/images/footer_bg.jpg) repeat-x; height: 117px; } -div#footer p, div#footer li, div#footer address { font-size: 11px; } -div#footer p, div#footer address { line-height: 11px; } -div#footer h4 { margin-bottom: 5px; } -div#footer a { color: #fff; } -div#footer_top { padding: 20px 50px 20px 50px; background: #ef9742 url(http://www.getfuelcms.com/assets/images/footer_bg.jpg) repeat-x; height: 110px; } -div#footer_top div#footer_follow { width: 120px; } -div#footer_bot { padding: 10px 50px; background-color: #dc481d; height: 30px; } -div#request_demo_container { position: absolute; right: 85px; top: 30px; } -div#copyright { color: #f4ca95; text-align: center; width: 500px; margin: auto;} +/* NORMALIZE================================================================ */ +article,aside,details,figcaption,figure,footer,header,hgroup,nav,section,summary{display:block;} audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]){display:none;height:0;} [hidden]{display:none;} html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100% ;} html,button,input,select,textarea{font-family:sans-serif;} body{margin:0;} a:focus{outline:thin dotted;} a:active,a:hover{outline:0;} h1{font-size:2em;margin:0.67em 0;} h2{font-size:1.5em;margin:0.83em 0;} h3{font-size:1.17em;margin:1em 0;} h4{font-size:1em;margin:1.33em 0;} h5{font-size:.83em;margin:1.67em 0;} h6{font-size:.67em;margin:2.33em 0;} abbr[title]{border-bottom:1px dotted;} b,strong{font-weight:700;} blockquote{margin:1em 40px;} dfn{font-style:italic;} mark{background:#ff0;color:#000000;} p,pre{margin:1em 0;} code,kbd,pre,samp{font-family:monospace,serif;_font-family:'courier new',monospace;font-size:1em;} pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word;} q{quotes:none;} q:before,q:after{content:'';content:none;} small{font-size:80%;} sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;} sup{top:-0.5em;} sub{bottom:-0.25em;} dl,menu,ol,ul{margin:1em 0;} dd{margin:0 0 0 40px;} menu,ol,ul{padding:0 0 0 20px;} nav ul,nav ol{list-style:none;list-style-image:none;} img{border:0;-ms-interpolation-mode:bicubic ;} svg:not(:root){overflow:hidden;} figure{margin:0;} form{margin:0;} fieldset{border:1px solid silver;margin:0 2px;padding:0.35em 0.625em 0.75em;} legend{border:0;padding:0;white-space:normal;*margin-left:-7px ;} button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle ;} button,input{line-height:normal;} button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;*overflow:visible ;} button[disabled],input[disabled]{cursor:default;} input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*height:13px;*width:13px ;} input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;} input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;} button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;} textarea{overflow:auto;vertical-align:top ;} table{border-collapse:collapse;border-spacing:0;} +/* CORE================================================================ */ +html, body {min-height: 100%; padding: 0; margin: 0; width: 100%; } +html {font-size: 62.5%; background: #3dbfd9; } +body {font-size: 16px; line-height: 1.5; color: white; font-family: 'Raleway', 'Lucida Grande', 'Gill Sans', Arial, Helvetica, Sans-serif; } +.wrapper { max-width: 1000px; margin: 0 auto; } +.page { background: #212326; } +a:link, a:visited { color: #3dbfd9; text-decoration: none; } +a:hover, a:active, a:focus { text-decoration: underline; } +h1 { font-size: 56px; line-height: 1; margin: 0; } +h2 { font-size: 30px; font-weight: normal; } +h3 { font-size: 44px; margin: 0.25em 0; } +h4 { font-size: 24px; font-weight: bold; margin: 1.2em 0; color: #3dbfd9;} +.page_header { text-align: center; padding-top: 20px; } +section { padding: 3em; } +section header { border-top: 1px solid #3dbfd9; border-bottom: 1px solid #3dbfd9; clear: both; } +ol { list-style: none; margin: 2em 0; padding:0; } +ol li { clear: both; margin: 1em 0; } +.icon_block { float: left; width: 16%; min-width: 100px; text-align: center; margin-top: 5px; } +.content_block { overflow: hidden; } +.circle { margin-top: 0.4em; display: inline-block; font-size: 30px; font-weight: bold; line-height: 55px; background: #3dbfd9; border-radius: 50%; width: 60px; height: 60px; } +.circle object { margin: 15px; float: left; } +.bullets li { list-style: disc; margin-bottom: 0.74em; } +.bullets li ul { padding-left: 0; } +.bullets li li { list-style: none; margin: 0.5em 0; } +.small { font-size: 14px; } +.cta, .cta:link, .cta:visited { font-weight: bold; position: relative; float: right; border: 2px solid white; text-transform: uppercase; white-space: nowrap; color: #ffffff; border-radius: 8px; -webkit-border-radius: 8px; line-height: 2; font-size: 20px; padding: 0.3em 3.5em 0.3em 1em; -webkit-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; background: #ff0000; } +.cta:hover, .cta:active, .cta:focus {text-decoration: none; background: #333333; } +.cta object { position: absolute; right: 1em; top: 20%; } +.writable { padding: 0; list-style: none; } +.writable li { color: #212326; border-radius: 8px; background: #e2f5f9; padding: 0.75em 1em; } +.writable .error { border: 2px solid red; } +.writable .success { border: 2px solid green; } +.footer { padding: 2em 0; position: relative; } +.footer .mainnav {margin-top: 0.5em; } +.footer a:link, .footer a:visited { color: white; } +.mainnav { color: #bcffff; font-size: 14px; font-size: 1.4rem; text-align: center; } +.mainnav ul { padding: 0; margin: 0 auto; } +.mainnav li { display: inline-block; float: none; position: relative; } +.mainnav a { text-transform: uppercase; margin-right: 0.8em; position: relative; } +.mainnav a:link, .mainnav a:visited { color: #bcffff; } +.mainnav a:hover, .mainnav a:active, .mainnav a:focus {color: #ffffff; } +.mainnav a:after {content: '/'; display: inline-block; padding-left: 1em; left: 0; top: 0; font-size: 12px; font-size: 1.2rem; color: #bcffff; } +.mainnav .first a {padding-left: 0; outline: none; } +.mainnav .first a:after {content: '/'; } +.footer .left { position: absolute; margin: 0; } +.colophon {clear: both; text-align: center; margin-top: 3em; font-size: 12px; } +.colophon object { margin-bottom: -8px; } +.small object { margin-bottom: -15px; } +.callout { color: #f00; } +#error_404 { padding: 2em; text-align: center; } \ No newline at end of file diff --git a/assets/images/_template_icons.svg b/assets/images/_template_icons.svg index 696527ea6..626300f7a 100644 --- a/assets/images/_template_icons.svg +++ b/assets/images/_template_icons.svg @@ -25,19 +25,15 @@ c-16.347,0-29.956-11.683-32.954-27.153l23.339-3.5l-6.638,17.116l49.79-21.434C97.221,54.603,97.237,55.067,97.237,55.536z"/> - - - - - - + + - - + +
+
diff --git a/fuel/application/views/_blocks/header.php b/fuel/application/views/_blocks/header.php index 1c9ee4550..db7489237 100755 --- a/fuel/application/views/_blocks/header.php +++ b/fuel/application/views/_blocks/header.php @@ -1,61 +1,34 @@ - - - + <title> <?php - if (!empty($is_blog)) - { + if (!empty($is_blog)) : echo $CI->fuel_blog->page_title($page_title, ' : ', 'right'); - } - else - { + else: echo fuel_var('page_title', ''); - } + endif; ?> + fuel_blog->header(); - } + endif; ?> - - - -
-
- - -
+ +
+
+
+ +

+
\ No newline at end of file diff --git a/fuel/application/views/_install.php b/fuel/application/views/_install.php index 98ecb4aa7..82bf3733e 100644 --- a/fuel/application/views/_install.php +++ b/fuel/application/views/_install.php @@ -6,72 +6,21 @@ Welcome to FUEL CMS - + +
- +

Welcome to Fuel CMS

Version

- +

Getting Started

@@ -165,7 +114,7 @@
- +

What's Next?

@@ -174,16 +123,16 @@
  1. -
    +
    - User Guide + User Guide

    Visit the 1.0 user guide online

  2. -
    +

    Get rolling

    @@ -219,7 +168,7 @@
  3. Blog
    4. -

    FUEL CMS is developed with love by Daylight Studio © Run for Daylight LLC, All Rights Reserved.

    +

    FUEL CMS is developed with love by Daylight Studio © Run for Daylight LLC, All Rights Reserved.

diff --git a/fuel/application/views/_layouts/main.php b/fuel/application/views/_layouts/main.php index 0c14cd26e..a446728ac 100755 --- a/fuel/application/views/_layouts/main.php +++ b/fuel/application/views/_layouts/main.php @@ -1,7 +1,7 @@ load->view('_blocks/header')?> -
- -
+
+ +
load->view('_blocks/footer')?>