diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-04-02 23:24:45 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-04-02 23:24:45 +0000 |
| commit | 74b65b97e968add198cb7a5c58daea0bd378d9f0 (patch) | |
| tree | 60954eb31ce45825d76613b46990df3238340f3d /public | |
| parent | 08e3b975dcb471fcc709d643eb6a52c163acfbdf (diff) | |
| download | redmine-74b65b97e968add198cb7a5c58daea0bd378d9f0.tar.gz redmine-74b65b97e968add198cb7a5c58daea0bd378d9f0.zip | |
Replace float rules with flexbox for content and sidebar block (#30435).
Patch by Max Johansson and Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@18033 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'public')
| -rw-r--r-- | public/stylesheets/application.css | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 94fd67195..b94f210bf 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -80,10 +80,9 @@ pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;} #admin-menu ul {margin: 0; padding: 0;} #admin-menu li {margin: 0; padding: 0 0 6px 0; list-style-type:none;} -#main {background-color:#EEEEEE;} +#main {display: flex; flex-direction: row-reverse;} -#sidebar{ float: right; width: 22%; position: relative; z-index: 9; padding: 0; margin: 0;} -* html #sidebar{ width: 22%; } +#sidebar{ flex-shrink: 0; width: 22%; padding-left: 20px; background: #EEEEEE; border-left: 1px solid #ddd} #sidebar h3{ font-size: 14px; margin-top:14px; color: #666; } #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; } * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; } @@ -93,13 +92,11 @@ pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;} #sidebar div.wiki ul {margin:inherit; padding-left:40px;} #sidebar div.wiki ul li {list-style-type:inherit;} -#content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; } -* html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;} +#content { flex-grow: 1; background-color: #fff; margin: 0px; padding: 6px 10px 10px 10px; } html>body #content { min-height: 600px; } * html body #content { height: 600px; } /* IE */ #main.nosidebar #sidebar{ display: none; } -#main.nosidebar #content{ width: auto; border-right: 0; } #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;} |