Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
fc303c4d
Verified
Commit
fc303c4d
authored
5 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Include paper-css via yarn
parent
675f6c4e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!143
Add base template for printing views
Pipeline
#768
failed
5 years ago
Stage: test
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
aleksis/core/settings.py
+2
-0
2 additions, 0 deletions
aleksis/core/settings.py
aleksis/core/static/paper.css
+0
-66
0 additions, 66 deletions
aleksis/core/static/paper.css
aleksis/core/templates/core/base_print.html
+1
-1
1 addition, 1 deletion
aleksis/core/templates/core/base_print.html
with
3 additions
and
67 deletions
aleksis/core/settings.py
+
2
−
0
View file @
fc303c4d
...
...
@@ -249,6 +249,7 @@ YARN_INSTALLED_APPS = [
"
materialize-css
"
,
"
material-design-icons-iconfont
"
,
"
select2
"
,
"
paper-css
"
,
]
merge_app_settings
(
"
YARN_INSTALLED_APPS
"
,
YARN_INSTALLED_APPS
,
True
)
...
...
@@ -267,6 +268,7 @@ ANY_JS = {
"
material-design-icons
"
:
{
"
css_url
"
:
JS_URL
+
"
/material-design-icons-iconfont/dist/material-design-icons.css
"
},
"
paper-css
"
:
{
"
css_url
"
:
JS_URL
+
"
/paper-css/paper.min.css
"
},
}
merge_app_settings
(
"
ANY_JS
"
,
ANY_JS
,
True
)
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/static/paper.css
deleted
100644 → 0
+
0
−
66
View file @
675f6c4e
/*
* Copyright (c) 2015 Tsutomu Kawamura
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
@page
{
margin
:
0
}
body
{
margin
:
0
}
.sheet
{
margin
:
0
;
overflow
:
hidden
;
position
:
relative
;
box-sizing
:
border-box
;
page-break-after
:
always
;
}
/** Paper sizes **/
body
.A3
.sheet
{
width
:
297mm
;
min-height
:
419mm
}
body
.A3.landscape
.sheet
{
width
:
420mm
;
min-height
:
296mm
}
body
.A4
.sheet
{
width
:
210mm
;
min-height
:
296mm
}
body
.A4.landscape
.sheet
{
width
:
297mm
;
min-height
:
209mm
}
body
.A5
.sheet
{
width
:
148mm
;
min-height
:
209mm
}
body
.A5.landscape
.sheet
{
width
:
210mm
;
min-height
:
147mm
}
body
.letter
.sheet
{
width
:
216mm
;
min-height
:
279mm
}
body
.letter.landscape
.sheet
{
width
:
280mm
;
min-height
:
215mm
}
body
.legal
.sheet
{
width
:
216mm
;
min-height
:
356mm
}
body
.legal.landscape
.sheet
{
width
:
357mm
;
min-height
:
215mm
}
/** Padding area **/
.sheet.padding-10mm
{
padding
:
10mm
}
.sheet.padding-15mm
{
padding
:
15mm
}
.sheet.padding-20mm
{
padding
:
20mm
}
.sheet.padding-25mm
{
padding
:
25mm
}
/** For screen preview **/
@media
screen
{
body
{
background
:
#e0e0e0
}
.sheet
{
background
:
white
;
box-shadow
:
0
.5mm
2mm
rgba
(
0
,
0
,
0
,
.3
);
margin
:
5mm
auto
;
}
}
/** Fix for Chrome issue #273306 **/
@media
print
{
body
.A3.landscape
{
width
:
420mm
}
body
.A3
,
body
.A4.landscape
{
width
:
297mm
}
body
.A4
,
body
.A5.landscape
{
width
:
210mm
}
body
.A5
{
width
:
148mm
}
body
.letter
,
body
.legal
{
width
:
216mm
}
body
.letter.landscape
{
width
:
280mm
}
body
.legal.landscape
{
width
:
357mm
}
}
This diff is collapsed.
Click to expand it.
aleksis/core/templates/core/base_print.html
+
1
−
1
View file @
fc303c4d
...
...
@@ -13,7 +13,7 @@
</title>
{% include_css "material-design-icons" %}
<link
rel=
"stylesheet"
href=
"{% static
"
paper
.
css
"
%}
"
/>
{% include_css
"paper
-
css" %}
<link
rel=
"stylesheet"
href=
"{% sass_src 'style.scss' %}"
/>
<link
rel=
"stylesheet"
href=
"{% static "
print.css
"
%}"
/>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment