Skip to content

Commit fd9a147

Browse files
authored
Merge branch 'master' into feature/marker-updates
2 parents dac97fc + 74be6a6 commit fd9a147

File tree

3 files changed

+120
-76
lines changed

3 files changed

+120
-76
lines changed
Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
#ace-editor {
2-
height:~"calc(100vh - 46px)" !important;
3-
}
1+
#swagger-editor {
2+
#ace-editor {
3+
height:~"calc(100vh - 46px)" !important;
4+
}
45

5-
.SplitPane {
6-
height: ~"calc(100% - 46px)" !important;
6+
.SplitPane {
7+
height: ~"calc(100% - 46px)" !important;
8+
}
79
}
10+
11+
@import './read-only-watermark.less';
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
.editor-wrapper {
2+
3+
.editor-readonly-watermark {
4+
position: absolute;
5+
top: 0;
6+
height: 40px;
7+
left: 0;
8+
right: 0;
9+
padding-right: 20px;
10+
padding-top: 10px;
11+
margin: 0;
12+
13+
z-index: 2;
14+
color: #fff;
15+
font-weight: bold;
16+
text-align: right;
17+
user-select: none;
18+
pointer-events: none;
19+
20+
&:before {
21+
z-index: 1;
22+
pointer-events: none;
23+
position: absolute;
24+
content: ' ';
25+
top: 0;
26+
left: 0;
27+
right: 0;
28+
bottom: 0;
29+
30+
background: linear-gradient(
31+
to right,
32+
rgba(255,255,255,0) 60%,
33+
rgba(145, 145, 145, 0.31) 74%,
34+
rgba(255, 255, 255, 0.17) 100%);
35+
36+
}
37+
}
38+
}

src/standalone/topbar/topbar.less

Lines changed: 73 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,98 @@
1-
.topbar {
2-
background-color: #89bf04;
3-
width: 100%;
4-
}
1+
#swagger-editor {
2+
.topbar {
3+
background-color: #89bf04;
4+
width: 100%;
5+
}
56

6-
.topbar-wrapper {
7-
padding: 0.7em;
8-
display: flex;
7+
.topbar-wrapper {
8+
padding: 0.7em;
9+
display: flex;
910

10-
& > * {
11-
margin-left: 1em;
12-
margin-right: 1em;
13-
align-self: center;
14-
color: white;
15-
font-size: 1.0em;
16-
font-weight: 500;
17-
}
11+
& > * {
12+
margin-left: 1em;
13+
margin-right: 1em;
14+
align-self: center;
15+
color: white;
16+
font-size: 1.0em;
17+
font-weight: 500;
18+
}
1819

19-
& .menu-item {
20-
cursor: pointer;
21-
font-size:14px;
20+
& .menu-item {
21+
cursor: pointer;
22+
font-size:14px;
2223

23-
&::after {
24-
content: '';
25-
margin-left: 6px;
26-
font-size: 8px;
24+
&::after {
25+
content: '';
26+
margin-left: 6px;
27+
font-size: 8px;
28+
}
2729
}
2830
}
29-
}
3031

31-
.topbar-logo__img {
32-
float: left;
33-
}
32+
.topbar-logo__img {
33+
float: left;
34+
}
3435

35-
.topbar-logo__title {
36-
display: inline-block;
37-
color: #fff;
38-
font-size: 1.5em;
39-
font-weight: bold;
40-
margin: 0.1em 1.2em 0 0.5em;
41-
}
36+
.topbar-logo__title {
37+
display: inline-block;
38+
color: #fff;
39+
font-size: 1.5em;
40+
font-weight: bold;
41+
margin: 0.1em 1.2em 0 0.5em;
42+
}
4243

43-
.dd-menu {
44-
&.long {
45-
display: flex;
46-
flex-wrap: wrap;
47-
max-width:800px;
48-
.dd-menu-items {
49-
width:600px;
50-
.dd-items-left {
51-
display: flex;
52-
flex-wrap: wrap;
53-
margin: 1.7em 0 0!important;
54-
li {
55-
flex:22%;
44+
.dd-menu {
45+
&.long {
46+
display: flex;
47+
flex-wrap: wrap;
48+
max-width:800px;
49+
.dd-menu-items {
50+
width:600px;
51+
.dd-items-left {
52+
display: flex;
53+
flex-wrap: wrap;
54+
margin: 1.7em 0 0!important;
55+
li {
56+
flex:22%;
57+
}
5658
}
5759
}
5860
}
59-
}
6061

61-
.dd-menu-items {
62-
margin: 1.1em 0 0 0 !important;
63-
ol,ul {
64-
border-radius:0 0 4px 4px;
62+
.dd-menu-items {
63+
margin: 1.1em 0 0 0 !important;
64+
ol,ul {
65+
border-radius:0 0 4px 4px;
6566

66-
li {
67-
&:last-of-type {
68-
&:hover {
69-
border-radius:0 0 4px 4px;
67+
li {
68+
&:last-of-type {
69+
&:hover {
70+
border-radius:0 0 4px 4px;
71+
}
7072
}
7173
}
7274
}
7375
}
7476
}
75-
}
7677

77-
.modal {
78-
padding: 1em;
79-
padding-bottom: 3em;
80-
position: relative;
81-
min-height: 12em;
78+
.modal {
79+
padding: 1em;
80+
padding-bottom: 3em;
81+
position: relative;
82+
min-height: 12em;
8283

83-
div.container {
84-
height: 100%;
85-
}
84+
div.container {
85+
height: 100%;
86+
}
8687

87-
.right {
88-
margin: 1em;
89-
position: absolute;
90-
right: 0;
91-
}
88+
.right {
89+
margin: 1em;
90+
position: absolute;
91+
right: 0;
92+
}
9293

93-
button {
94-
margin-left: 1em;
94+
button {
95+
margin-left: 1em;
96+
}
9597
}
9698
}

0 commit comments

Comments
 (0)