diff --git a/classes/core.py b/classes/core.py index 4993269..fc85770 100644 --- a/classes/core.py +++ b/classes/core.py @@ -119,7 +119,7 @@ class Core(): def updateScss(self): # print(self.docsettings) - sassfilepath = os.path.join(self.cwd,'assets/css/main.scss') + sassfilepath = os.path.join(self.cwd,'assets/css/setup.scss') # print(sassfilepath) sass = open(sassfilepath,"r").read() sets = { diff --git a/classes/design.py b/classes/design.py index 7f718bd..4c4ab9c 100644 --- a/classes/design.py +++ b/classes/design.py @@ -143,9 +143,9 @@ class WebViewToolBar(QWidget): # self.spread.setShortcut('Ctrl+Shift+g') self.spread.clicked.connect(self.onSpread) self.hbox.addWidget(self.spread) - + # self.hbox.addStretch() - + # # zoom self.hbox.addWidget(QLabel("Zoom:")) self.zoom = QSpinBox(self) @@ -164,11 +164,9 @@ class WebViewToolBar(QWidget): # self.addpage.setIcon(Icon(ico))) # self.addpage.clicked.connect(self.onAddPage) self.hbox.addWidget(self.addpage) - + # self.hbox.addStretch() - - - + # self.reload = QPushButton("&Reload", self) # self.reload.setShortcut('Ctrl+Shift+r') # TODO: how to define same shortcut in different places diff --git a/templates/newproject/assets/css/debug.scss b/templates/newproject/assets/css/debug.scss index 73bccd8..3fc8d28 100644 --- a/templates/newproject/assets/css/debug.scss +++ b/templates/newproject/assets/css/debug.scss @@ -2,13 +2,19 @@ * DEBUG STYLES */ -.debug .header { outline: 1px solid pink; } -.debug .body { outline: 1px solid purple; } -.debug .footer { outline: 1px solid pink; } + .debug{ -.debug .region-break { - border-top: 1px dashed blue; - box-sizing: border-box; -} + .body { outline: 1px solid purple; } -.debug img { outline: 1px solid blue; } + .body:before, + .body:after { outline: 1px solid green; } + + + .region-break { + border-top: 1px dashed blue; + box-sizing: border-box; + } + + img { outline: 1px solid blue; } + + } diff --git a/templates/newproject/assets/css/layout.scss b/templates/newproject/assets/css/layout.scss index c6e8344..2e1480e 100644 --- a/templates/newproject/assets/css/layout.scss +++ b/templates/newproject/assets/css/layout.scss @@ -43,13 +43,22 @@ z-index: 500; } -// .body:before, -// .body:after { bottom: $line-height * -3; } +.body:before{ + top:-2em; + width:100%; + text-align: center; +} +.body:after{ + bottom:-2em; + width:100%; + text-align: center; +} + /*gauche*/ -.paper:nth-child(odd) .body:before { content: "Cascade, default header"; } +.paper:nth-child(odd) .body:before { content: $header-odd; } /*droite*/ -.paper:nth-child(even) .body:before { content: "Cascade, default header"; } +.paper:nth-child(even) .body:before { content: $header-even; } .body:after { content: counter(folio); z-index: 499;} diff --git a/templates/newproject/assets/css/main.scss b/templates/newproject/assets/css/main.scss index 04b61eb..fffbda6 100644 --- a/templates/newproject/assets/css/main.scss +++ b/templates/newproject/assets/css/main.scss @@ -33,104 +33,7 @@ @return $mm*1mm; } -/** - * Defines and loads the rules that set the geometry of the page and its - * representation on screen. This is the core of html2print. - * - * Customize the variables to your needs. - */ - -/* the geometry of the page */ -$page-width: mm2pt(200); -$page-height: mm2pt(287); - -/* the size of the crop marks based on scribus defaults */ -$crop-size: mm2pt(2); - -/* the size of bleed */ -$bleed: mm2pt(3); - -/* loads the core file */ -// @import "html2print.scss"; - - -/** - * THE CODE BELOW IS NOT REQUIRED TO MAKE HTML2PRINT WORK, ALTHOUGH IT PROVES - * USEFUL IN MANY SITUATIONS. - * - * YOU ARE ENCOURAGED TO CUSTOMIZE IT TO YOU NEEDS. - */ - - - -/** - * Defines and generate helper css rules to absolutly position elements on a - * grid. - * - * Customize the variables to your needs. - */ - -$col-number: 9; -$col-gutter: mm2pt(3); - -//$row-number: 13; -$row-number: 12; -$row-gutter: mm2pt(4); - -$grid-color: rgba(255, 0, 0, 0.25); -$baseline-grid-color: rgba(0, 255, 255, 0.15); - -/* Loads the rules for using grids */ -// @import "grid.scss"; - - - -/** - * Loads the rules to outline the main blocs - */ - -// @import "debug.scss"; - - - -/** - * Loads a few less helpers - */ - -// @import "mixins.scss"; - - - -/** - * Defines and loads the rules that set the base layout of the document - * (header, body, footer) - * - * Customize the variables to your needs. - */ - -// FIXME: make a case for single page layouts -$page-margin-inside: mm2pt(7.5); -$page-margin-outside: mm2pt(15); -$page-margin-top: mm2pt(10); -$page-margin-bottom: mm2pt(10); - -// @import "layout.scss"; - - -/** - * Loads your own styles. - * - * Customize the file/path to you needs. - */ - -/*@import '/vendors/reset-css/reset.css';*/ -/*@import "../vendors/normalize.css/normalize.css";*/ -/*@import "../vendors/normalize-opentype.css/normalize-opentype.css";*/ -// @import "fonts.scss"; -// @import "colors.scss"; - -$line-height: mm2pt(4); -// @import "styles.scss"; +@import "setup.scss" @import "html2print.scss"; diff --git a/templates/newproject/assets/css/setup.scss b/templates/newproject/assets/css/setup.scss new file mode 100644 index 0000000..108ac4e --- /dev/null +++ b/templates/newproject/assets/css/setup.scss @@ -0,0 +1,63 @@ + +/** + * Defines and loads the rules that set the geometry of the page and its + * representation on screen. This is the core of html2print. + * + * Customize the variables to your needs. + */ + +/* the geometry of the page */ +$page-width: mm2pt(200); +$page-height: mm2pt(287); + +/* the size of the crop marks based on scribus defaults */ +$crop-size: mm2pt(2); + +/* the size of bleed */ +$bleed: mm2pt(3); + +/** + * THE CODE BELOW IS NOT REQUIRED TO MAKE HTML2PRINT WORK, ALTHOUGH IT PROVES + * USEFUL IN MANY SITUATIONS. + * + * YOU ARE ENCOURAGED TO CUSTOMIZE IT TO YOU NEEDS. + */ + + + +/** + * Defines and generate helper css rules to absolutly position elements on a + * grid. + * + * Customize the variables to your needs. + */ + +$col-number: 9; +$col-gutter: mm2pt(3); + +//$row-number: 13; +$row-number: 12; +$row-gutter: mm2pt(4); + +$grid-color: rgba(255, 0, 0, 0.25); +$baseline-grid-color: rgba(0, 255, 255, 0.15); + + +/** + * Defines and loads the rules that set the base layout of the document + * (header, body, footer) + * + * Customize the variables to your needs. + */ + +// FIXME: make a case for single page layouts +$page-margin-inside: mm2pt(7.5); +$page-margin-outside: mm2pt(15); +$page-margin-top: mm2pt(10); +$page-margin-bottom: mm2pt(10); + + +$line-height: mm2pt(4); + +$header-odd: "Cascade, default header"; +$header-even: "Cascade, default header"; diff --git a/templates/newproject/assets/css/styles.scss b/templates/newproject/assets/css/styles.scss index 8a2257c..bdee8b3 100644 --- a/templates/newproject/assets/css/styles.scss +++ b/templates/newproject/assets/css/styles.scss @@ -1 +1,11 @@ // your styles here + + +h1{ + font-size:32pt; + margin:5mm 0 0; +} + +.story-page{ + -webkit-region-break-after:always; +}