Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] restyle navigation #2774

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion groundcontrol/admin-bundle.tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,17 @@ adminBundle.tasks.eslint = createEslintTask({
});

adminBundle.tasks.copy = gulp.parallel(
createCopyTask({src: [`${adminBundle.config.srcPath}img/**`], dest: `${adminBundle.config.distPath}img`})
createCopyTask({src: [`${adminBundle.config.srcPath}img/**`], dest: `${adminBundle.config.distPath}img`}),
createCopyTask({src: [`${adminBundle.config.srcPath}icons/**`], dest: `${adminBundle.config.distPath}icons`})
);

adminBundle.tasks.cssLocal = createCssLocalTask({src: `${adminBundle.config.srcPath}scss/*.scss`, dest: `${adminBundle.config.distPath}css`});
adminBundle.tasks.cssNextLocal = createCssLocalTask({src: `${adminBundle.config.srcPath}scssnext/*.scss`, dest: `${adminBundle.config.distPath}cssnext`});



adminBundle.tasks.cssOptimized = createCssOptimizedTask({src: `${adminBundle.config.srcPath}scss/*.scss`, dest: `${adminBundle.config.distPath}css`});
adminBundle.tasks.cssNextOptimized = createCssOptimizedTask({src: `${adminBundle.config.srcPath}scssnext/*.scss`, dest: `${adminBundle.config.distPath}cssnext`});

adminBundle.tasks.scripts = createScriptsTask({
src: [
Expand Down
5 changes: 5 additions & 0 deletions groundcontrol/start-local.task.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ export const buildOnChange = (done) => {

const styleAssets = srcPath + 'scss/**/*.scss';
gulp.watch(styleAssets, bundle.tasks.cssOptimized);

if (bundle.tasks.cssNextOptimized) {
const styleNextAssets = srcPath + 'scssnext/**/*.scss';
gulp.watch(styleNextAssets, bundle.tasks.cssNextOptimized);
}
}
done();
};
Expand Down
2 changes: 2 additions & 0 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ const analyzeAdminBundle = gulp.series(
const buildLocalAdminBundle = gulp.series(
adminBundle.tasks.copy,
adminBundle.tasks.cssLocal,
adminBundle.tasks.cssNextLocal,
adminBundle.tasks.scripts,
adminBundle.tasks.bundle
);

const buildOptimizedAdminBundle = gulp.series(
adminBundle.tasks.copy,
adminBundle.tasks.cssOptimized,
adminBundle.tasks.cssNextOptimized,
adminBundle.tasks.scripts,
adminBundle.tasks.bundlePolyfills,
adminBundle.tasks.bundleOptimized
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.5.0",
"@snipsonian/scss": "1.8.2",
"svgxuse": "^1.2.6",
"bootstrap-colorpicker": "^2.5.3",
"bootstrap-sass": "^3.4.1",
"cargobay": "Kunstmaan/cargobay#0.8.6-support",
Expand Down
17 changes: 17 additions & 0 deletions src/Kunstmaan/AdminBundle/Helper/AdminPanel/AdminPanel.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,23 @@ public function getAdminPanelActions()
return $this->actions;
}

/**
* Return current admin panel actions
*/
public function getAdminPanelLanguageChooser()
{
if (!$this->actions) {
$this->actions = array();
$adaptors = $this->getAdaptors();
foreach ($adaptors as $adaptor) {
$this->actions = array_merge($this->actions, $adaptor->getAdminPanelLanguageChooser());
}
}

return $this->actions;
}


/**
* Get adaptors sorted by priority.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,27 @@ public function getAdminPanelActions()
);
}

/**
* @return AdminPanelLanguangeChooser[]
*/
public function getAdminPanelLanguageChooser()
{
return array(
$this->getLanguageChooserActionNext(),
);
}

protected function getLanguageChooserActionNext()
{
return new AdminPanelAction(
[],
'',
'',
'@KunstmaanAdmin/AdminPanel/_language_chooser.html.twig'
);
}


protected function getLanguageChooserAction()
{
return new AdminPanelAction(
Expand Down
14,768 changes: 14,763 additions & 5 deletions src/Kunstmaan/AdminBundle/Resources/public/css/style.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading