diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-08-14 09:20:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-14 09:20:25 +0200 |
| commit | 4b3587b5f8a175a41e1eea3d236bb38f44b04fef (patch) | |
| tree | a84f5a4e98dd48e0b0126d993ef649cbceeb04dd | |
| parent | ba4c42abaa8ad2ba616e77d91ea452ef1c2983aa (diff) | |
| parent | db31bf8a64114e54de1530b31e9cb0f3db090d44 (diff) | |
| download | nextcloud-server-4b3587b5f8a175a41e1eea3d236bb38f44b04fef.tar.gz nextcloud-server-4b3587b5f8a175a41e1eea3d236bb38f44b04fef.zip | |
Merge pull request #10679 from nextcloud/fix/10667/dialog-button-layout
switches the oc dialog button row to flex
| -rw-r--r-- | core/css/jquery.ocdialog.scss | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/core/css/jquery.ocdialog.scss b/core/css/jquery.ocdialog.scss index 0a6e99ddb4f..0a0222497bc 100644 --- a/core/css/jquery.ocdialog.scss +++ b/core/css/jquery.ocdialog.scss @@ -21,7 +21,7 @@ } .oc-dialog-buttonrow { position: relative; - display: block; + display: flex; background: transparent; right: 0; bottom: 0; @@ -32,24 +32,15 @@ background-image: linear-gradient(rgba(255, 255, 255, 0.0), var(--color-main-background)); border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; - clear: both; - button { - display: inline-block; + + &.twobuttons { + justify-content: space-between; } -} -/* align primary button to right, other buttons to left */ -.oc-dialog-buttonrow.twobuttons button:nth-child(1) { - float: left; -} -.oc-dialog-buttonrow.twobuttons.aside button:nth-child(1) { - float: none; -} -.oc-dialog-buttonrow.twobuttons button:nth-child(2) { - float: right; -} -.oc-dialog-buttonrow.onebutton button { - float: right; + &.onebutton, + &.twobuttons.aside { + justify-content: flex-end; + } } .oc-dialog-close { |