Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
luis.reischak committed Feb 24, 2019
2 parents c0f6be6 + 54e44a3 commit 23bc31c
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 3 deletions.
36 changes: 36 additions & 0 deletions src/css/process_content.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
Estilo para ser inserido na Árvore do Processo
*/



/* styles to handle sei v3.0.15 new tree structure */
html.sei-v3015 {

height: 100%;

> body {
display: flex;
flex-direction: column;
height: 100%;
margin: 0;

> [data-trello-process-box] {
margin: inherit;
}

> #header {
position: static;
overflow: hidden;
}

> #container {
position: static;
height: auto;
margin-top: 0;
flex: 1;
}

}

}
11 changes: 9 additions & 2 deletions src/js/entries/process_content/dom.js

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

2 changes: 1 addition & 1 deletion src/js/view/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const renderFilterButton = (placeholder, data) => {

const renderTrelloCard = (placeholder, card, hasAnotherCard, originalAnchor) => {

const fullWidth = placeholder.hasAttribute('full-width');
const fullWidth = placeholder.hasAttribute('data-full-width');

ReactDOM.render(
<TrelloCard
Expand Down
1 change: 1 addition & 0 deletions src/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"run_at": "document_end",
"all_frames": true,
"css": [
"css/process_content.css",
"vendor/css/fontawesome-all.css"
],
"js": [
Expand Down
1 change: 1 addition & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ module.exports = {
/* página de estilos */
'css/common.css': './src/css/common.scss',
'css/process_list.css': './src/css/process_list.scss',
'css/process_content.css': './src/css/process_content.scss',

},
output: {
Expand Down

0 comments on commit 23bc31c

Please sign in to comment.