Simplified css, made finding links bigger

nccgroup · Jan 30, 2019 · 9a69751 · 9a69751
1 parent 12fe691
commit 9a69751
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 46 deletions.
diff --git a/ScoutSuite/output/data/html/partials/about_scoutsuite.html b/ScoutSuite/output/data/html/partials/about_scoutsuite.html
@@ -0,0 +1,26 @@
+<script id="about_scoutsuite-template" type="text/x-handlebars-template">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">About Scout Suite</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row list-group-item">
+                    <p>Scout Suite is an open-source tool released by <a href="https://www.nccgroup.trust" rel="author" target="_blank">NCC Group</a>.</p>
+                    <p>Use the top navigation bar to review the configuration of the supported cloud provider services.</p>
+                    <p>
+                        For more information about Scout Suite, please check out the project's page on
+                        <a href="https://github.com/nccgroup/ScoutSuite" target="_blank">GitHub</a>.
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+</script>
+
+<script>
+    var about_scoutsuite_template = Handlebars.compile($("#about_scoutsuite-template").html());
+</script>
diff --git a/ScoutSuite/output/data/html/partials/dashboard.html b/ScoutSuite/output/data/html/partials/dashboard.html
@@ -23,7 +23,7 @@
 
               <ul class="list-group">
                   {{#each_dict_as_sorted_list findings}}
-                  <div id="list-{{key}}" class="finding_items ">
+                  <div id="list-{{key}}" class="finding_items">
                       <div class="list-group-item finding-title finding-title-{{dashboard_color level checked_items flagged_items}} plain-link">
                           <div class="row">
                               <div class="col-sm-11">

diff --git a/ScoutSuite/output/data/html/partials/metadata.html b/ScoutSuite/output/data/html/partials/metadata.html
@@ -82,7 +82,7 @@
                 <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
                 <ul class="dropdown-menu">
                   <li><a class="dropdown-item" href="javascript:showLastRunDetails()">Last run details</a></li>
-                  <li><a class="dropdown-item" href="javascript:about()">About Scout Suite</a></li>
+                  <li><a class="dropdown-item" href="javascript:showAbout()">About Scout Suite</a></li>
                   <li><a class="dropdown-item" href="javascript:download_exceptions()">Export exceptions</a><a id="downloadAnchorElem" style="display:none"></a></li>
                   <li><a class="dropdown-item">Dark theme
                     <label class="switch">

diff --git a/ScoutSuite/output/data/html/report.html b/ScoutSuite/output/data/html/report.html
@@ -91,23 +91,6 @@ <h2 id="section_title-h2"></h2>
 
             <!-- PLACEHOLDER -->
 
-            <!-- About Scout -->
-            <div class="row" id="about.details">
-                <div class="list-group">
-                    <div class="row list-group-item active">
-                        About Scout Suite
-                    </div>
-                    <div class="row list-group-item">
-                        <p>Scout Suite is an open-source tool released by <a href="https://www.nccgroup.trust" rel="author" target="_blank">NCC Group</a>.</p>
-                        <p>Use the top navigation bar to review the configuration of the supported cloud provider services.</p>
-                        <p>
-                            For more information about Scout Suite, please check out the project's page on
-                            <a href="https://github.com/nccgroup/ScoutSuite" target="_blank">GitHub</a>.
-                        </p>
-                    </div>
-                </div>
-            </div>
-
             <!-- Please wait -->
             <div class="row" id="please_wait.details">
                 <div class="list-group">

diff --git a/ScoutSuite/output/data/html/ruleset-generator.html b/ScoutSuite/output/data/html/ruleset-generator.html
@@ -65,7 +65,7 @@
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
                             <ul class="dropdown-menu">
-                                <li><a href="javascript:about()">About</a></li>
+                                <li><a href="javascript:showAbout()">About</a></li>
                             </ul>
                         </li>
                     </ul>

diff --git a/ScoutSuite/output/data/inc-scoutsuite/scoutsuite.css b/ScoutSuite/output/data/inc-scoutsuite/scoutsuite.css
@@ -53,7 +53,7 @@
     color: #23af44 !important;
 }
 .finding-title {
-    background: #f5f5f5 !important;
+    background: #f5f5f5;
 }
 
 .finding-badge {
@@ -114,34 +114,24 @@ ul.no-bullet {
 .plain-link a:link,
 .plain-link a:visited,
 .plain-link a:active {
-    color: #019479 !important;
-    text-decoration: none !important;
+    color: black;
+    text-decoration: none;
 }
 
 .plain-link a:hover {
-    color: #007f67 !important;
-    text-decoration: underline !important;
+    text-decoration: underline;
 }
 
-.disabled-link a:link{
-    pointer-events: none;
-    cursor: default;
-}
-.disabled-link a:visited{
-    pointer-events: none;
-    cursor: default;
-}
-.disabled-link a:hover{
+.disabled-link a:link,
+.disabled-link a:active,
+.disabled-link a:visited,
+.disabled-link a:hover {
+    color: rgb(110, 110, 110);
     pointer-events: none;
     cursor: default;
 }
-.disabled-link a:active{
-    pointer-events: none;
-    cursor: default;
-}
-
 .active a{
-    text-decoration: none !important;
+    text-decoration: none;
     color: black;
 }
 
@@ -336,6 +326,7 @@ input:checked + .slider:before {
 }
 
 .finding_items {
+    font-size: 18px;
     margin: 4px 0;
     border-radius: 3px;
-}
+}
diff --git a/ScoutSuite/output/data/inc-scoutsuite/scoutsuite.js b/ScoutSuite/output/data/inc-scoutsuite/scoutsuite.js
@@ -759,11 +759,9 @@ function load_metadata() {
 /**
  * Show About Scout Suite div
  */
-function about() {
-    hideAll();
-    showRow('about');
-    $('#findings_download_button').hide();
-    $('#section_title-h2').text('');
+function showAbout() {
+    $('#modal-container').html(about_scoutsuite_template());
+    $('#modal-container').modal();
 };