Skip to content

Commit

Permalink
various style updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Nickstr committed Dec 16, 2013
1 parent 58ec8b4 commit b4b7ab6
Show file tree
Hide file tree
Showing 122 changed files with 167 additions and 113 deletions.
Empty file modified .gitattributes
100644 → 100755
Empty file.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified .gitmodules
100644 → 100755
Empty file.
Empty file modified .travis.yml
100644 → 100755
Empty file.
Empty file modified CONTRIBUTING.md
100644 → 100755
Empty file.
Empty file modified Makefile
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
Empty file modified VISION.md
100644 → 100755
Empty file.
Empty file modified Vagrantfile
100644 → 100755
Empty file.
Empty file modified app/Lio/Accounts/UserCreator.php
100644 → 100755
Empty file.
Empty file modified app/Lio/Accounts/UserCreatorObserver.php
100644 → 100755
Empty file.
Empty file modified app/Lio/Comments/ForumCreateForm.php
100644 → 100755
Empty file.
Empty file modified app/Lio/Comments/ReplyForm.php
100644 → 100755
Empty file.
Empty file modified app/Lio/Github/GistEmbedFormatter.php
100644 → 100755
Empty file.
Empty file modified app/Lio/Github/GithubAuthenticator.php
100644 → 100755
Empty file.
Empty file modified app/Lio/Github/GithubAuthenticatorObserver.php
100644 → 100755
Empty file.
Empty file modified app/Lio/Github/GithubUserDataReader.php
100644 → 100755
Empty file.
Empty file modified app/Lio/Markdown/HtmlMarkdownConvertor.php
100644 → 100755
Empty file.
Empty file modified app/Lio/ServiceProviders/MarkdownServiceProvider.php
100644 → 100755
Empty file.
Empty file modified app/Lio/Tags/TagCollection.php
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified app/views/articles/_comment.blade.php
100644 → 100755
Empty file.
Empty file modified app/views/articles/_tag_chooser.blade.php
100644 → 100755
Empty file.
Empty file modified app/views/articles/deletecomment.blade.php
100644 → 100755
Empty file.
Empty file modified app/views/articles/editcomment.blade.php
100644 → 100755
Empty file.
Empty file modified app/views/dashboard/_sidebar.blade.php
100644 → 100755
Empty file.
Empty file modified app/views/forum/_comment.blade.php
100644 → 100755
Empty file.
35 changes: 15 additions & 20 deletions app/views/forum/_sidebar.blade.php
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
<div class="categories">
<h4>Categories</h4>
<ul>
<li><a href="{{ action('ForumController@getIndex') }}">All Threads</a></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=installation,configuration">Installation / Configuration</a></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=authentication,security">Authentication / Security</a></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=requests,input">Requests / Input / Responses</a></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=session,cache">Session / Cache</a></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=database,eloquent">Database / Eloquent</a></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=packages,ioc">Packages / IoC </a></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=views,blade,forms">Views / Blade / Forms</a></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=mail,queues">Mail / Queues</a></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=meetups">Local Community Meetups</a></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=laravelio">Laravel.io Site and Community</a></li>
</ul>
<div class="search">
{{ Form::text('search', null, ['placeholder' => 'search the laravel.io forum'] )}}
</div>

<div class="new-post">
<h4>Create a Thread</h4>
<p>Forum threads are a way to begin a discussion over a specific topic. Is there a topic that you&#39;d like to discuss that you don&#39;t see in the forum?</p>
<a class="button full" href="{{ action('ForumController@getCreateThread') }}">Create a Thread</a>
</div>
<ul>
<li><a href="{{ action('ForumController@getIndex') }}">All Threads</a><span>4</span></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=installation,configuration">Installation / Configuration</a><span>4</span></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=authentication,security">Authentication / Security</a><span>4</span></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=requests,input">Requests / Input / Responses</a><span>4</span></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=session,cache">Session / Cache</a><span>4</span></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=database,eloquent">Database / Eloquent</a><span>4</span></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=packages,ioc">Packages / IoC </a><span>4</span></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=views,blade,forms">Views / Blade / Forms</a><span>4</span></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=mail,queues">Mail / Queues</a><span>4</span></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=meetups">Local Community Meetups</a><span>4</span></li>
<li><a href="{{ action('ForumController@getIndex') }}?tags=laravelio">Laravel.io Site and Community</a><span>4</span></li>
</ul>
Empty file modified app/views/forum/_tag_chooser.blade.php
100644 → 100755
Empty file.
19 changes: 9 additions & 10 deletions app/views/forum/_thread_summary.blade.php
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<article>
<div class="title-tags">
<div class="thread-summary">
{{ $thread->author->thumbnail }}
<div class="info">
<h3><a href="{{ $thread->forumThreadUrl }}">{{ $thread->title }}</a></h3>
<div class="tags">Tags: {{ $thread->tags->getTagList() }}</div>
<ul class="meta">
<li>{{ $thread->created_ago }}</li>
<li>By {{ $thread->author->name }}</li>
</ul>
</div>

<ul class="meta">
<li><i class="icon-time"></i> {{ $thread->updated_ago }}</li>
<li><i class="icon-user"></i> <a href="{{ $thread->author->profileUrl }}">{{ $thread->author->name }}</a></li>
<li><i class="icon-comments"></i> {{ $thread->child_count_label }}</li>
</ul>
</article>
<div class="comment-count">{{ $thread->child_count }}</div>
</div>
Empty file modified app/views/forum/delete.blade.php
100644 → 100755
Empty file.
Empty file modified app/views/forum/editcomment.blade.php
100644 → 100755
Empty file.
Empty file modified app/views/forum/editthread.blade.php
100644 → 100755
Empty file.
38 changes: 21 additions & 17 deletions app/views/forum/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,28 @@

@section('content')
<section class="forum">
<h1>Forum</h1>
<div class="header">
<h1>Forum</h1>
{{-- Display select tags --}}
@if(Input::get('tags'))
<div class="tags">
{{ Input::get('tags') }}
</div>
@endif
<a class="button" href="{{ action('ForumController@getCreateThread') }}">Add new Post</a>
</div>

@if(Input::has('tags'))
<div class="tags">Threads tagged with {{ Input::get('tags') }}.</div>
@else
<div class="tags">All threads</div>
@endif
<div class="threads">
{{-- Loop over the threads and display the thread summary partial --}}
@each('forum._thread_summary', $threads, 'thread')

@if($threads->count() > 0)
@foreach($threads as $thread)
@include('forum._thread_summary')
@endforeach

{{ str_replace('%2C', ',', $threads->links()) }}
@else
<div class="">
There are currently no threads for the selected category.
</div>
@endif
{{-- If no comments are found display a message --}}
@if(!$threads->count())
<div class="empty-state">
<h3>No threads found that are tagged with {{ Input::get('tags') }}</h3>
<a class="button" href="{{ action('ForumController@getCreateThread') }}">Create a new thread</a>
</div>
@endif
</div>
</section>
@stop
29 changes: 17 additions & 12 deletions app/views/forum/thread.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,28 @@
@include('forum._sidebar')
@stop

<style>
/* Better styles for embedding GitHub Gists */
.gist{font-size:13px;line-height:18px;margin-bottom:20px;width:100%}
.gist pre{font-family:Menlo,Monaco,'Bitstream Vera Sans Mono','Courier New',monospace !important}
.gist-meta{font-family:Helvetica,Arial,sans-serif;font-size:13px !important}
.gist-meta a{color:#26a !important;text-decoration:none}
.gist-meta a:hover{color:#0e4071 !important}
</style>

@section('content')
<div class="forum">
<div class="header">
<h1>{{ $thread->title }}</h1>
</div>
<div class="thread">
{{ $thread->body }}
</div>
<div class="comments">
@foreach($comments as $comment)
@include('forum._comment')
@endforeach
</div>
</div>


<div class="row forum">
<div class="small-12 columns comments">
@foreach($comments as $comment)
@include('forum._comment')
@endforeach

{{ $comments->links() }}



@if(Auth::check())
<div class="row">
Expand Down
Empty file modified app/views/layouts/_code_prettify.blade.php
100644 → 100755
Empty file.
Empty file modified app/views/layouts/_footer.blade.php
100644 → 100755
Empty file.
Empty file modified app/views/layouts/_one_column.blade.php
100644 → 100755
Empty file.
44 changes: 15 additions & 29 deletions app/views/layouts/_top_nav.blade.php
Original file line number Diff line number Diff line change
@@ -1,36 +1,22 @@
<header class="top-navigation">
<div class="top-navigation-logo">
<a href="{{ action('HomeController@getIndex') }}">
<img class="logo" src="/images/laravel-io-logo-dark-v3.png">
</a>
</div>
<nav>
<ul class="top-navigation-signin-mobile">
@if(Auth::check())
{{-- <li><a href="{{ action('DashboardController@getIndex') }}">{{ Auth::user()->name }}'s Dashboard</a></li> --}}
<li><a href="{{ action('AuthController@getLogout') }}">Logout</a></li>
@else
<li><a href="{{ action('AuthController@getLogin') }}">Login with GitHub</a></li>
@endif
</ul>
<div class="top-navigation-logo">
<a href="{{ action('HomeController@getIndex') }}">
<img class="logo" src="/images/laravel-io-logo-small.png">
</a>
</div>
<ul class="top-navigation-items">
<!-- <li>
<a href="{{ action('ArticlesController@getIndex') }}">Articles</a>
</li>
--> <li>
<ul>
<li>
<a href="{{ action('ForumController@getIndex') }}">Forum</a>
</li>
<!-- <li>
<a href="{{ action('ChatController@getIndex') }}">Chat</a>
</li>
--> </ul>
<ul class="top-navigation-signin-desktop">
@if(Auth::check())
{{-- <li><a href="{{ action('DashboardController@getIndex') }}">{{ Auth::user()->name }}<span class="dashboard-word">'s Dashboard</span></a></li> --}}
<li><a href="{{ action('AuthController@getLogout') }}">Logout</a></li>
@else
<li><a href="{{ action('AuthController@getLogin') }}">Login with GitHub</a></li>
@endif
</ul>
</nav>
<ul class="user-navigation">
@if(Auth::check())
{{-- <li><a href="{{ action('DashboardController@getIndex') }}">{{ Auth::user()->name }}<span class="dashboard-word">'s Dashboard</span></a></li> --}}
<li><a href="{{ action('AuthController@getLogout') }}">Logout</a></li>
@else
<li><a class="button inverse" href="{{ action('AuthController@getLogin') }}">Login with GitHub</a></li>
@endif
</ul>
</header>
6 changes: 4 additions & 2 deletions app/views/layouts/default.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
@include('layouts._top_nav')
@include('layouts._flash')

<div class="content">
{{ $content }}
<div class="holder">
<div class="test">
{{ $content }}
</div>
</div>

@include('layouts._footer')
Expand Down
Empty file modified app/views/users/_sidebar.blade.php
100644 → 100755
Empty file.
Empty file modified bootstrap/autoload.php
100644 → 100755
Empty file.
Empty file modified bootstrap/paths.php
100644 → 100755
Empty file.
Empty file modified bootstrap/start.php
100644 → 100755
Empty file.
Empty file modified codeception.yml
100644 → 100755
Empty file.
Empty file modified composer.json
100644 → 100755
Empty file.
Empty file modified composer.lock
100644 → 100755
Empty file.
Empty file modified install_vagrant.sh
100644 → 100755
Empty file.
Empty file modified phpunit.xml
100644 → 100755
Empty file.
Empty file modified public/favicon.ico
100644 → 100755
Empty file.
Empty file modified public/images/laravel-io-logo-dark-v2.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/laravel-io-logo-dark-v3.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/images/laravel-io-logo-dark.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/javascripts/forums.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/epiceditor-md.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-apollo.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-basic.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-clj.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-css.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-dart.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-erlang.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-go.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-hs.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-lisp.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-llvm.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-lua.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-matlab.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-ml.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-mumps.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-n.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-pascal.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-proto.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-r.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-rd.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-scala.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-sql.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-tcl.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-tex.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-vb.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-vhdl.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-wiki.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-xq.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/lang-yaml.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/prettify.css
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/prettify.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/google-code-prettify/run_prettify.js
100644 → 100755
Empty file.
Empty file modified public/javascripts/vendor/tabby.js
100644 → 100755
Empty file.
3 changes: 2 additions & 1 deletion public/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@
@import "modules/_global";
@import "modules/_forum";
@import "modules/_buttons";
@import "modules/_sidebar";
@import "modules/_sidebar";
@import "modules/_empty-state";
2 changes: 1 addition & 1 deletion public/scss/modules/__clean-module-skeleton.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

@media only screen and (min-width: 768px) {

.module {}

}


Expand Down
Empty file modified public/scss/modules/_buttons.scss
100644 → 100755
Empty file.
45 changes: 45 additions & 0 deletions public/scss/modules/_empty-state.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/* ==========================================================================
MOBILE FIRST MODULE SKELETON
========================================================================== */

// MOBILE STYLES ////////////////////////////////////////////////////////////

.module {}


// BREAKPOINT 1 (480) ////////////////////////////////////////////////////////////

@media only screen and (min-width: 480px) {

.module {}

}


// BREAKPOINT 2 (768) ////////////////////////////////////////////////////////////

@media only screen and (min-width: 768px) {

.empty-state {
h3 {
margin: 0;
padding: 0 0 15px 0;
}
}
}


// BREAKPOINT 3 (1024) ////////////////////////////////////////////////////////////

@media only screen and (min-width: 1024px) {

.module {}
}


// BREAKPOINT 4 (1440) ////////////////////////////////////////////////////////////

@media only screen and (min-width: 1440px) {

.module {}
}
56 changes: 36 additions & 20 deletions public/scss/modules/_forum.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,37 @@

.header {
@include clearfix;
padding: 19px 0 18px 15px;
padding: 19px 15px 18px 15px;
border-bottom:1px solid #cdcdcd;
}

h1 {
font-size:22px;
margin: 0;
float: left;
font-family: 'Source Sans Pro', sans-serif;
font-weight: 800;
}
h1 {
font-size:22px;
margin: 0;
float: left;
font-family: 'Source Sans Pro', sans-serif;
font-weight: 800;
}

.tags {
float: right;
margin: 0;
padding: 5px 0 0 0;
.tags {
display: block;
float: left;
font-family: 'Source Sans Pro', sans-serif;
font-weight: 400;
font-size:16px;
padding: 4px 0 0 7px;
font-style: italic;
}

li {
list-style-type: none;
.button {
float: right;
}
}


.topics {
.threads {
@include span-columns(12);
padding: 15px 0 15px 15px;
padding: 15px 15px 15px 15px;

.topic {
.thread-summary {
width:100%;
@include clearfix;
padding: 12px 20px 12px 10px;
Expand All @@ -74,6 +77,14 @@
color:$lioGrey;
font-family: 'Source Sans Pro', sans-serif;
font-weight: 400;

a {
color:$lioGrey;

&:hover {
color:$lioRed;
}
}
}

ul {
Expand All @@ -96,6 +107,7 @@
}

.comment-count {
min-width:25px;
float: right;
background: #cdcdcd;
padding: 5px;
Expand All @@ -105,10 +117,14 @@
}
}

.topic:nth-child(odd) {
.thread-summary:nth-child(odd) {
background: white;
}
}

.thread {
padding: 15px;
}
}
}

Expand Down
Empty file modified public/scss/modules/_global.scss
100644 → 100755
Empty file.
1 change: 1 addition & 0 deletions public/scss/modules/_header.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
header {
@include clearfix;
border-bottom:1px solid #cdcdcd;
padding: 0 15px;
}

.user-navigation {
Expand Down
Empty file modified public/scss/modules/_navigation.scss
100644 → 100755
Empty file.
Empty file modified public/scss/modules/_sidebar.scss
100644 → 100755
Empty file.
Empty file modified server.php
100644 → 100755
Empty file.
Empty file modified tests/_bootstrap.php
100644 → 100755
Empty file.
Empty file modified tests/_data/dump.sql
100644 → 100755
Empty file.
Empty file modified tests/_helpers/CodeHelper.php
100644 → 100755
Empty file.
Empty file modified tests/_helpers/TestHelper.php
100644 → 100755
Empty file.
Empty file modified tests/_helpers/WebHelper.php
100644 → 100755
Empty file.
Empty file modified tests/_log/.gitignore
100644 → 100755
Empty file.
Empty file modified tests/_log/.gitkeep
100644 → 100755
Empty file.
Empty file modified tests/acceptance.suite.yml
100644 → 100755
Empty file.
Empty file modified tests/acceptance/WebGuy.php
100644 → 100755
Empty file.
Empty file modified tests/acceptance/_bootstrap.php
100644 → 100755
Empty file.
Empty file modified tests/functional.suite.yml
100644 → 100755
Empty file.
Empty file modified tests/functional/TestGuy.php
100644 → 100755
Empty file.
Empty file modified tests/functional/_bootstrap.php
100644 → 100755
Empty file.
Empty file modified tests/unit.suite.yml
100644 → 100755
Empty file.
Empty file modified tests/unit/CodeGuy.php
100644 → 100755
Empty file.
Empty file modified tests/unit/GitHub/GistEmbedFormatterTest.php
100644 → 100755
Empty file.
Empty file modified tests/unit/GitHub/GithubAuthenticatorTest.php
100644 → 100755
Empty file.
Empty file modified tests/unit/Markdown/HtmlToMarkdownConvertorTest.php
100644 → 100755
Empty file.
Empty file modified tests/unit/UnitTestCase.php
100644 → 100755
Empty file.
Empty file modified tests/unit/_bootstrap.php
100644 → 100755
Empty file.
Empty file modified update_environment.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion vagrant-chef
Empty file modified workers/cron.yml
100644 → 100755
Empty file.

0 comments on commit b4b7ab6

Please sign in to comment.