Skip to content

Commit dc1563d

Browse files
authored
Merge pull request #54 from oslabs-beta/staging
fix inline styling error
2 parents fb4d484 + 14db407 commit dc1563d

File tree

10 files changed

+176
-229
lines changed

10 files changed

+176
-229
lines changed

package-lock.json

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

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@
248248
"react-dom": "^16.13.1",
249249
"react-highlight": "^0.12.0",
250250
"react-json-pretty": "^2.2.0",
251-
"react-json-view": "^1.19.1",
252251
"react-modal": "^3.11.2",
253252
"react-redux": "^5.1.2",
254253
"react-syntax-highlighter-virtualized-renderer": "^1.1.0",

src/assets/style/prompt.scss

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.collectionModal {
22
background-color: #2c3e50;
3-
border: 2px solid #808080;
4-
font-weight: bold;
3+
border: 2px solid #808080;
4+
font-weight: bold;
55
height: 250px;
6-
outline: 0 none;
6+
outline: 0 none;
77
color: white;
88
display: flex;
99
flex-flow: column nowrap;
@@ -13,16 +13,19 @@
1313
border-radius: 10px;
1414
opacity: 1 !important;
1515
z-index: 12;
16+
1617
h1 {
1718
margin: 20px;
1819
font-size: 26px;
1920
}
21+
2022
div {
2123
margin: 10px;
2224
display: flex;
2325
justify-content: space-evenly;
2426
align-items: center;
2527
}
28+
2629
input {
2730
font-size: 18px;
2831
text-align: center;
@@ -33,25 +36,28 @@
3336
border: 2px solid $yellowgrey;
3437
outline: none;
3538
}
39+
3640
button {
3741
width: 40%;
38-
border: 2px solid #808080;
39-
border-radius: 5px;
42+
border: 2px solid #808080;
43+
border-radius: 5px;
4044
cursor: pointer;
4145
display: flex;
4246
justify-content: center;
4347
align-items: center;
44-
font-size: .9rem;
48+
font-size: .9rem;
4549
font-weight: bold;
4650
padding: 4px 18px;
4751
margin: 10px;
4852
outline: none;
4953
}
54+
5055
p {
51-
color: white;
56+
color: $remove;
5257
font-size: 20px;
5358
}
5459
}
60+
5561
.collectionModalOverlay {
5662
height: 100vh;
5763
width: 100vw;
@@ -66,6 +72,6 @@
6672
justify-content: center;
6773
align-items: center;
6874
outline: none;
69-
background-color:rgba(0, 0, 0, 0.5);
75+
background-color: rgba(0, 0, 0, 0.5);
7076
z-index: 12;
71-
}
77+
}

0 commit comments

Comments
 (0)