diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig index 906a28d78..5bcd41c66 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig @@ -47,68 +47,12 @@
- -
+ + diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss index a939b17f8..eb0a4ca41 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -256,3 +256,49 @@ div.wrap-header { } } } + + +/* +* FLOATBUTTON +*/ + +div.floatbutton { + + width: 100%; + div.box { + width: 100%; + div.action { + float: right; /* + width: 50%; */ + } + } + &.top { + div.action { + //margin: 0 0 1em 1em; + padding: 0 0 1em 1em; + } + } + &.bottom { + display: flex; + overflow: hidden; + //margin-bottom: 100px; + div.action { + height: calc(100% - 0em); + shape-outside: inset(calc(100% - 2em) 0 0); + display: flex; + align-items: flex-end; + padding: 0 0 0 1em; + * { + align-self: flex-end !important; + } + } + } + &.debug { + padding: 1em; + border: 1px solid black; + background-color: yellow; + div.action { + background-color: #00ffffa3; + } + } +}