Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
UserAdminV2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
庄欣
UserAdminV2
Commits
75e2aca9
Commit
75e2aca9
authored
Nov 25, 2014
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Working on default layout.
parent
d4c2ecc4
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
69 additions
and
69 deletions
+69
-69
public/css/app.css
+18
-15
resources/assets/sass/app.scss
+4
-7
resources/assets/sass/pages/_auth.scss
+0
-0
resources/assets/sass/pages/_welcome.scss
+26
-2
resources/assets/sass/partials/_banner.scss
+0
-18
resources/assets/sass/partials/_buttons.scss
+3
-0
resources/assets/sass/variables.scss
+0
-0
resources/views/layouts/app.blade.php
+0
-4
resources/views/welcome.blade.php
+18
-23
No files found.
public/css/app.css
View file @
75e2aca9
...
...
@@ -4605,43 +4605,49 @@ button.close {
.hidden-print
{
display
:
none
!important
;
}
}
.forgot-password
{
padding-top
:
7px
;
vertical-align
:
middle
;
}
.fa-btn
{
margin-right
:
10px
;
}
.navbar-avatar
{
border-radius
:
999px
;
margin
:
-11px
10px
-10px
0
;
padding
:
0
;
}
.jumbotron
{
.forgot-password
{
padding-top
:
7px
;
vertical-align
:
middle
;
}
#welcome
.jumbotron
{
background
:
#F55430
;
color
:
#fde0da
;
margin-top
:
-20px
;
}
.jumbotron__header
,
.jumbotron
h1
{
#welcome
.jumbotron__header
,
.jumbotron
h1
{
font-weight
:
bold
;
color
:
white
;
margin-top
:
0
;
}
.jumbotron__body
{
#welcome
.jumbotron__body
{
max-width
:
80%
;
margin-bottom
:
0
;
line-height
:
1.6em
;
}
.steps
{
#welcome
.jumbotron__header
,
.jumbotron
h1
{
font-weight
:
lighter
;
}
#welcome
.steps
{
max-width
:
80%
;
padding-left
:
0
;
list-style
:
none
;
counter-reset
:
welcome-steps
;
}
.steps
>
.steps__item
{
#welcome
.steps
>
.steps__item
{
margin-bottom
:
2.5em
;
padding
:
19px
;
border
:
1px
solid
#eeeeee
;
border-radius
:
4px
;
overflow
:
hidden
;
}
.steps
>
.steps__item
:before
{
#welcome
.steps
>
.steps__item
:before
{
content
:
counter
(
welcome-steps
);
counter-increment
:
welcome-steps
;
width
:
50px
;
...
...
@@ -4654,13 +4660,10 @@ button.close {
font
:
bold
2em
monospace
;
text-align
:
center
;
line-height
:
49px
;
}
.steps
>
.steps__item
.body
{
#welcome
.steps
>
.steps__item
.body
{
float
:
left
;
}
.steps
>
.steps__item
h2
{
#welcome
.steps
>
.steps__item
h2
{
font-weight
:
bold
;
margin-top
:
0
;
}
.steps
>
.steps__item
p
:last-child
{
#welcome
.steps
>
.steps__item
p
:last-child
{
margin-bottom
:
0
;
}
.fa-btn
{
margin-right
:
10px
;
}
resources/assets/sass/app.scss
View file @
75e2aca9
@import
"
partials/
variables"
;
@import
"variables"
;
@import
"bootstrap"
;
@import
"partials/auth"
;
@import
"partials/buttons"
;
@import
"partials/navigation"
;
@import
"partials/banner"
;
@import
"pages/auth"
;
@import
"pages/welcome"
;
.fa-btn
{
margin-right
:
10px
;
}
resources/assets/sass/pa
rtial
s/_auth.scss
→
resources/assets/sass/pa
ge
s/_auth.scss
View file @
75e2aca9
File moved
resources/assets/sass/pages/_welcome.scss
View file @
75e2aca9
.steps
{
#welcome
.jumbotron
{
background
:
$primary
;
color
:
lighten
(
$primary
,
35%
);
margin-top
:
-20px
;
}
#welcome
.jumbotron__header
,
.jumbotron
h1
{
font-weight
:
bold
;
color
:
white
;
margin-top
:
0
;
}
#welcome
.jumbotron__body
{
max-width
:
80%
;
margin-bottom
:
0
;
line-height
:
1
.6em
;
}
#welcome
.jumbotron__header
,
.jumbotron
h1
{
font-weight
:
lighter
;
}
#welcome
.steps
{
max-width
:
80%
;
padding-left
:
0
;
list-style
:
none
;
counter-reset
:
welcome-steps
;
}
.steps
>
.steps__item
{
#welcome
.steps
>
.steps__item
{
margin-bottom
:
2
.5em
;
padding
:
19px
;
border
:
1px
solid
$gray-lighter
;
...
...
resources/assets/sass/partials/_banner.scss
deleted
100644 → 0
View file @
d4c2ecc4
.jumbotron
{
background
:
$primary
;
color
:
lighten
(
$primary
,
35%
);
margin-top
:
-20px
;
}
.jumbotron__header
,
.jumbotron
h1
{
font-weight
:
bold
;
color
:
white
;
margin-top
:
0
;
}
.jumbotron__body
{
max-width
:
80%
;
margin-bottom
:
0
;
line-height
:
1
.6em
;
}
resources/assets/sass/partials/_buttons.scss
0 → 100644
View file @
75e2aca9
.fa-btn
{
margin-right
:
10px
;
}
resources/assets/sass/
partials/_
variables.scss
→
resources/assets/sass/variables.scss
View file @
75e2aca9
File moved
resources/views/layouts/app.blade.php
View file @
75e2aca9
...
...
@@ -64,11 +64,7 @@
</div>
</nav>
@yield('banner')
<div
class=
"container"
>
@yield('content')
</div>
<!-- Bootstrap JavaScript -->
<script
src=
"/js/vendor/jquery.js"
></script>
...
...
resources/views/welcome.blade.php
View file @
75e2aca9
@
extends
(
'layouts.app'
)
@
section
(
'banner'
)
<
div
class
="
jumbotron
">
@
section
(
'content'
)
<
div
id
=
"welcome"
>
<
div
class
="
jumbotron
">
<div class="
container
">
<h1 class="
jumbotron__header
">Welcome to Laravel 5!
</h1>
<h1 class="
jumbotron__header
">Welcome to Laravel 5.
</h1>
<p class="
jumbotron__body
">
Laravel is a web application framework with expressive, elegant syntax. We believe development
must be an enjoyable, creative experience to be truly fulfilling
.
must be an enjoyable, creative experience. Enjoy the fresh air
.
</p>
</div>
</div>
@stop
</div>
@section('content')
<ol class="
steps
">
<div class="
container
">
<ol class="
steps
">
<li class="
steps__item
">
<div class="
body
">
<h2>Have a Look Around</h2>
<p>
Review <code>app/Http/Controllers/WelcomeController.php</code> to learn
how this page was constructed.
Review <code>app/Http/routes.php</code> to learn how HTTP requests are
routed to controllers.
</p>
<p>
We've included simple login and registration screens to get you started.
</p>
</div>
</li>
...
...
@@ -31,8 +35,7 @@
<h2>Harness Your Skills</h2>
<p>
Once you've toyed around for a bit, you'll surely want to dig in and
learn more. Try:
Ready to keep learning more about Laravel? Start here:
</p>
<ul>
...
...
@@ -47,19 +50,11 @@
<h2>Forge Ahead</h2>
<p>
Finished building your app? It's time to deploy! Laravel still has your back. Use
<a href="
https
://
forge
.
laravel
.
com
">Laravel Forge</a>.
When you're finished building your application, Laravel still has your back. Check out
<a href="
https
://
forge
.
laravel
.
com
">Laravel Forge</a>.
</p>
</div>
</li>
<li class="
steps__item
">
<div class="
body
">
<h2>Profit</h2>
<p>
...and go be with your family.
</p>
</ol>
</div>
</li>
</ol>
</div>
@stop
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment