github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-05-02 09:34:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prepare welcome hero for demo

Browse Source
This commit is contained in:
Toby Zerner 2015-02-26 13:30:13 +10:30
parent 986b2d8948
commit 2884662723
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ember/app/styles/flarum/layout.less
View File

@ -127,11 +127,17 @@ body {
// Hero // Hero
.hero { .hero {
background: @fl-body-hero-bg; background: @fl-body-hero-bg;
color: @fl-body-hero-color;
margin-top: -1px; margin-top: -1px;
text-align: center; text-align: center;
padding: 30px 0; padding: 30px 0;
font-size: 14px; font-size: 14px;
&, & a {
color: @fl-body-hero-color;
}
& a {
opacity: 0.5;
}
} }
.hero .close { .hero .close {
float: right; float: right;
@ -143,11 +149,6 @@ body {
margin: 0; margin: 0;
font-size: 22px; font-size: 22px;
font-weight: normal; font-weight: normal;
// color: @fl-body-heading-color;
// & when (@fl-colored-hdr = true) {
// color: @fl-body-color;
// }
} }
.hero p { .hero p {
margin: 10px 0 0; margin: 10px 0 0;

2
ember/app/templates/components/index/welcome-hero.hbs
View File

@ -2,6 +2,6 @@
<button class="close btn btn-icon btn-link" {{action "close"}}>{{fa-icon "times"}}</button> <button class="close btn btn-icon btn-link" {{action "close"}}>{{fa-icon "times"}}</button>
<div class="container-narrow"> <div class="container-narrow">
<h2>Welcome to {{title}}</h2> <h2>Welcome to {{title}}</h2>
<p>{{description}}</p> <p>{{{description}}}</p>
</div> </div>
</div> </div>

3
ember/app/views/index.js
View File

@ -5,6 +5,7 @@ import ActionButton from 'flarum/components/ui/action-button';
import NavItem from 'flarum/components/ui/nav-item'; import NavItem from 'flarum/components/ui/nav-item';
import WelcomeHero from 'flarum/components/index/welcome-hero'; import WelcomeHero from 'flarum/components/index/welcome-hero';
import HasItemLists from 'flarum/mixins/has-item-lists'; import HasItemLists from 'flarum/mixins/has-item-lists';
import config from 'flarum/config/environment';
var precompileTemplate = Ember.Handlebars.compile; var precompileTemplate = Ember.Handlebars.compile;
var $ = Ember.$; var $ = Ember.$;
@ -15,7 +16,7 @@ export default Ember.View.extend(HasItemLists, {
didInsertElement: function() { didInsertElement: function() {
this.set('hero', WelcomeHero.extend({ this.set('hero', WelcomeHero.extend({
title: this.get('controller.controllers.application.forumTitle'), title: this.get('controller.controllers.application.forumTitle'),
description: 'Thanks for stopping by!' description: config.welcomeDescription
})); }));
// Affix the sidebar so that when the user scrolls down it will stick // Affix the sidebar so that when the user scrolls down it will stick

4
src/Web/Actions/IndexAction.php
View File

@ -18,7 +18,9 @@ class IndexAction extends Action
'apiURL' => '/api', 'apiURL' => '/api',
'locationType' => 'hash', 'locationType' => 'hash',
'EmberENV' => [], 'EmberENV' => [],
'APP' => [] 'APP' => [],
'forumTitle' => Config::get('flarum::forum_title', 'Flarum Demo Forum'),
'welcomeDescription' => 'Flarum is now at a point where you can have basic conversations, so here is a little demo for you to break. <a href="http://flarum.dev/#/107/starting-a-new-discussion-title">Learn more &raquo;</a>'
]; ];
$data = []; $data = [];
$session = []; $session = [];