Skip to content

Commit 4b07e5b

Browse files
committed
global: change math operation to compatible with sass2.0
* webpack: add tinymce to assets
1 parent 8ccd805 commit 4b07e5b

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

invenio_theme/assets/bootstrap3/scss/invenio_theme/cover.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ body.cover-page {
4747
.panel-footer {
4848
padding-left: $cover-panel-padding;
4949
padding-right: $cover-panel-padding;
50-
padding-top: $cover-panel-padding/2;
51-
padding-bottom: $cover-panel-padding/2;
52-
border-bottom-left-radius: $border-radius-large*2;
53-
border-bottom-right-radius: $border-radius-large*2;
50+
padding-top: calc($cover-panel-padding/2);
51+
padding-bottom: calc($cover-panel-padding/2);
52+
border-bottom-left-radius: calc($border-radius-large*2);
53+
border-bottom-right-radius: calc($border-radius-large*2);
5454
background-color: $cover-panel-footer-bg;
5555
}
5656
.panel-container a.text-muted {

invenio_theme/assets/bootstrap3/scss/invenio_theme/header.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
header .alert {
10-
margin-top: -$line-height-computed;
10+
margin-top: calc(-1 * $line-height-computed);
1111
border-radius: 0px;
1212
}
1313

invenio_theme/assets/bootstrap3/scss/invenio_theme/styles.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
*/
88

99
// Setting the path to fonts files.
10-
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
11-
$fa-font-path: "~font-awesome/fonts";
10+
// double slash for escaping, single slash is interpreted as division
11+
$icon-font-path: "~bootstrap-sass//assets//fonts//bootstrap//";
12+
$fa-font-path: "~font-awesome//fonts";
1213

1314
@import "~bootstrap-sass/assets/stylesheets/_bootstrap";
1415
@import "~font-awesome/scss/font-awesome";

invenio_theme/assets/semantic-ui/scss/invenio_theme/header.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
header .alert {
10-
margin-top: -$line-height-computed;
10+
margin-top: calc(-1 * $line-height-computed);
1111
border-radius: 0px;
1212
}
1313

invenio_theme/assets/semantic-ui/scss/invenio_theme/styles.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
*/
88

99
// Setting the path to fonts files.
10-
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
11-
$fa-font-path: "~font-awesome/fonts";
10+
// double slash for escaping, single slash is interpreted as division
11+
$icon-font-path: "~bootstrap-sass//assets//fonts//bootstrap//";
12+
$fa-font-path: "~font-awesome//fonts";
1213

1314
@import "~bootstrap-sass/assets/stylesheets/_bootstrap";
1415
@import "~font-awesome/scss/font-awesome";

0 commit comments

Comments
 (0)