Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 90d5410

Browse files
gtritchiegtritchie
committed
Merge branch 'master' into feature/console-color
2 parents 422b3c5 + 7f4a700 commit 90d5410

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+489
-674
lines changed

‎Vagrantfile‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Vagrant.configure(2) do |config|
5151
end
5252
end
5353

54-
# define NFS box; can be used with or without the load balancer.
54+
# define NFSv3 box; can be used with or without the load balancer.
5555
config.vm.define "nfs", autostart: false do |n|
5656
n.vm.box = "ubuntu/trusty64"
5757
n.vm.network "private_network", ip: "192.168.55.103"
@@ -64,6 +64,28 @@ Vagrant.configure(2) do |config|
6464
end
6565
end
6666

67+
# define NFSv4 box; mutually exclusive with the NFSv3 box (pick one)
68+
config.vm.define "nfs4", autostart: false do |n|
69+
n.vm.box = "freebsd/FreeBSD-11.0-STABLE"
70+
71+
# the freeBSD base box is missing a MAC address
72+
n.vm.base_mac = "080027D14C66"
73+
74+
n.vm.provision :shell, path: "vagrant/provision-nfs4.sh"
75+
76+
# just a file server
77+
n.vm.provider "virtualbox" do |vb|
78+
# required for FreeBSD to connect to the private network correctly
79+
vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
80+
vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
81+
82+
vb.memory = "1024"
83+
vb.cpus = "1"
84+
end
85+
86+
n.vm.network "private_network", ip: "192.168.55.103"
87+
end
88+
6789
# define an LDAP box; can be used with or without the load balancer, but
6890
# must only be started once all the servers are up since it configures them
6991
config.vm.define "ldap", autostart: false do |l|

‎src/gwt/src/org/rstudio/core/client/theme/res/themeStyles.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,10 @@ pre {
602602
.rstudio-themes-flat .windowframe > div:last-child {
603603
border: solid 1px #d6dadc;
604604
border-radius: 3px;
605+
left: 2px !important;
606+
top: 2px !important;
607+
right: 2px !important;
608+
bottom: 2px !important;
605609
}
606610

607611
.macintosh #rstudio_console_input {

‎src/gwt/src/org/rstudio/studio/client/application/ui/impl/header/HeaderPanel.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
}
99

1010
.rstudio-themes-flat .panel {
11-
padding: 0 9px 0 9px;
11+
padding: 0 8px 0 8px;
1212
margin-top: 8px;
1313
}
1414

‎src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/status/StatusBarWidget.ui.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
}
1919
.rstudio-themes-flat .statusBar {
2020
background-image: none;
21+
border-top: solid 1px #d6dadc;
2122
}
2223
.statusBar div {
2324
display: inline;

‎src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/themes/ambiance.css‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
font-feature-settings: "liga" 0;
252252
position: relative;
253253
}
254-
.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
254+
.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
255255
background-color: #CCC;
256256
color: #1e1e1e;
257257
}
@@ -260,26 +260,16 @@
260260
outline-offset: -1px;
261261
background-color: transparent;
262262
}
263-
@keyframes xterm-cursor-blink {
264-
0% {
265-
background-color: #CCC;
266-
color: #1e1e1e;
267-
}
268-
50% {
269-
background-color: transparent;
270-
color: #CCC;
271-
}
272-
}
273263
.terminal.xterm-cursor-style-bar .terminal-cursor::before,
274264
.terminal.xterm-cursor-style-underline .terminal-cursor::before {
275265
content: "";
276266
display: block;
277267
position: absolute;
278268
background-color: #CCC;
279269
}
280-
@keyframes xterm-cursor-non-bar-blink {
281-
0% { background-color: #CCC; }
282-
50% { background-color: transparent; }
270+
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before,
271+
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before {
272+
background-color: #CCC;
283273
}
284274
.terminal .xterm-viewport {
285275
/* On OS X this is required in order for the scroll bar to appear fully opaque */

‎src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/themes/chaos.css‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
font-feature-settings: "liga" 0;
185185
position: relative;
186186
}
187-
.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
187+
.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
188188
background-color: #CCC;
189189
color: #1e1e1e;
190190
}
@@ -193,26 +193,16 @@
193193
outline-offset: -1px;
194194
background-color: transparent;
195195
}
196-
@keyframes xterm-cursor-blink {
197-
0% {
198-
background-color: #CCC;
199-
color: #1e1e1e;
200-
}
201-
50% {
202-
background-color: transparent;
203-
color: #CCC;
204-
}
205-
}
206196
.terminal.xterm-cursor-style-bar .terminal-cursor::before,
207197
.terminal.xterm-cursor-style-underline .terminal-cursor::before {
208198
content: "";
209199
display: block;
210200
position: absolute;
211201
background-color: #CCC;
212202
}
213-
@keyframes xterm-cursor-non-bar-blink {
214-
0% { background-color: #CCC; }
215-
50% { background-color: transparent; }
203+
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before,
204+
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before {
205+
background-color: #CCC;
216206
}
217207
.terminal .xterm-viewport {
218208
/* On OS X this is required in order for the scroll bar to appear fully opaque */

‎src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/themes/chrome.css‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
font-feature-settings: "liga" 0;
185185
position: relative;
186186
}
187-
.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
187+
.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
188188
background-color: #333;
189189
color: #CCC;
190190
}
@@ -193,26 +193,16 @@
193193
outline-offset: -1px;
194194
background-color: transparent;
195195
}
196-
@keyframes xterm-cursor-blink {
197-
0% {
198-
background-color: #333;
199-
color: #CCC;
200-
}
201-
50% {
202-
background-color: transparent;
203-
color: #333;
204-
}
205-
}
206196
.terminal.xterm-cursor-style-bar .terminal-cursor::before,
207197
.terminal.xterm-cursor-style-underline .terminal-cursor::before {
208198
content: "";
209199
display: block;
210200
position: absolute;
211201
background-color: #333;
212202
}
213-
@keyframes xterm-cursor-non-bar-blink {
214-
0% { background-color: #333; }
215-
50% { background-color: transparent; }
203+
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before,
204+
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before {
205+
background-color: #333;
216206
}
217207
.terminal .xterm-viewport {
218208
/* On OS X this is required in order for the scroll bar to appear fully opaque */

‎src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/themes/clouds.css‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
font-feature-settings: "liga" 0;
149149
position: relative;
150150
}
151-
.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
151+
.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
152152
background-color: #333;
153153
color: #CCC;
154154
}
@@ -157,26 +157,16 @@
157157
outline-offset: -1px;
158158
background-color: transparent;
159159
}
160-
@keyframes xterm-cursor-blink {
161-
0% {
162-
background-color: #333;
163-
color: #CCC;
164-
}
165-
50% {
166-
background-color: transparent;
167-
color: #333;
168-
}
169-
}
170160
.terminal.xterm-cursor-style-bar .terminal-cursor::before,
171161
.terminal.xterm-cursor-style-underline .terminal-cursor::before {
172162
content: "";
173163
display: block;
174164
position: absolute;
175165
background-color: #333;
176166
}
177-
@keyframes xterm-cursor-non-bar-blink {
178-
0% { background-color: #333; }
179-
50% { background-color: transparent; }
167+
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before,
168+
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before {
169+
background-color: #333;
180170
}
181171
.terminal .xterm-viewport {
182172
/* On OS X this is required in order for the scroll bar to appear fully opaque */

‎src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/themes/clouds_midnight.css‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
font-feature-settings: "liga" 0;
147147
position: relative;
148148
}
149-
.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
149+
.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
150150
background-color: #CCC;
151151
color: #1e1e1e;
152152
}
@@ -155,26 +155,16 @@
155155
outline-offset: -1px;
156156
background-color: transparent;
157157
}
158-
@keyframes xterm-cursor-blink {
159-
0% {
160-
background-color: #CCC;
161-
color: #1e1e1e;
162-
}
163-
50% {
164-
background-color: transparent;
165-
color: #CCC;
166-
}
167-
}
168158
.terminal.xterm-cursor-style-bar .terminal-cursor::before,
169159
.terminal.xterm-cursor-style-underline .terminal-cursor::before {
170160
content: "";
171161
display: block;
172162
position: absolute;
173163
background-color: #CCC;
174164
}
175-
@keyframes xterm-cursor-non-bar-blink {
176-
0% { background-color: #CCC; }
177-
50% { background-color: transparent; }
165+
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before,
166+
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before {
167+
background-color: #CCC;
178168
}
179169
.terminal .xterm-viewport {
180170
/* On OS X this is required in order for the scroll bar to appear fully opaque */

‎src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/themes/cobalt.css‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
font-feature-settings: "liga" 0;
168168
position: relative;
169169
}
170-
.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
170+
.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
171171
background-color: #CCC;
172172
color: #1e1e1e;
173173
}
@@ -176,26 +176,16 @@
176176
outline-offset: -1px;
177177
background-color: transparent;
178178
}
179-
@keyframes xterm-cursor-blink {
180-
0% {
181-
background-color: #CCC;
182-
color: #1e1e1e;
183-
}
184-
50% {
185-
background-color: transparent;
186-
color: #CCC;
187-
}
188-
}
189179
.terminal.xterm-cursor-style-bar .terminal-cursor::before,
190180
.terminal.xterm-cursor-style-underline .terminal-cursor::before {
191181
content: "";
192182
display: block;
193183
position: absolute;
194184
background-color: #CCC;
195185
}
196-
@keyframes xterm-cursor-non-bar-blink {
197-
0% { background-color: #CCC; }
198-
50% { background-color: transparent; }
186+
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before,
187+
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before {
188+
background-color: #CCC;
199189
}
200190
.terminal .xterm-viewport {
201191
/* On OS X this is required in order for the scroll bar to appear fully opaque */

0 commit comments

Comments
 (0)