Fixed notes height

timb-machine-mirrors · Jan 21, 2022 · bb7859e · bb7859e
1 parent ad9ea11
commit bb7859e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/templates/project/hosts/host.html b/templates/project/hosts/host.html
@@ -300,7 +300,7 @@
         </div>
         <div class="ui column" style="width: calc(100% - 75px);height:100%">
             <h1 class="ui dividing header">Host: {{ escape(current_host['ip']) }}</h1>
-            <div class="ui container" style="width: 100%;height:calc(100% - 50px);">
+            <div class="ui container" style="width: 100%;height:calc(100% - 300px);">
                 <div class="ui grid" id="host_page" style="height:100%">
                     <div class="column" style="width: 170px;">
                         <div class="ui sticky" id="host_menu">
@@ -841,7 +841,7 @@ <h1 class="ui dividing header">Upload file:</h1>
                                 </div>
                             {% endif %}
                         </div>
-                        <div class="ui tab" data-tab="notes" style="height:calc(100% - 250px)">
+                        <div class="ui tab" data-tab="notes" style="height:100%;min-height: 100%">
                             <script>
                                 $(document)
                                     .ready(function () {
@@ -923,18 +923,9 @@ <h1 class="ui dividing header">Upload file:</h1>
                                 Quill.register(CustomClass, true);
                             </script>
 
-                            <style>
-                                [id^=cke_editor] {
-                                    height: calc(100% - 10px);
-                                }
-
-                                .cke_inner {
-                                    height: calc(100% - 100px);
-                                }
-                            </style>
 
                             <div class="ui container" style="width: 100%;height: 100%;float: left;">
-                                <div class="ui grid" style="height: 100%;">
+                                <div class="ui grid" style="height: 100%; margin: unset;">
                                     <div class="column" style="width: 200px; max-height: 100%; overflow: auto">
                                         <div class="ui vertical fluid tabular menu" style="min-width: 120px;">
                                             <form action="/project/{{ current_project['id'] }}/notes/add" method="post" style="width:100%;margin-bottom:5px;">
@@ -961,7 +952,7 @@ <h1 class="ui dividing header">Upload file:</h1>
                                                     <input type="hidden" name="note_id" value="{{ escape(current_note['id']) }}"/>
                                                     <textarea type="hidden" id="textarea-{{ loop.index }}" style="display: none;">{{ current_note['text'] }}</textarea>
                                                     <div style="float: left; margin-bottom: 15px; width: 100%; height: 100%" id="editor_parent_{{ loop.index }}">
-                                                        <div style="float: left; margin-bottom: 15px; width: 100%; height: 380px;">
+                                                        <div style="float: left; margin-bottom: 15px; width: 100%; height: calc(100% - 70px);">
                                                             <div id="toolbar-container_{{ loop.index }}">
                                                                 <span class="ql-formats">
                                                                   <select class="ql-font"></select>
@@ -1008,7 +999,7 @@ <h1 class="ui dividing header">Upload file:</h1>
                                                                 </span>
                                                             </div>
                                                             <div id="editor_{{ loop.index }}"
-                                                                 name="text" style="height: 300px; overflow: auto;"></div>
+                                                                 name="text" style="height: calc(100% - 55px); overflow: auto;"></div>
                                                         </div>
                                                         <div style="margin-top:10px">
                                                             <div class="ui checkbox">
@@ -1077,7 +1068,7 @@ <h1 class="ui dividing header">Upload file:</h1>
                             </div>
                         </div>
                         <div style="height:200px"></div>
-                        <div class="host_footer" style="position: fixed; bottom: 0; width:calc(100% - 300px); background-color: white; margin-right: 150px;z-index: 3;">
+                        <div class="host_footer" style="position: fixed; bottom: 0; width:calc(100% - 300px); background-color: white; margin-right: 150px;z-index: 3; height: 270px;">
                             <h3 class="ui dividing header" style="margin-top:15px;">Host information:</h3>
                             <form class="ui form" action="/project/{{ current_project['id'] }}/host/{{ current_host['id'] }}/" method="post" onsubmit="return delete_prompt(this,'Are you sure to edit or delete host?');">
                                 <input type="hidden" name="update_description" value="1"/>

diff --git a/templates/project/sidebar.html b/templates/project/sidebar.html
@@ -42,7 +42,7 @@
     }
 
     #segment_id {
-        min-height: calc(100% - 26px);
+        height: calc(100% - 26px);
     }
 </style>
 {% set project_counters = db.select_project_stats_divbar(current_project['id']) %}