Commit 51d480bf7b947b98014bfa4b0d586acef3fb9378
1 parent
d3787cb3
fix 发版
Showing
5 changed files
with
63 additions
and
18 deletions
dist/css/ide.css
| @@ -280,23 +280,35 @@ html, body { | @@ -280,23 +280,35 @@ html, body { | ||
| 280 | #console-wrap:-webkit-full-screen { | 280 | #console-wrap:-webkit-full-screen { |
| 281 | width: 100%; | 281 | width: 100%; |
| 282 | height: 100%; | 282 | height: 100%; |
| 283 | - top: 0; } | 283 | + top: 0; |
| 284 | + padding-left: 0; } | ||
| 285 | + #console-wrap:-webkit-full-screen .CodeMirror-gutter { | ||
| 286 | + display: none; } | ||
| 284 | 287 | ||
| 285 | #console-wrap:-moz-full-screen { | 288 | #console-wrap:-moz-full-screen { |
| 286 | width: 100%; | 289 | width: 100%; |
| 287 | height: 100%; | 290 | height: 100%; |
| 288 | - top: 0; } | 291 | + top: 0; |
| 292 | + padding-left: 0; } | ||
| 293 | + #console-wrap:-moz-full-screen .CodeMirror-gutter { | ||
| 294 | + display: none; } | ||
| 289 | 295 | ||
| 290 | #console-wrap:-ms-fullscreen { | 296 | #console-wrap:-ms-fullscreen { |
| 291 | width: 100%; | 297 | width: 100%; |
| 292 | height: 100%; | 298 | height: 100%; |
| 293 | - top: 0; } | 299 | + top: 0; |
| 300 | + padding-left: 0; } | ||
| 301 | + #console-wrap:-ms-fullscreen .CodeMirror-gutter { | ||
| 302 | + display: none; } | ||
| 294 | 303 | ||
| 295 | #console-wrapfullscreen { | 304 | #console-wrapfullscreen { |
| 296 | /* spec */ | 305 | /* spec */ |
| 297 | width: 100%; | 306 | width: 100%; |
| 298 | height: 100%; | 307 | height: 100%; |
| 299 | - top: 0; } | 308 | + top: 0; |
| 309 | + padding-left: 0; } | ||
| 310 | + #console-wrapfullscreen .CodeMirror-gutter { | ||
| 311 | + display: none; } | ||
| 300 | 312 | ||
| 301 | .btn { | 313 | .btn { |
| 302 | padding: 3px 18px; } | 314 | padding: 3px 18px; } |
dist/css/main.css
| @@ -152,23 +152,35 @@ html, body { | @@ -152,23 +152,35 @@ html, body { | ||
| 152 | #console-wrap:-webkit-full-screen { | 152 | #console-wrap:-webkit-full-screen { |
| 153 | width: 100%; | 153 | width: 100%; |
| 154 | height: 100%; | 154 | height: 100%; |
| 155 | - top: 0; } | 155 | + top: 0; |
| 156 | + padding-left: 0; } | ||
| 157 | + #console-wrap:-webkit-full-screen .CodeMirror-gutter { | ||
| 158 | + display: none; } | ||
| 156 | 159 | ||
| 157 | #console-wrap:-moz-full-screen { | 160 | #console-wrap:-moz-full-screen { |
| 158 | width: 100%; | 161 | width: 100%; |
| 159 | height: 100%; | 162 | height: 100%; |
| 160 | - top: 0; } | 163 | + top: 0; |
| 164 | + padding-left: 0; } | ||
| 165 | + #console-wrap:-moz-full-screen .CodeMirror-gutter { | ||
| 166 | + display: none; } | ||
| 161 | 167 | ||
| 162 | #console-wrap:-ms-fullscreen { | 168 | #console-wrap:-ms-fullscreen { |
| 163 | width: 100%; | 169 | width: 100%; |
| 164 | height: 100%; | 170 | height: 100%; |
| 165 | - top: 0; } | 171 | + top: 0; |
| 172 | + padding-left: 0; } | ||
| 173 | + #console-wrap:-ms-fullscreen .CodeMirror-gutter { | ||
| 174 | + display: none; } | ||
| 166 | 175 | ||
| 167 | #console-wrapfullscreen { | 176 | #console-wrapfullscreen { |
| 168 | /* spec */ | 177 | /* spec */ |
| 169 | width: 100%; | 178 | width: 100%; |
| 170 | height: 100%; | 179 | height: 100%; |
| 171 | - top: 0; } | 180 | + top: 0; |
| 181 | + padding-left: 0; } | ||
| 182 | + #console-wrapfullscreen .CodeMirror-gutter { | ||
| 183 | + display: none; } | ||
| 172 | 184 | ||
| 173 | .btn { | 185 | .btn { |
| 174 | padding: 3px 18px; } | 186 | padding: 3px 18px; } |
dist/gxb-ide/Iterm.js
| @@ -235,8 +235,6 @@ | @@ -235,8 +235,6 @@ | ||
| 235 | element.msRequestFullscreen(); | 235 | element.msRequestFullscreen(); |
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | - $('.CodeMirror-gutter').css('display','none'); | ||
| 239 | - $('.console-wrap').css('paddingLeft','0'); | ||
| 240 | 238 | ||
| 241 | } | 239 | } |
| 242 | function exitFullscreen() { | 240 | function exitFullscreen() { |
| @@ -248,8 +246,7 @@ | @@ -248,8 +246,7 @@ | ||
| 248 | document.webkitExitFullscreen(); | 246 | document.webkitExitFullscreen(); |
| 249 | } | 247 | } |
| 250 | 248 | ||
| 251 | - $('.CodeMirror-gutter').css('display','block'); | ||
| 252 | - $('.console-wrap').css('paddingLeft','204px'); | 249 | + |
| 253 | } | 250 | } |
| 254 | 251 | ||
| 255 | window.Iterm = Iterm | 252 | window.Iterm = Iterm |
dist/js/c.js
| @@ -8,9 +8,11 @@ $(function(){ | @@ -8,9 +8,11 @@ $(function(){ | ||
| 8 | var flag = true; | 8 | var flag = true; |
| 9 | 9 | ||
| 10 | if(_languageid == 35){ | 10 | if(_languageid == 35){ |
| 11 | - $('.switch').show(); | ||
| 12 | - $('#quickTool').show(); | 11 | + $('.switch').show(); |
| 13 | $("#CompileBtn .ladda-label").html("自动运行") | 12 | $("#CompileBtn .ladda-label").html("自动运行") |
| 13 | + | ||
| 14 | + $('#quickTool').show(); | ||
| 15 | + | ||
| 14 | }else{ | 16 | }else{ |
| 15 | $("#CompileBtn .ladda-label").html("编译运行") | 17 | $("#CompileBtn .ladda-label").html("编译运行") |
| 16 | } | 18 | } |
| @@ -85,13 +87,13 @@ $(function(){ | @@ -85,13 +87,13 @@ $(function(){ | ||
| 85 | var selectVal = $target.text(); | 87 | var selectVal = $target.text(); |
| 86 | 88 | ||
| 87 | if (selectVal == '图片') { | 89 | if (selectVal == '图片') { |
| 88 | - Dir.treeLinkEditor[0].CodeMirrorRecord.replaceSelection('<img src="//www.igeekbar.com/igeekbar/laitu/300x200&text=hello world/222222/ffffff" alt="占位图片">', "end") | 90 | + Dir.treeLinkEditor[0].CodeMirrorRecord.replaceSelection('<img src="http://www.igeekbar.com/igeekbar/laitu/300x200&text=hello world/222222/ffffff" alt="占位图片">', "end") |
| 89 | }else if (selectVal == 'bootstrap.css') { | 91 | }else if (selectVal == 'bootstrap.css') { |
| 90 | - Dir.treeLinkEditor[0].CodeMirrorRecord.replaceSelection('<link href="//cdn.gbtags.com/bootswatch/3.2.0+1/custom/bootstrap.min.css" rel="stylesheet">', "end") | 92 | + Dir.treeLinkEditor[0].CodeMirrorRecord.replaceSelection('<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">', "end") |
| 91 | }else if(selectVal == 'bootstrap.js'){ | 93 | }else if(selectVal == 'bootstrap.js'){ |
| 92 | - Dir.treeLinkEditor[0].CodeMirrorRecord.replaceSelection('<script src="//cdn.gbtags.com/twitter-bootstrap/3.2.0/js/bootstrap.min.js"></script>', "end") | 94 | + Dir.treeLinkEditor[0].CodeMirrorRecord.replaceSelection('<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>', "end") |
| 93 | }else if (selectVal == 'jQuery') { | 95 | }else if (selectVal == 'jQuery') { |
| 94 | - Dir.treeLinkEditor[0].CodeMirrorRecord.replaceSelection('<script src="//cdn.gbtags.com/jquery/2.1.1/jquery.min.js"></script>', "end") | 96 | + Dir.treeLinkEditor[0].CodeMirrorRecord.replaceSelection('<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>', "end") |
| 95 | } | 97 | } |
| 96 | 98 | ||
| 97 | }) | 99 | }) |
dist/scss/main.scss
| @@ -204,23 +204,45 @@ html, body{ | @@ -204,23 +204,45 @@ html, body{ | ||
| 204 | width: 100%; | 204 | width: 100%; |
| 205 | height: 100%; | 205 | height: 100%; |
| 206 | top: 0; | 206 | top: 0; |
| 207 | + padding-left:0; | ||
| 208 | + | ||
| 209 | + .CodeMirror-gutter{ | ||
| 210 | + display: none; | ||
| 211 | + } | ||
| 212 | + | ||
| 207 | } | 213 | } |
| 214 | + | ||
| 208 | #console-wrap:-moz-full-screen { | 215 | #console-wrap:-moz-full-screen { |
| 209 | width: 100%; | 216 | width: 100%; |
| 210 | height: 100%; | 217 | height: 100%; |
| 211 | top: 0; | 218 | top: 0; |
| 219 | + padding-left:0; | ||
| 220 | + | ||
| 221 | + .CodeMirror-gutter{ | ||
| 222 | + display: none; | ||
| 223 | + } | ||
| 212 | } | 224 | } |
| 213 | 225 | ||
| 214 | #console-wrap:-ms-fullscreen { | 226 | #console-wrap:-ms-fullscreen { |
| 215 | width: 100%; | 227 | width: 100%; |
| 216 | height: 100%; | 228 | height: 100%; |
| 217 | top: 0; | 229 | top: 0; |
| 230 | + padding-left:0; | ||
| 231 | + | ||
| 232 | + .CodeMirror-gutter{ | ||
| 233 | + display: none; | ||
| 234 | + } | ||
| 218 | } | 235 | } |
| 219 | 236 | ||
| 220 | #console-wrapfullscreen { /* spec */ | 237 | #console-wrapfullscreen { /* spec */ |
| 221 | width: 100%; | 238 | width: 100%; |
| 222 | height: 100%; | 239 | height: 100%; |
| 223 | top: 0; | 240 | top: 0; |
| 241 | + padding-left:0; | ||
| 242 | + | ||
| 243 | + .CodeMirror-gutter{ | ||
| 244 | + display: none; | ||
| 245 | + } | ||
| 224 | } | 246 | } |
| 225 | 247 | ||
| 226 | .btn{ | 248 | .btn{ |