Merge pull request #56 from EmpowrOrg/dev

Update plugin for use new servers
EmpowrOrg · Oct 30, 2022 · ad614e8 · ad614e8
2 parents ecdb08a + 74335b2
commit ad614e8
Show file tree

Hide file tree

Showing 4 changed files with 226 additions and 168 deletions.
diff --git a/swiftplugin/swiftplugin/static/css/bootstrap.min.css b/swiftplugin/swiftplugin/static/css/bootstrap.min.css
diff --git a/swiftplugin/swiftplugin/static/css/swiftplugin.css b/swiftplugin/swiftplugin/static/css/swiftplugin.css
@@ -1,147 +1,170 @@
 /* CSS for SwiftPluginXBlock */
-.container {
-    min-height: 950px;
-}
-.swiftplugin>div{
-    border: 0 !important;
-}
-.nav-tabs .nav-link#yoursolution2-tab, .nav-link#empowrsolution-tab {
+
+.swiftplugin .nav-tabs .nav-link#yoursolution2-tab,
+.swiftplugin .nav-link#empowrsolution-tab {
     padding: 8px 16px;
-    color: #9E9E9E!important;
+    color: #9E9E9E !important;
 }
 
-.code-solution-row {
-    --bs-gutter-x: 0!important;
+.swiftplugin .code-solution-row {
+    --bs-gutter-x: 0 !important;
 }
 
-.nav-pills#myTab, .nav-link.active#yoursolution2-tab, .nav-link.active#empowrsolution-tab {
-    background-color: transparent!important;
-    border-radius: 16px 16px 0 0!important;
+.swiftplugin .nav-pills#myTab,
+.swiftplugin .nav-link.active#yoursolution2-tab,
+.swiftplugin .nav-link.active#empowrsolution-tab {
+    background-color: transparent !important;
+    border-radius: 16px 16px 0 0 !important;
     font-weight: bold;
-    color: #424242!important;
+    color: #424242 !important;
 }
-.nav-link.active#yoursolution2-tab:hover{
-    background: none !important;
-}
-.nav-link#yoursolution2-tab, .nav-link#empowrsolution-tab {
+
+.swiftplugin .nav-link#yoursolution2-tab,
+.swiftplugin .nav-link#empowrsolution-tab {
     display: block;
     padding: .5rem 1rem;
     /* color: white; */
-    color: #424242!important;
+    font-weight: 100;
+    color: #424242 !important;
     text-decoration: none;
-    transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out;
+    transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out;
 }
 
 
-div#code-container-area {
+.swiftplugin div#code-container-area {
     border: 1px;
     border-style: solid;
     border-radius: 16px;
-    border-color: rgb(132, 132, 132)!important;
+    border-color: rgb(132, 132, 132) !important;
     height: calc(70vmin + 40px);
-    overflow:hidden;
+    overflow: hidden;
 }
-div#code-container-area ul {
-    list-style: none;
-}
-.response-txt {
+
+.swiftplugin .response-txt {
     color: black;
     white-space: pre-wrap;
 }
 
-.code-bottom {
+.swiftplugin .code-bottom {
     background: none;
     /* height: 30vh; */
     display: flex;
     flex-direction: column;
 }
 
-.tab-pane {
+.swiftplugin .tab-pane {
     min-height: 100px;
 }
 
-.instructions-container {
-    padding-left: 16px!important;
-    padding-right: 16px!important;
+.swiftplugin .instructions-container {
+    padding-left: 16px !important;
+    padding-right: 16px !important;
 }
 
-.CodeMirror-wrap {
+.swiftplugin .CodeMirror-wrap {
     width: 50% !important;
     border-right: 1px solid #e6e6e6;
     /* min-height: 600px; */
     border-radius: 16px 0 0 16px;
 
 }
 
-.btn-primary#run-btn, .btn-primary#submit-btn {
+.swiftplugin .btn-primary#run-btn,
+.swiftplugin .btn-primary#submit-btn {
     color: #fff !important;
     background-color: #5c0e81 !important;
     border-color: #5c0e81 !important;
 }
 
-.btn-primary#run-btn:hover, .btn-primary#submit-btn:hover {
+.swiftplugin .btn-primary#run-btn:hover,
+.swiftplugin .btn-primary#submit-btn:hover {
     background-color: #7730b0 !important;
     border-color: #7730b0 !important;
 }
 
-.btn-primary#select-lang-btn, .btn-primary#submit-btn {
+.swiftplugin .btn-primary#select-lang-btn,
+.swiftplugin .btn-primary#submit-btn {
     color: #fff !important;
     background-color: #5c0e81 !important;
     border-color: #5c0e81 !important;
 }
 
-.btn-primary#select-lang-btn:hover, .btn-primary#submit-btn:hover {
+.swiftplugin .btn-primary#select-lang-btn:hover,
+.swiftplugin .btn-primary#submit-btn:hover {
     background-color: #7730b0 !important;
     border-color: #7730b0 !important;
 }
 
-.CodeMirror{
+.swiftplugin .CodeMirror {
     height: auto !important;
 }
 
-.instructions-container, .CodeMirror-wrap{
+.swiftplugin .instructions-container,
+.swiftplugin .CodeMirror-wrap {
     height: 70vmin !important;
     overflow-y: scroll;
 }
 
-.heading-dropdown-wrapper {
+.swiftplugin .heading-dropdown-wrapper {
     display: flex;
     align-items: center;
     justify-content: space-between;
 }
 
-.tab-pane.fade.show.active + .tab-pane.fade.hidden.active{
+.swiftplugin .tab-pane.fade.show.active+.tab-pane.fade.hidden.active {
     margin-bottom: -70vmin;
 }
 
-.CodeMirror.cm-s-default.CodeMirror-wrap{
+.swiftplugin .CodeMirror.cm-s-default.CodeMirror-wrap {
     width: 100% !important;
 }
 
-.tab-content-wrapper{
+.swiftplugin .tab-content-wrapper {
     display: grid;
     grid-template-columns: 1fr 1fr;
 }
 
-@media (max-width: 768px){
-    .CodeMirror-wrap{
+@media (max-width: 768px) {
+    .swiftplugin .CodeMirror-wrap {
         width: 100% !important;
         /* min-height: 400px; */
-	}
-    div#code-container-area {
+    }
+
+    .swiftplugin div#code-container-area {
         /* height:100vh; */
-        overflow:hidden;
+        overflow: hidden;
     }
-    
-    div#code-solution-area {
-        height:100vh;
-        overflow:hidden;
+
+    .swiftplugin div#code-solution-area {
+        height: 100vh;
+        overflow: hidden;
     }
 }
 
 @media only screen and (max-width: 992px) {
-    .heading-dropdown-wrapper {
+    .swiftplugin .heading-dropdown-wrapper {
         flex-direction: column;
         align-items: flex-start;
     }
 }
+
+.CodeMirror-line {
+    margin: -1px 20px;
+}
+
+.CodeMirror-gutter,
+.CodeMirror-linenumbers {
+    width: 26px;
+}
+
+.CodeMirror-line {
+    margin: 0px 32px;
+}
+
+.swiftplugin #code-container-area li {
+    list-style: none;
+}
+
+.swiftplugin .col-12 {
+    border: none;
+}
diff --git a/swiftplugin/swiftplugin/static/html/swiftplugin.html b/swiftplugin/swiftplugin/static/html/swiftplugin.html
@@ -1,5 +1,5 @@
-<section class="col-md-12">
-    <div class="container swiftplugin">
+<section class="swiftplugin col-md-12">
+    <div class="container">
         <div class="col-12">
             <h1 class="mb-2" id="assignment-title">Title</h1>
             <div id="code-container-area">
@@ -26,7 +26,7 @@ <h1 class="mb-2" id="assignment-title">Title</h1>
                                     class="col-sm-12 col-md-6 col-lg-12">Layout 2</textarea>
                             </div>
                         </div>
-                        <div class="tab-pane fade hidden active" id="empowrsolution" role="tabpanel"
+                        <div class="tab-pane fade active" id="empowrsolution" role="tabpanel"
                             aria-labelledby="empowrsolution-tab">
                             <div class="row code-solution-row">
                                 <textarea id="code-solution-area" rows="25" class="col-sm-12 col-md-6"