Mathijs den Burger pushed to branch release/5.1 at cms-community /
hippo-addon-channel-manager
Commits:
7f994d00 by Arthur Bogaart at 2018-02-26T16:33:08+01:00
CHANNELMGR-1749 Replace sasslint config with stylelint config
(cherry picked from commit 538f5a7)
- - - - -
af420574 by Bert Leunis at 2018-02-26T16:45:32+01:00
CHANNELMGR-1749 Fix stylelint errors
- - - - -
1077e5f7 by Bert Leunis at 2018-02-27T13:50:12+01:00
CHANNELMGR-1749 update to node 8 & npm 5
The way the Open Sans font is defined in the app.css is slightly different, but
the font is used correctly in a 12.1 project with this code, in Firefox, Edge,
Chrome and Safari.
The new uglify package version treats constants a bit differently, but no
functional differences though. End to end tests will show if there may be a
lurking problem deep in the minified script file.
- - - - -
41bd6e7d by Mathijs den Burger at 2018-03-02T15:48:25+01:00
CHANNELMGR-1749 Reintegrate feature/CHANNELMGR-1749
- - - - -
16 changed files:
- − frontend-ng/.sass-lint.yml
- + frontend-ng/.stylelintrc
- − frontend-ng/npm-shrinkwrap.json
- + frontend-ng/package-lock.json
- frontend-ng/package.json
- frontend-ng/src/app/channel/actions/settings/helpIcon/helpIcon.scss
- frontend-ng/src/app/channel/menu/menu.scss
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
- frontend-ng/src/app/shared/material/material.scss
- frontend-ng/src/styles/_iframe.scss
- frontend-ng/src/styles/_mask.scss
- frontend-ng/src/styles/_picker.scss
- frontend-ng/src/styles/_side-panel.scss
- frontend-ng/src/styles/_tree.scss
- frontend-ng/src/styles/string/hippo-iframe.scss
- frontend-ng/src/vendor.scss
Changes:
=====================================
frontend-ng/.sass-lint.yml deleted
=====================================
--- a/frontend-ng/.sass-lint.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-options:
- config-file: node_modules/@bloomreach/frontend-build/.sass-lint.yml
=====================================
frontend-ng/.stylelintrc
=====================================
--- /dev/null
+++ b/frontend-ng/.stylelintrc
@@ -0,0 +1,3 @@
+{
+ "extends": "./node_modules/@bloomreach/frontend-build/.stylelintrc"
+}
=====================================
frontend-ng/npm-shrinkwrap.json deleted
=====================================
The diff for this file was not included because it is too large.
=====================================
frontend-ng/package-lock.json
=====================================
The diff for this file was not included because it is too large.
=====================================
frontend-ng/package.json
=====================================
--- a/frontend-ng/package.json
+++ b/frontend-ng/package.json
@@ -56,13 +56,14 @@
"zone.js": "0.8.17"
},
"devDependencies": {
- "@bloomreach/frontend-build": "6.0.2",
+ "@bloomreach/frontend-build": "7.1.2",
"@types/jasmine": "2.5.54",
"@types/node": "8.0.28",
"@types/webpack-env": "1.13.1",
"angular-mocks": "1.5.11",
"codelyzer": "3.2.0",
- "gulp": "github:gulpjs/gulp#38246c3f8b6dbb8d4ef657183e92d90c8299e22f",
- "gulp-hub":
"github:frankwallis/gulp-hub#292f8ab005165c3267accb01a51f31719970d443"
+ "gulp": "4.0.0",
+ "gulp-hub": "4.2.0",
+ "uglifyjs-webpack-plugin": "1.2.0"
}
}
=====================================
frontend-ng/src/app/channel/actions/settings/helpIcon/helpIcon.scss
=====================================
--- a/frontend-ng/src/app/channel/actions/settings/helpIcon/helpIcon.scss
+++ b/frontend-ng/src/app/channel/actions/settings/helpIcon/helpIcon.scss
@@ -18,5 +18,3 @@
right: -24px;
top: 10px;
}
-
-
=====================================
frontend-ng/src/app/channel/menu/menu.scss
=====================================
--- a/frontend-ng/src/app/channel/menu/menu.scss
+++ b/frontend-ng/src/app/channel/menu/menu.scss
@@ -13,7 +13,6 @@
// limitations under the License.
.dropdown-menu-content.md-menu-bar-menu.md-dense .md-indent {
-
> md-icon {
left: 16px;
=====================================
frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
=====================================
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/fields/ckeditor/ckeditor.scss
@@ -21,6 +21,7 @@
width: 0 !important;
}
}
+
ckeditor {
&.is-invalid {
.cke {
=====================================
frontend-ng/src/app/shared/material/material.scss
=====================================
--- a/frontend-ng/src/app/shared/material/material.scss
+++ b/frontend-ng/src/app/shared/material/material.scss
@@ -14,6 +14,7 @@
@import 'variables';
@import '../../../../node_modules/@angular/material/theming';
+
@include mat-core;
$hippo-blue: (
@@ -119,4 +120,5 @@ $hippo-primary: mat-palette($hippo-blue);
$hippo-accent: mat-palette($hippo-orange);
$hippo-warn: mat-palette($hippo-red);
$hippo-theme: mat-light-theme($hippo-primary, $hippo-accent, $hippo-warn);
+
@include angular-material-theme($hippo-theme);
=====================================
frontend-ng/src/styles/_iframe.scss
=====================================
--- a/frontend-ng/src/styles/_iframe.scss
+++ b/frontend-ng/src/styles/_iframe.scss
@@ -32,7 +32,6 @@ hippo-iframe {
// ensure a horizontal scrollbar in Safari for constrained viewport widths
height: 100%;
overflow: hidden;
-
user-select: none;
&.hippo-dragging {
@@ -58,7 +57,6 @@ hippo-iframe {
// use explicit max-width and min-width so its transition can be animated
max-width: 100%;
min-width: 0;
-
position: relative;
transition: max-width $viewport-animation-transition, min-width
$viewport-animation-transition;
width: 100%;
=====================================
frontend-ng/src/styles/_mask.scss
=====================================
--- a/frontend-ng/src/styles/_mask.scss
+++ b/frontend-ng/src/styles/_mask.scss
@@ -31,5 +31,3 @@
cursor: default;
}
}
-
-
=====================================
frontend-ng/src/styles/_picker.scss
=====================================
--- a/frontend-ng/src/styles/_picker.scss
+++ b/frontend-ng/src/styles/_picker.scss
@@ -17,7 +17,6 @@
height: 500px;
width: 850px;
-
@media (max-width: $layout-breakpoint-sm - 1) {
width: 600px;
}
=====================================
frontend-ng/src/styles/_side-panel.scss
=====================================
--- a/frontend-ng/src/styles/_side-panel.scss
+++ b/frontend-ng/src/styles/_side-panel.scss
@@ -58,6 +58,7 @@
&:first-child {
border-bottom: 1px solid $grey-200;
}
+
&:last-child {
border-top: 1px solid $grey-200;
}
=====================================
frontend-ng/src/styles/_tree.scss
=====================================
--- a/frontend-ng/src/styles/_tree.scss
+++ b/frontend-ng/src/styles/_tree.scss
@@ -97,6 +97,7 @@
background: $tree-active-bg;
border-color: $tree-active-border-color;
color: $tree-active-color;
+
md-icon {
color: $tree-active-color;
}
@@ -153,7 +154,6 @@
}
}
-
.angular-ui-tree-placeholder {
background: $tree-dd-bg;
box-shadow: 0 0 0 1px $tree-dd-bg;
=====================================
frontend-ng/src/styles/string/hippo-iframe.scss
=====================================
--- a/frontend-ng/src/styles/string/hippo-iframe.scss
+++ b/frontend-ng/src/styles/string/hippo-iframe.scss
@@ -13,11 +13,9 @@
// limitations under the License.
@import '../variables';
-
@import '~open-sans-fontface/sass/variables';
@import '~open-sans-fontface/sass/mixins';
@import '~open-sans-fontface/sass/Regular';
-
@import '~@bloomreach/dragula/dist/dragula.css';
.hst-cmseditlink {
=====================================
frontend-ng/src/vendor.scss
=====================================
--- a/frontend-ng/src/vendor.scss
+++ b/frontend-ng/src/vendor.scss
@@ -14,7 +14,6 @@
// Open Sans font
@import 'styles/variables';
-
@import '~open-sans-fontface/sass/variables';
@import '~open-sans-fontface/sass/mixins';
@import '~open-sans-fontface/sass/Regular';
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/58b644f050a2860bd6892ca1ebdf4b7f494c9959...41bd6e7d7307a0127f6533c78f55d54cbdafacad
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/58b644f050a2860bd6892ca1ebdf4b7f494c9959...41bd6e7d7307a0127f6533c78f55d54cbdafacad
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
