Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2015-10-22 19:41:49 +0100
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
9425f227fe440cb4d04480b274f8bab16cac89df
9425f227
1 parent
d7520f22
Added revisioning to assets and added print styles. Closes #23.
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
6 deletions
.gitignore
gulpfile.js
resources/assets/sass/print-styles.scss
resources/views/base.blade.php
resources/views/pages/show.blade.php
.gitignore
View file @
9425f22
...
...
@@ -9,5 +9,6 @@ Homestead.yaml
/public/js
/public/uploads
/public/bower
/public/build
/storage/images
_ide_helper.php
\ No newline at end of file
...
...
gulpfile.js
View file @
9425f22
...
...
@@ -6,6 +6,8 @@ elixir.config.js.browserify.transformers.push({
});
elixir
(
function
(
mix
)
{
mix
.
sass
(
'styles.scss'
);
mix
.
browserify
([
'jquery-extensions.js'
,
'global.js'
],
'public/js/common.js'
);
mix
.
sass
(
'styles.scss'
)
.
sass
(
'print-styles.scss'
)
.
browserify
([
'jquery-extensions.js'
,
'global.js'
],
'public/js/common.js'
)
.
version
([
'css/styles.css'
,
'css/print-styles.css'
,
'js/common.js'
]);
});
...
...
resources/assets/sass/print-styles.scss
0 → 100644
View file @
9425f22
@import
"variables"
;
header
{
display
:
none
;
}
body
{
font-size
:
12px
;
}
.faded-small
{
display
:
none
;
}
.page-content
{
margin
:
0
auto
;
}
.print-hidden
{
display
:
none
;
}
.print-full-width
{
width
:
100%
;
float
:
none
;
display
:
block
;
}
h2
{
font-size
:
2em
;
line-height
:
1
;
margin-top
:
0
.6em
;
margin-bottom
:
0
.3em
;
}
\ No newline at end of file
resources/views/base.blade.php
View file @
9425f22
...
...
@@ -9,7 +9,8 @@
<meta
charset=
"utf-8"
>
<!-- Styles and Fonts -->
<link
rel=
"stylesheet"
href=
"/css/styles.css"
>
<link
rel=
"stylesheet"
href=
"{{ elixir('css/styles.css') }}"
>
<link
rel=
"stylesheet"
media=
"print"
href=
"{{ elixir('css/print-styles.css') }}"
>
<link
href=
'//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300'
rel=
'stylesheet'
type=
'text/css'
>
<link
rel=
"stylesheet"
href=
"/bower/material-design-iconic-font/dist/css/material-design-iconic-font.min.css"
>
...
...
@@ -89,6 +90,6 @@
</section>
@yield('bottom')
<script
src=
"
/js/common.js
"
></script>
<script
src=
"
{{ elixir('js/common.js') }}
"
></script>
</body>
</html>
...
...
resources/views/pages/show.blade.php
View file @
9425f22
...
...
@@ -35,7 +35,7 @@
<div
class=
"container"
>
<div
class=
"row"
>
<div
class=
"col-md-9"
>
<div
class=
"col-md-9
print-full-width
"
>
<div
class=
"page-content anim fadeIn"
>
<div
class=
"pointer-container"
id=
"pointer"
>
...
...
@@ -58,7 +58,7 @@
</div>
</div>
<div
class=
"col-md-3"
>
<div
class=
"col-md-3
print-hidden
"
>
@include('pages/sidebar-tree-list', ['book' => $book])
...
...
Please
register
or
sign in
to post a comment