diff --git a/app/views/base.html.php b/app/views/base.html.php index 48fd0e9..b9d1e5a 100644 --- a/app/views/base.html.php +++ b/app/views/base.html.php @@ -1,17 +1,14 @@ - - - - + <?php $view['slots']->output('title', 'PPI Skeleton Application') ?> - + output('include_css'); ?> @@ -30,11 +27,12 @@ -
+
output('_content'); ?>
+ output('include_js_body'); ?> diff --git a/bower.json b/bower.json index d6ecfdf..1a931f2 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,9 @@ "name": "ppi/skeletonapp", "dependencies": { "bootstrap": "3.3.2", - "modernizr": "2.8.3" + "modernizr": "2.8.3", + "fontawesome": "4.3.0", + "jquery-ui": "1.11.4" }, "private": true } \ No newline at end of file diff --git a/composer.lock b/composer.lock index 312163d..5199677 100755 --- a/composer.lock +++ b/composer.lock @@ -906,7 +906,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ppi/framework/zipball/bc67ac3aec80ce748326a012af42fcf3bc040669", + "url": "https://api.github.com/repos/ppi/framework/zipball/02e19b045b0e9c523a2ab58870c08e482de0e1bb", "reference": "bc67ac3aec80ce748326a012af42fcf3bc040669", "shasum": "" }, diff --git a/modules/Application/resources/views/index/index.html.php b/modules/Application/resources/views/index/index.html.php index f227d34..3863067 100644 --- a/modules/Application/resources/views/index/index.html.php +++ b/modules/Application/resources/views/index/index.html.php @@ -1,40 +1,53 @@ extend('::base.html.php'); ?> -
-
- +start('include_js_body'); ?> + +stop(); ?> + + -

Welcome!

-

Congratulations! You have successfully installed a new PPI application.

+
+
+ +

Welcome!

+

Congratulations! You have successfully installed a new PPI application.

-
-
-

Documentation

- -
+
+
+

Documentation

+ +
-
-

Configuration

- -
+
+

Configuration

+ +
-
-

Community

- +
+

Community

+ +
-
\ No newline at end of file diff --git a/public/css/main.css b/public/css/main.css index f90e599..419fac4 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -1,86 +1,90 @@ html, body { + min-height:100%; + height:100%; + position:relative; background:#161616; - width: 100%; - height: 100%; } - -.clearfix:after { - visibility: hidden; - display: block; - font-size: 0; - content: " "; - clear: both; - height: 0; -} -.clearfix { display: inline-block; } -/* start commented backslash hack \*/ -* html .clearfix { height: 1%; } -.clearfix { display: block; } -/* close commented backslash hack */ - -#landing-index { +h2 { + margin:0; +} +h3 { + margin:0 0 10px 0; +} +#container { + height:100%; +} +#landing, #landing-two { + height:100%; + position:relative; + background:#284545; + border-top:1px solid; text-align:center; - font-family: 'Open Sans', sans-serif; + padding:50px; +} +#landing-two { + background:#202020; + text-align:left; + padding:50px; color:#fff; - padding: 0 10% 5% 10%; - width: 80%; - margin: 2% auto 5% auto; - display: block; - border: 1px solid #fff; - height: 100%; + border:none; } - -#landing-index img { - margin-top: 5%; +#landing img, #landing-two img { + width:120px; + margin-bottom:50px; } - -#landing-index h2 { - margin-top: 5%; - font-weight:300; - font-size: 2.0em; +#landing .landing-wrapper { + position:relative; + top:50%; + margin-top:-100px; + height:215px; } -#landing-index p { - /*border: 1px solid red;*/ - font-size: 1.3em; +#landing .landing-wrapper .buttons a { + width:200px; + background:#406c6c; + border-radius:4px; + padding:15px; + display:inline-block; + color:#fff; + text-decoration:none; + border:1px solid #303030; + outline:none; } - -#landing-index .landing-list { - float: left; - width: 33%; - display: block; +#landing .landing-wrapper .buttons a { + margin-left:5px; } - -#landing-index .landing-list .list-title { - text-align: left; - font-size: 1.8em; +#landing .landing-wrapper .buttons a:first-child { + margin-left:0; } - -#landing-index .landing-list ul { - list-style-type: none; - padding: 0; - /*padding: 0 0 0 12px;*/ - margin: 0; - - - /*list-style-image: url(/modules/framework/images/bullet-grey.png);*/ - +#landing .landing-wrapper .buttons a:last-child { + background:#202020; + border-color:#161616; } -#landing-index .landing-list li { - padding-left: 0; - text-align: left; - margin-bottom: 5px; - background-image: url(/modules/framework/images/bullet-grey.png); - background-repeat: no-repeat; +.list-container { + width:100%; + margin-top:50px; } - -#landing-index .landing-list li a { - font-size: 1.5em; - color: #c1c1c1; - display: block; - padding-left: 1.8em; +.landing-list { + width:30%; + height:200px; + padding:1% 1.5%; + float:left; + margin-left:5%; + background:rgba(255, 255, 255, 0.05); + border-radius:4px; } - -#landing-index .list-container { - margin-top: 5%; +.landing-list:first-child { + margin-left:0; +} +.landing-list ul { + list-style:none; + padding:0; + margin:0; +} +.landing-list:first-child ul { + border:none; +} +.landing-list a { + color:#406c6c; + font-size: 1.2em; } \ No newline at end of file diff --git a/public/js/home.js b/public/js/home.js index 7803443..da2099d 100644 --- a/public/js/home.js +++ b/public/js/home.js @@ -1,5 +1,8 @@ -jQuery(document).ready(function($) { - - $('.flashes .alert').alert(); - +$(document).ready(function($) { + $('.find-out-more').on('click', function(event){ + event.preventDefault(); + $('html, body').animate({ + scrollTop: $('#landing-two').position().top + }, 1500, 'easeInOutCubic'); + }); }); \ No newline at end of file