Skip to content

Commit

Permalink
OI-246,206,243,85,243,125,142,246 (#131)
Browse files Browse the repository at this point in the history
* OI-246 Removed link to content from News title, fixed tags visibility on News page itself and inside the /news. Fixed "User page" condition submit logic.

* OI-206 Changed thumbnail style to compact_user_icon in next user view modes: additional details, default, edit.

* OI-243 Change OpenidealIdeaUpdateInfo create and change date formats. Fix CSS styles for right sidebar of content types canonical pages.

* OI-85 Fix CSS for workflow block, and mobile view of /idea page.

* Reverted composer.json changes.

* OI-243 Removed unneeded code.

* OI-125,142 Changed moderation content view title, and altered local task title. Changed slideshow arrows.

* OI-246. Implemented OpenidealRRSSBBlock, which provide ability to set an entity from context e.g. from layout builder. Implemented styles for /news page.

* OI-00 Change the gulp script, remove source map and cleanCss gulp plugins.

* OI-00 npm audit fix.

Co-authored-by: Ivan Doroshenko <i.doroshenko@dev-branch.com>
Co-authored-by: Ivan Doroshenko <57439293+db-Matroskeen@users.noreply.github.com>
  • Loading branch information
3 people committed Oct 21, 2020
1 parent 544e1a2 commit 513126a
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 98 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "linnovate/openideal",
"description": "The OpenideaL distribution profile",
"description": "OpenideaL - open source ideas and innovation management system",
"type": "drupal-profile",
"license": "GPL-2.0-or-later",
"minimum-stability": "dev",
Expand Down
4 changes: 2 additions & 2 deletions config/install/views.view.moderated_content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1657,11 +1657,11 @@ display:
moderated_content:
display_plugin: page
id: moderated_content
display_title: 'Moderated content'
display_title: Ideas
position: 1
display_options:
display_extenders: { }
path: admin/content/moderated
path: admin/content/ideas
display_description: ''
enabled: false
cache_metadata:
Expand Down
13 changes: 2 additions & 11 deletions themes/openideal_theme/css/style-rtl.css

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions themes/openideal_theme/css/style-rtl.min.css

This file was deleted.

13 changes: 2 additions & 11 deletions themes/openideal_theme/css/style.css

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions themes/openideal_theme/css/style.min.css

This file was deleted.

24 changes: 8 additions & 16 deletions themes/openideal_theme/gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
let gulp = require('gulp'),
sass = require('gulp-sass'),
sourcemaps = require('gulp-sourcemaps'),
cleanCss = require('gulp-clean-css'),
rename = require('gulp-rename'),
postcss = require('gulp-postcss'),
autoprefixer = require('autoprefixer'),
Expand All @@ -27,7 +25,6 @@ const paths = {
// Compile sass into CSS & auto-inject into browsers
function styles() {
return gulp.src([paths.scss.src])
.pipe(sourcemaps.init())
.pipe(sass().on('error', sass.logError))
.pipe(postcss([autoprefixer({
browsers: [
Expand All @@ -41,17 +38,11 @@ function styles() {
'Android >= 4',
'Opera >= 12']
})]))
.pipe(sourcemaps.write())
.pipe(gulp.dest(paths.scss.dest))
.pipe(cleanCss())
.pipe(rename({ suffix: '.min' }))
.pipe(gulp.dest(paths.scss.dest))
.pipe(browserSync.stream())
}

function stylesRtl() {
return gulp.src([paths.scss.src])
.pipe(sourcemaps.init())
.pipe(sass().on('error', sass.logError))
.pipe(rtlcss())
.pipe(postcss([autoprefixer({
Expand All @@ -66,20 +57,14 @@ function stylesRtl() {
'Android >= 4',
'Opera >= 12']
})]))
.pipe(sourcemaps.write())
.pipe(rename({ suffix: '-rtl' }))
.pipe(gulp.dest(paths.scss.dest))
.pipe(cleanCss())
.pipe(rename({ suffix: '.min' }))
.pipe(gulp.dest(paths.scss.dest))
.pipe(browserSync.stream())
}

// Move the javascript files into our js folder
function js() {
return gulp.src([paths.js.bootstrap, paths.js.jquery, paths.js.popper])
.pipe(gulp.dest(paths.js.dest))
.pipe(browserSync.stream())
}

// Static Server + watching scss/html files
Expand All @@ -91,10 +76,17 @@ function serve() {
gulp.watch([paths.scss.watch], gulp.parallel(styles, stylesRtl)).on('change', browserSync.reload)
}

const build = gulp.series(styles, gulp.parallel(js, serve))
// Watch scss files.
function watch() {
gulp.watch([paths.scss.watch], gulp.parallel(styles, stylesRtl))
}

const build = gulp.series(styles, gulp.parallel(js, watch))
const dev = gulp.series(styles, gulp.parallel(js, serve))

exports.styles = styles
exports.js = js
exports.serve = serve

exports.default = build
exports.dev = dev
4 changes: 2 additions & 2 deletions themes/openideal_theme/openideal_theme.libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ global-styling:
css:
component:
'//fonts.googleapis.com/css2?family=Assistant:wght@300;400;600;700&family=Roboto&display=swap': { type: external, minified: true }
css/style.min.css: { minified: true }
css/style.css: {}

global-styling-rtl:
version: VERSION
css:
component:
'//fonts.googleapis.com/css2?family=Assistant:wght@300;400;600;700&family=Roboto&display=swap': { type: external, minified: true }
css/style-rtl.min.css: { minified: true }
css/style-rtl.css: {}

global-scripts:
version: VERSION
Expand Down
30 changes: 15 additions & 15 deletions themes/openideal_theme/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 2 additions & 26 deletions themes/openideal_theme/scss/components/_idea_workflow.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
}

&__container {
min-width: 125.38px;
font-weight: 600;
font-size: 14px;
line-height: 130%;
Expand All @@ -26,7 +27,7 @@
border-width: 2px;
top: 50%;
transform: translateY(-50%);
left: -4.251px;
left: -4.2px;
border-style: solid;
border-radius: 50%;
position: absolute;
Expand Down Expand Up @@ -144,31 +145,6 @@
}
}
}

&.postponed,
&.draft_approval {
.idea-statistics-and-status-block--status__container::before {
left: -4px;
}
}

&.published {
.idea-statistics-and-status-block--status__container::before {
left: -4.151px;
}
}

&.rejected {
.idea-statistics-and-status-block--status__container::before {
left: -4px;
}
}

&.approved {
.idea-statistics-and-status-block--status__container::before {
left: -4.6px;
}
}
}

.idea-workflow-full {
Expand Down

0 comments on commit 513126a

Please sign in to comment.