diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index 6bd6f1e90..11eb0d2a3 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -209,13 +209,13 @@ img { #nav .navbar { width: 100%; - float: left; border: none; margin: 0; } #nav .navbar-toggle { padding: 5px 0; + z-index: 2; } #nav .navbar-toggle i { @@ -310,7 +310,7 @@ img { } #content .col1.sidebar-max { /*with maximized sidebar*/ - width: calc(100% - 330px); + width: calc(100% - 325px); } #content .col1.sidebar-min { /*with minimized sidebar*/ @@ -723,16 +723,22 @@ img { /** Projector sidebar column **/ -#content .col2 { +#content .col2 { /*TODO*/ float: right; position: relative; display: inline-flex; z-index: 3; margin-bottom: 20px; + top: 0px; + right: 0px; +} + +#sidebar-xs { + display: none !important; } #content .col2.sidebar-max { - width: 330px; + width: 325px; } #content .col2.sidebar-min { @@ -787,7 +793,6 @@ img { opacity: 1; } - .col2 .projector_min .icon a { color: #fff; display: block; @@ -798,7 +803,7 @@ img { width: auto; } - .col2 .projector_full .title { +.col2 .projector_full .title { width: 100%; color: #fff; height: 50px; @@ -939,11 +944,10 @@ img { .iframeoverlay { width: 256px; - position: absolute; - top: 0px; - left: 0px; + margin: 0 auto; display: block; z-index: 1; + background-color: #f5f5f5; } /** Motion **/ @@ -1699,6 +1703,13 @@ tr.selected td { /* show replacement elements, if any */ #groups-table .optional-show { display: block !important; } + + /* hide searchbar input */ + #nav .searchbar input { display: none !important; } + #nav .searchbar .btn { + border-top-left-radius: 4px !important; + border-bottom-left-radius: 4px !important; + } } @@ -1713,9 +1724,9 @@ tr.selected td { .user i { font-size: 16px; padding: 3px; } - #nav .navbar { box-shadow: none; } + #nav .navbar { box-shadow: none; padding-right: 60px !important; } #nav .navbar ul li a { padding: 10px 15px; } - #nav .searchbar { margin: 15px 0; } + #nav .searchbar { margin: 15px -53px 0 0 !important; } #chatbox { width: 100%; top: 40px; } @@ -1734,16 +1745,20 @@ tr.selected td { padding: 0; } #content .col2 { - position: relative !important; - margin-top: -20px; + width: 100%; } - #content .col2.sidebar-max { - width: 296px; + #content .col2.sidebar-max, #content .col2.sidebar-min, + #content .col1.sidebar-min, #content .col1.sidebar-max { + width: 100%; } - #content .col2 .projector_full, #content .col2 .projector_min { - margin-left: 0; + #sidebar { + display: none !important; } - #content .col1.sidebar-min, #content .col1.sidebar-max { + #sidebar-xs { + display: block !important; + } + #sidebar-xs .projector_full { + margin-left: 0 !important; width: 100%; } #groups-table .perm-head { diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js index 39de51a4a..0916d0776 100644 --- a/openslides/core/static/js/core/site.js +++ b/openslides/core/static/js/core/site.js @@ -887,17 +887,17 @@ angular.module('OpenSlidesApp.core.site', [ if ((scrollTop + marginTop + sidebarHeight) > (documentHeight - marginBottom)) { // Stick to the bottom var bottom = marginBottom + scrollTop + windowHeight - documentHeight; - sidebar.css({'position': 'fixed', 'top': '', 'bottom': bottom}); + sidebar.css({'position': 'fixed', 'top': '', 'right': '30px', 'bottom': bottom}); } else if ((scrollTop + marginTop) > sidebarMinOffset) { // scroll with the user - sidebar.css({'position': 'fixed', 'top': marginTop, 'bottom': ''}); + sidebar.css({'position': 'fixed', 'top': marginTop, 'right': '30px', 'bottom': ''}); } else { // Stick to the top - sidebar.css({'position': 'relative', 'top': 0, 'bottom': ''}); + sidebar.css({'position': 'relative', 'top': 0, 'right': 0, 'bottom': ''}); } } else { // Stick to the top, if the sidebar is larger then the content - sidebar.css({'position': 'relative', 'top': 0, 'bottom': ''}); + sidebar.css({'position': 'relative', 'top': 0, 'right': 0, 'bottom': ''}); } }; diff --git a/openslides/core/static/templates/index.html b/openslides/core/static/templates/index.html index be535fea0..f9dc00860 100644 --- a/openslides/core/static/templates/index.html +++ b/openslides/core/static/templates/index.html @@ -175,18 +175,8 @@
-
- -
- - -
+ + + + +
+ +
+ + +
diff --git a/openslides/motions/static/templates/motions/motion-detail/toolbar.html b/openslides/motions/static/templates/motions/motion-detail/toolbar.html index a90b6e900..3e7f7bceb 100644 --- a/openslides/motions/static/templates/motions/motion-detail/toolbar.html +++ b/openslides/motions/static/templates/motions/motion-detail/toolbar.html @@ -21,8 +21,8 @@
- -
+ + + +
@@ -67,7 +92,9 @@
-
+ + + + + +