Skip to content

Commit ad614e8

Browse files
dri94dri94
authored
Merge pull request #56 from EmpowrOrg/dev
Update plugin for use new servers
2 parents ecdb08a + 74335b2 commit ad614e8

File tree

4 files changed

+226
-168
lines changed

4 files changed

+226
-168
lines changed

‎swiftplugin/swiftplugin/static/css/bootstrap.min.css

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎swiftplugin/swiftplugin/static/css/swiftplugin.css

Lines changed: 76 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,147 +1,170 @@
11
/* CSS for SwiftPluginXBlock */
2-
.container {
3-
min-height: 950px;
4-
}
5-
.swiftplugin>div{
6-
border: 0 !important;
7-
}
8-
.nav-tabs .nav-link#yoursolution2-tab, .nav-link#empowrsolution-tab {
2+
3+
.swiftplugin .nav-tabs .nav-link#yoursolution2-tab,
4+
.swiftplugin .nav-link#empowrsolution-tab {
95
padding: 8px 16px;
10-
color: #9E9E9E!important;
6+
color: #9E9E9E !important;
117
}
128

13-
.code-solution-row {
14-
--bs-gutter-x: 0!important;
9+
.swiftplugin .code-solution-row {
10+
--bs-gutter-x: 0 !important;
1511
}
1612

17-
.nav-pills#myTab, .nav-link.active#yoursolution2-tab, .nav-link.active#empowrsolution-tab {
18-
background-color: transparent!important;
19-
border-radius: 16px 16px 0 0!important;
13+
.swiftplugin .nav-pills#myTab,
14+
.swiftplugin .nav-link.active#yoursolution2-tab,
15+
.swiftplugin .nav-link.active#empowrsolution-tab {
16+
background-color: transparent !important;
17+
border-radius: 16px 16px 0 0 !important;
2018
font-weight: bold;
21-
color: #424242!important;
19+
color: #424242 !important;
2220
}
23-
.nav-link.active#yoursolution2-tab:hover{
24-
background: none !important;
25-
}
26-
.nav-link#yoursolution2-tab, .nav-link#empowrsolution-tab {
21+
22+
.swiftplugin .nav-link#yoursolution2-tab,
23+
.swiftplugin .nav-link#empowrsolution-tab {
2724
display: block;
2825
padding: .5rem 1rem;
2926
/* color: white; */
30-
color: #424242!important;
27+
font-weight: 100;
28+
color: #424242 !important;
3129
text-decoration: none;
32-
transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out;
30+
transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out;
3331
}
3432

3533

36-
div#code-container-area {
34+
.swiftplugin div#code-container-area {
3735
border: 1px;
3836
border-style: solid;
3937
border-radius: 16px;
40-
border-color: rgb(132, 132, 132)!important;
38+
border-color: rgb(132, 132, 132) !important;
4139
height: calc(70vmin + 40px);
42-
overflow:hidden;
40+
overflow: hidden;
4341
}
44-
div#code-container-area ul {
45-
list-style: none;
46-
}
47-
.response-txt {
42+
43+
.swiftplugin .response-txt {
4844
color: black;
4945
white-space: pre-wrap;
5046
}
5147

52-
.code-bottom {
48+
.swiftplugin .code-bottom {
5349
background: none;
5450
/* height: 30vh; */
5551
display: flex;
5652
flex-direction: column;
5753
}
5854

59-
.tab-pane {
55+
.swiftplugin .tab-pane {
6056
min-height: 100px;
6157
}
6258

63-
.instructions-container {
64-
padding-left: 16px!important;
65-
padding-right: 16px!important;
59+
.swiftplugin .instructions-container {
60+
padding-left: 16px !important;
61+
padding-right: 16px !important;
6662
}
6763

68-
.CodeMirror-wrap {
64+
.swiftplugin .CodeMirror-wrap {
6965
width: 50% !important;
7066
border-right: 1px solid #e6e6e6;
7167
/* min-height: 600px; */
7268
border-radius: 16px 0 0 16px;
7369

7470
}
7571

76-
.btn-primary#run-btn, .btn-primary#submit-btn {
72+
.swiftplugin .btn-primary#run-btn,
73+
.swiftplugin .btn-primary#submit-btn {
7774
color: #fff !important;
7875
background-color: #5c0e81 !important;
7976
border-color: #5c0e81 !important;
8077
}
8178

82-
.btn-primary#run-btn:hover, .btn-primary#submit-btn:hover {
79+
.swiftplugin .btn-primary#run-btn:hover,
80+
.swiftplugin .btn-primary#submit-btn:hover {
8381
background-color: #7730b0 !important;
8482
border-color: #7730b0 !important;
8583
}
8684

87-
.btn-primary#select-lang-btn, .btn-primary#submit-btn {
85+
.swiftplugin .btn-primary#select-lang-btn,
86+
.swiftplugin .btn-primary#submit-btn {
8887
color: #fff !important;
8988
background-color: #5c0e81 !important;
9089
border-color: #5c0e81 !important;
9190
}
9291

93-
.btn-primary#select-lang-btn:hover, .btn-primary#submit-btn:hover {
92+
.swiftplugin .btn-primary#select-lang-btn:hover,
93+
.swiftplugin .btn-primary#submit-btn:hover {
9494
background-color: #7730b0 !important;
9595
border-color: #7730b0 !important;
9696
}
9797

98-
.CodeMirror{
98+
.swiftplugin .CodeMirror {
9999
height: auto !important;
100100
}
101101

102-
.instructions-container, .CodeMirror-wrap{
102+
.swiftplugin .instructions-container,
103+
.swiftplugin .CodeMirror-wrap {
103104
height: 70vmin !important;
104105
overflow-y: scroll;
105106
}
106107

107-
.heading-dropdown-wrapper {
108+
.swiftplugin .heading-dropdown-wrapper {
108109
display: flex;
109110
align-items: center;
110111
justify-content: space-between;
111112
}
112113

113-
.tab-pane.fade.show.active + .tab-pane.fade.hidden.active{
114+
.swiftplugin .tab-pane.fade.show.active+.tab-pane.fade.hidden.active {
114115
margin-bottom: -70vmin;
115116
}
116117

117-
.CodeMirror.cm-s-default.CodeMirror-wrap{
118+
.swiftplugin .CodeMirror.cm-s-default.CodeMirror-wrap {
118119
width: 100% !important;
119120
}
120121

121-
.tab-content-wrapper{
122+
.swiftplugin .tab-content-wrapper {
122123
display: grid;
123124
grid-template-columns: 1fr 1fr;
124125
}
125126

126-
@media (max-width: 768px){
127-
.CodeMirror-wrap{
127+
@media (max-width: 768px) {
128+
.swiftplugin .CodeMirror-wrap {
128129
width: 100% !important;
129130
/* min-height: 400px; */
130-
}
131-
div#code-container-area {
131+
}
132+
133+
.swiftplugin div#code-container-area {
132134
/* height:100vh; */
133-
overflow:hidden;
135+
overflow: hidden;
134136
}
135-
136-
div#code-solution-area {
137-
height:100vh;
138-
overflow:hidden;
137+
138+
.swiftplugin div#code-solution-area {
139+
height: 100vh;
140+
overflow: hidden;
139141
}
140142
}
141143

142144
@media only screen and (max-width: 992px) {
143-
.heading-dropdown-wrapper {
145+
.swiftplugin .heading-dropdown-wrapper {
144146
flex-direction: column;
145147
align-items: flex-start;
146148
}
147149
}
150+
151+
.CodeMirror-line {
152+
margin: -1px 20px;
153+
}
154+
155+
.CodeMirror-gutter,
156+
.CodeMirror-linenumbers {
157+
width: 26px;
158+
}
159+
160+
.CodeMirror-line {
161+
margin: 0px 32px;
162+
}
163+
164+
.swiftplugin #code-container-area li {
165+
list-style: none;
166+
}
167+
168+
.swiftplugin .col-12 {
169+
border: none;
170+
}

‎swiftplugin/swiftplugin/static/html/swiftplugin.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<section class="col-md-12">
2-
<div class="container swiftplugin">
1+
<section class="swiftplugin col-md-12">
2+
<div class="container">
33
<div class="col-12">
44
<h1 class="mb-2" id="assignment-title">Title</h1>
55
<div id="code-container-area">
@@ -26,7 +26,7 @@ <h1 class="mb-2" id="assignment-title">Title</h1>
2626
class="col-sm-12 col-md-6 col-lg-12">Layout 2</textarea>
2727
</div>
2828
</div>
29-
<div class="tab-pane fade hidden active" id="empowrsolution" role="tabpanel"
29+
<div class="tab-pane fade active" id="empowrsolution" role="tabpanel"
3030
aria-labelledby="empowrsolution-tab">
3131
<div class="row code-solution-row">
3232
<textarea id="code-solution-area" rows="25" class="col-sm-12 col-md-6"

0 commit comments

Comments
 (0)