Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'restyling' into develop
Conflicts: README.md
- Loading branch information
Showing
6 changed files
with
132 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,53 @@ | ||
| <?php $view->extend('::base.html.php'); ?> | ||
| <div id="landing-index"> | ||
|
|
||
| <div> | ||
| <img src="<?=$view['assets']->getUrl('modules/framework/images/ppi-logo-white.png'); ?>" style="width: 10.5em;" /> | ||
| <?php $view['slots']->start('include_js_body'); ?> | ||
| <script src="<?=$view['assets']->getUrl('js/home.js');?>"></script> | ||
| <?php $view['slots']->stop(); ?> | ||
|
|
||
| <div id="landing"> | ||
| <div class="landing-wrapper"> | ||
| <img src="<?=$view['assets']->getUrl('modules/framework/images/ppi-logo-white.png'); ?>" /> | ||
| <div class="buttons"> | ||
| <a href="http://ppi.readthedocs.org/en/2.1/" target="_blank">Read the Docs</a><!-- | ||
| --><a href="https://github.com/ppi/framework" target="_blank">Discover on GitHub</a><!-- | ||
| --><a class="find-out-more" href="#landing-two">Find out More <i class="fa fa-fw fa-caret-down"></i></a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <h2>Welcome!</h2> | ||
| <p>Congratulations! You have successfully installed a new PPI application.</p> | ||
| <div id="landing-two"> | ||
| <div class="landing-wrapper"> | ||
| <img src="<?=$view['assets']->getUrl('modules/framework/images/ppi-logo-white.png'); ?>" /> | ||
| <h2>Welcome!</h2> | ||
| <p>Congratulations! You have successfully installed a new PPI application.</p> | ||
|
|
||
| <div class="clearfix list-container"> | ||
| <div class="landing-list"> | ||
| <p class="list-title">Documentation</p> | ||
| <ul> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/application.html">Skeleton Application</a></li> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/modules.html">Modules</a></li> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/routing.html">Routing</a></li> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/controllers.html">Controllers</a></li> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/templating.html">Templating</a></li> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/services.html">Services</a></li> | ||
| </ul> | ||
| </div> | ||
| <div class="clearfix list-container"> | ||
| <div class="landing-list"> | ||
| <h3>Documentation</h3> | ||
| <ul> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/application.html">Skeleton Application</a></li> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/modules.html">Modules</a></li> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/routing.html">Routing</a></li> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/controllers.html">Controllers</a></li> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/templating.html">Templating</a></li> | ||
| <li><a href="http://ppi.readthedocs.org/en/2.1/book/services.html">Services</a></li> | ||
| </ul> | ||
| </div> | ||
|
|
||
| <div class="landing-list"> | ||
| <p class="list-title">Configuration</p> | ||
| <ul> | ||
| <li><a href="/check.php">Checker</a></li> | ||
| </ul> | ||
| </div> | ||
| <div class="landing-list"> | ||
| <h3>Configuration</h3> | ||
| <ul> | ||
| <li><a href="<?=$view['assets']->getUrl('check.php');?>">Environment Checker</a></li> | ||
| </ul> | ||
| </div> | ||
|
|
||
| <div class="landing-list"> | ||
| <p class="list-title">Community</p> | ||
| <ul> | ||
| <li><a href="https://gitter.im/ppi/framework">Team Chat</a></li> | ||
| <li><a href="http://www.github.com/ppi/skeletonapp">GitHub</a></li> | ||
| </ul> | ||
| <div class="landing-list"> | ||
| <h3>Community</h3> | ||
| <ul> | ||
| <li><a href="https://gitter.im/ppi/framework">Team Chat</a></li> | ||
| <li><a href="http://www.github.com/ppi/skeletonapp">GitHub</a></li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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'); | ||
| }); | ||
| }); |