Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
267e56ae
Commit
267e56ae
authored
Apr 28, 2017
by
ninabreznik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resizing, styling fixes...
parent
a43309db
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
44 additions
and
28 deletions
+44
-28
browser-solidity.css
assets/css/browser-solidity.css
+12
-7
universal-dapp.css
assets/css/universal-dapp.css
+4
-1
index.html
index.html
+1
-1
app.js
src/app.js
+3
-2
analysis-tab.js
src/app/analysis-tab.js
+1
-0
contract-tab.js
src/app/contract-tab.js
+1
-0
editor.js
src/app/editor.js
+1
-2
file-panel.js
src/app/file-panel.js
+2
-2
settings-tab.js
src/app/settings-tab.js
+1
-1
gasCosts.js
src/app/staticanalysis/modules/gasCosts.js
+2
-2
thisLocal.js
src/app/staticanalysis/modules/thisLocal.js
+2
-2
txOrigin.js
src/app/staticanalysis/modules/txOrigin.js
+1
-1
staticAnalysisView.js
src/app/staticanalysis/staticAnalysisView.js
+9
-4
style-guide.js
src/app/style-guide.js
+3
-2
universal-dapp.js
src/universal-dapp.js
+1
-1
No files found.
assets/css/browser-solidity.css
View file @
267e56ae
...
@@ -161,6 +161,8 @@ body {
...
@@ -161,6 +161,8 @@ body {
list-style
:
none
;
list-style
:
none
;
margin
:
0
;
margin
:
0
;
padding
:
0
;
padding
:
0
;
display
:
flex
;
justify-content
:
space-between
;
}
}
#header
#options
li
.active
{
#header
#options
li
.active
{
...
@@ -254,12 +256,12 @@ body {
...
@@ -254,12 +256,12 @@ body {
#publishView
button
{
#publishView
button
{
background-color
:
#C6CFF7
;
background-color
:
#C6CFF7
;
font-size
:
12px
;
font-size
:
12px
;
padding
:
0.25em
;
margin-bottom
:
.5em
;
margin-bottom
:
.5em
;
color
:
black
;
color
:
black
;
border
:
0
none
;
border
:
0
none
;
border-radius
:
3px
;
border-radius
:
3px
;
width
:
8em
;
width
:
8em
;
height
:
20px
;
margin-right
:
1em
;
margin-right
:
1em
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
...
@@ -384,9 +386,10 @@ body {
...
@@ -384,9 +386,10 @@ body {
word-wrap
:
break-word
;
word-wrap
:
break-word
;
cursor
:
pointer
;
cursor
:
pointer
;
position
:
relative
;
position
:
relative
;
margin
:
0.5em
0
;
margin
:
0.5em
0
1em
0
;
border-radius
:
0.6em
;
border-radius
:
5px
;
padding
:
1em
1.5em
;
line-height
:
20px
;
padding
:
8px
15px
;
}
}
.sol.error
pre
,
.sol.error
pre
,
...
@@ -410,11 +413,13 @@ body {
...
@@ -410,11 +413,13 @@ body {
}
}
.sol.error
{
.sol.error
{
background-color
:
rgba
(
255
,
0
,
0
,
0.4
);
background-color
:
hsla
(
0
,
100%
,
75%
,
0.1
);
border
:
.2em
dotted
#FF8080
;
}
}
.sol.warning
{
.sol.warning
{
background-color
:
rgba
(
210
,
202
,
36
,
0.4
);
background-color
:
hsla
(
59
,
56%
,
78%
,
0.5
);
border
:
.2em
dotted
#ffbd01
;
}
}
#ghostbar
{
#ghostbar
{
...
@@ -437,7 +442,7 @@ body {
...
@@ -437,7 +442,7 @@ body {
bottom
:
0
;
bottom
:
0
;
cursor
:
col-resize
;
cursor
:
col-resize
;
z-index
:
999
;
z-index
:
999
;
border-right
:
2px
solid
#C6CFF7
;
border-right
:
2px
solid
hsla
(
215
,
81%
,
79%
,
.3
)
;
}
}
#editor
.ace-tm
.ace_gutter
,
#editor
.ace-tm
.ace_gutter
,
...
...
assets/css/universal-dapp.css
View file @
267e56ae
...
@@ -310,7 +310,8 @@
...
@@ -310,7 +310,8 @@
border-radius
:
5px
;
border-radius
:
5px
;
margin-bottom
:
1em
;
margin-bottom
:
1em
;
display
:
flex
;
display
:
flex
;
justify-content
:
space-around
;
justify-content
:
initial
;
flex-wrap
:
wrap
;
}
}
.udapp
.legend
div
{
.udapp
.legend
div
{
...
@@ -319,6 +320,7 @@
...
@@ -319,6 +320,7 @@
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
line-height
:
0px
;
line-height
:
0px
;
padding
:
5px
;
}
}
.udapp
.legend
div
:before
{
.udapp
.legend
div
:before
{
...
@@ -329,6 +331,7 @@
...
@@ -329,6 +331,7 @@
height
:
1em
;
height
:
1em
;
margin-right
:
0.5em
;
margin-right
:
0.5em
;
width
:
1em
;
width
:
1em
;
border-radius
:
50%
;
}
}
.udapp
.legend
.publish
:before
{
.udapp
.legend
.publish
:before
{
...
...
index.html
View file @
267e56ae
...
@@ -55,6 +55,7 @@
...
@@ -55,6 +55,7 @@
<div
id=
"righthand-panel"
>
<div
id=
"righthand-panel"
>
<div
id=
"header"
>
<div
id=
"header"
>
<div
id=
"menu"
>
<div
id=
"menu"
>
<img
id=
"solIcon"
title=
"Solidity realtime compiler and runtime"
src=
"assets/img/remix_logo_512x512.svg"
alt=
"Solidity realtime compiler and runtime"
>
<ul
id=
"options"
>
<ul
id=
"options"
>
<li
class=
"settingsView active"
title=
"Settings"
>
Settings
</li>
<li
class=
"settingsView active"
title=
"Settings"
>
Settings
</li>
<li
class=
"publishView"
title=
"Publish"
>
Files
</li>
<li
class=
"publishView"
title=
"Publish"
>
Files
</li>
...
@@ -63,7 +64,6 @@
...
@@ -63,7 +64,6 @@
<li
class=
"staticanalysisView"
title=
"Static Analysis"
>
Analysis
</li>
<li
class=
"staticanalysisView"
title=
"Static Analysis"
>
Analysis
</li>
<li
id=
"helpButton"
><a
href=
"https://solidity.readthedocs.org"
target=
"_blank"
title=
"Open Documentation"
>
Docs
</a></li>
<li
id=
"helpButton"
><a
href=
"https://solidity.readthedocs.org"
target=
"_blank"
title=
"Open Documentation"
>
Docs
</a></li>
</ul>
</ul>
<img
id=
"solIcon"
title=
"Solidity realtime compiler and runtime"
src=
"assets/img/remix_logo_512x512.svg"
alt=
"Solidity realtime compiler and runtime"
>
</div>
</div>
<div
id=
"optionViews"
class=
"settingsView"
>
<div
id=
"optionViews"
class=
"settingsView"
>
<!-- contract-tab.js, settings-tab.js, debugger-tab.js, analysis-tab.js, files-tab.js -->
<!-- contract-tab.js, settings-tab.js, debugger-tab.js, analysis-tab.js, files-tab.js -->
...
...
src/app.js
View file @
267e56ae
...
@@ -802,7 +802,8 @@ var run = function () {
...
@@ -802,7 +802,8 @@ var run = function () {
}
}
}
}
var
staticanalysis
=
new
StaticAnalysis
(
staticAnalysisAPI
,
compiler
.
event
)
var
staticanalysis
=
new
StaticAnalysis
(
staticAnalysisAPI
,
compiler
.
event
)
$
(
'#staticanalysisView'
).
append
(
staticanalysis
.
render
())
var
node
=
document
.
getElementById
(
'staticanalysisView'
)
node
.
insertBefore
(
staticanalysis
.
render
(),
node
.
childNodes
[
0
])
// ----------------- autoCompile -----------------
// ----------------- autoCompile -----------------
var
autoCompile
=
document
.
querySelector
(
'#autoCompile'
).
checked
var
autoCompile
=
document
.
querySelector
(
'#autoCompile'
).
checked
...
@@ -973,7 +974,7 @@ var run = function () {
...
@@ -973,7 +974,7 @@ var run = function () {
loadVersion
(
$
(
'#versionSelector'
).
val
())
loadVersion
(
$
(
'#versionSelector'
).
val
())
})
})
var
header
=
new
Option
(
'
Click to s
elect new compiler version'
)
var
header
=
new
Option
(
'
S
elect new compiler version'
)
header
.
disabled
=
true
header
.
disabled
=
true
header
.
selected
=
true
header
.
selected
=
true
$
(
'#versionSelector'
).
append
(
header
)
$
(
'#versionSelector'
).
append
(
header
)
...
...
src/app/analysis-tab.js
View file @
267e56ae
...
@@ -8,6 +8,7 @@ var styles = styleGuide()
...
@@ -8,6 +8,7 @@ var styles = styleGuide()
var
css
=
csjs
`
var
css
=
csjs
`
.analysisTabView {
.analysisTabView {
padding: 2%;
padding: 2%;
margin-top: 1em;
}
}
.infoBox extends
${
styles
.
infoTextBox
}
{
.infoBox extends
${
styles
.
infoTextBox
}
{
margin-bottom: 1em;
margin-bottom: 1em;
...
...
src/app/contract-tab.js
View file @
267e56ae
...
@@ -32,6 +32,7 @@ var css = csjs`
...
@@ -32,6 +32,7 @@ var css = csjs`
.select extends
${
styles
.
dropdown
}
{
.select extends
${
styles
.
dropdown
}
{
width: 70%;
width: 70%;
float: left;
float: left;
text-align: center;
}
}
.contract {
.contract {
display: block;
display: block;
...
...
src/app/editor.js
View file @
267e56ae
...
@@ -19,8 +19,7 @@ var css = csjs`
...
@@ -19,8 +19,7 @@ var css = csjs`
}
}
.ace-editor {
.ace-editor {
top : 4px;
top : 4px;
border-top : 3px solid transparent;
font-size : 2vmin;
font-size : 15px;
width : 100%;
width : 100%;
}
}
`
`
...
...
src/app/file-panel.js
View file @
267e56ae
...
@@ -55,10 +55,10 @@ var css = csjs`
...
@@ -55,10 +55,10 @@ var css = csjs`
}
}
.dragbar {
.dragbar {
position : relative;
position : relative;
top :
6
px;
top :
4
px;
cursor : col-resize;
cursor : col-resize;
z-index : 999;
z-index : 999;
border-right : 2px solid
#C6CFF7
;
border-right : 2px solid
hsla(215, 81%, 79%, .3)
;
}
}
.ghostbar {
.ghostbar {
width : 3px;
width : 3px;
...
...
src/app/settings-tab.js
View file @
267e56ae
...
@@ -18,8 +18,8 @@ var css = csjs`
...
@@ -18,8 +18,8 @@ var css = csjs`
display: flex;
display: flex;
}
}
.select extends
${
styles
.
dropdown
}
{
.select extends
${
styles
.
dropdown
}
{
width: 50%;
float: left;
float: left;
max-width: 90%;
}
}
.button extends
${
styles
.
button
}
{
.button extends
${
styles
.
button
}
{
background-color: #C6CFF7;
background-color: #C6CFF7;
...
...
src/app/staticanalysis/modules/gasCosts.js
View file @
267e56ae
var
name
=
'gas costs'
var
name
=
'gas costs
:
'
var
desc
=
'
W
arn if the gas requiremets of functions are too high.'
var
desc
=
'
w
arn if the gas requiremets of functions are too high.'
var
categories
=
require
(
'./categories'
)
var
categories
=
require
(
'./categories'
)
function
gasCosts
()
{
function
gasCosts
()
{
...
...
src/app/staticanalysis/modules/thisLocal.js
View file @
267e56ae
var
name
=
'this on local'
var
name
=
'this on local
:
'
var
desc
=
'
I
nvocation of local functions via this'
var
desc
=
'
i
nvocation of local functions via this'
var
categories
=
require
(
'./categories'
)
var
categories
=
require
(
'./categories'
)
var
common
=
require
(
'./staticAnalysisCommon'
)
var
common
=
require
(
'./staticAnalysisCommon'
)
...
...
src/app/staticanalysis/modules/txOrigin.js
View file @
267e56ae
var
name
=
'tx origin'
var
name
=
'tx origin
:
'
var
desc
=
'warn if tx.origin is used'
var
desc
=
'warn if tx.origin is used'
var
categories
=
require
(
'./categories'
)
var
categories
=
require
(
'./categories'
)
...
...
src/app/staticanalysis/staticAnalysisView.js
View file @
267e56ae
...
@@ -9,6 +9,9 @@ var css = csjs`
...
@@ -9,6 +9,9 @@ var css = csjs`
.analysis {
.analysis {
font-height: 1.5em;
font-height: 1.5em;
}
}
.result {
margin-top: 1em;
}
`
`
function
staticAnalysisView
(
appAPI
,
compilerEvent
)
{
function
staticAnalysisView
(
appAPI
,
compilerEvent
)
{
...
@@ -32,8 +35,9 @@ function staticAnalysisView (appAPI, compilerEvent) {
...
@@ -32,8 +35,9 @@ function staticAnalysisView (appAPI, compilerEvent) {
staticAnalysisView
.
prototype
.
render
=
function
()
{
staticAnalysisView
.
prototype
.
render
=
function
()
{
var
self
=
this
var
self
=
this
var
view
=
yo
`<div class="
${
css
.
analysis
}
">
var
view
=
yo
`
<strong>Static Analysis</strong>
<div class="
${
css
.
analysis
}
">
<strong class="
${
css
.
title
}
">Static Analysis</strong><br>
<label for="autorunstaticanalysis"><input id="autorunstaticanalysis" type="checkbox" style="vertical-align:bottom" checked="true">Auto run</label>
<label for="autorunstaticanalysis"><input id="autorunstaticanalysis" type="checkbox" style="vertical-align:bottom" checked="true">Auto run</label>
<div id="staticanalysismodules">
<div id="staticanalysismodules">
${
this
.
modulesView
}
${
this
.
modulesView
}
...
@@ -41,8 +45,9 @@ staticAnalysisView.prototype.render = function () {
...
@@ -41,8 +45,9 @@ staticAnalysisView.prototype.render = function () {
<div>
<div>
<button onclick=
${
function
()
{
self
.
run
()
}
} >Run</button>
<button onclick=
${
function
()
{
self
.
run
()
}
} >Run</button>
</div>
</div>
<div id='staticanalysisresult'></div>
<div class="
${
css
.
result
}
" "id='staticanalysisresult'></div>
</div>`
</div>
`
if
(
!
this
.
view
)
{
if
(
!
this
.
view
)
{
this
.
view
=
view
this
.
view
=
view
}
}
...
...
src/app/style-guide.js
View file @
267e56ae
...
@@ -7,7 +7,7 @@ function styleGuide () {
...
@@ -7,7 +7,7 @@ function styleGuide () {
COLORS
COLORS
-------------------------------------------------------------------------- */
-------------------------------------------------------------------------- */
var
colors
=
{
var
colors
=
{
blue
:
'#9DC1F5'
,
blue
:
'#9DC1F5'
,
// hsla(215, 81%, 79%, 1)
lightBlue
:
'#F4F6FF'
,
lightBlue
:
'#F4F6FF'
,
greyBlue
:
'#102026'
,
greyBlue
:
'#102026'
,
grey
:
'#666'
,
grey
:
'#666'
,
...
@@ -17,7 +17,7 @@ function styleGuide () {
...
@@ -17,7 +17,7 @@ function styleGuide () {
green
:
'#B1EAC5'
,
green
:
'#B1EAC5'
,
violet
:
'#C6CFF7'
,
violet
:
'#C6CFF7'
,
pink
:
'#EC96EC'
,
pink
:
'#EC96EC'
,
yellow
:
'#
E6E5A7
'
yellow
:
'#
ffbd01
'
}
}
/* --------------------------------------------------------------------------
/* --------------------------------------------------------------------------
...
@@ -113,6 +113,7 @@ function styleGuide () {
...
@@ -113,6 +113,7 @@ function styleGuide () {
cursor : pointer;
cursor : pointer;
font-size : 12px;
font-size : 12px;
border : none;
border : none;
height : 20px;
}
}
`
`
...
...
src/universal-dapp.js
View file @
267e56ae
...
@@ -165,7 +165,7 @@ UniversalDApp.prototype.render = function () {
...
@@ -165,7 +165,7 @@ UniversalDApp.prototype.render = function () {
.
append
(
$
(
'<div class="publish"/>'
).
text
(
'Publish'
))
.
append
(
$
(
'<div class="publish"/>'
).
text
(
'Publish'
))
.
append
(
$
(
'<div class="attach"/>'
).
text
(
'Attach'
))
.
append
(
$
(
'<div class="attach"/>'
).
text
(
'Attach'
))
.
append
(
$
(
'<div class="transact"/>'
).
text
(
'Transact'
))
.
append
(
$
(
'<div class="transact"/>'
).
text
(
'Transact'
))
.
append
(
$
(
'<div class="payable"/>'
).
text
(
'T
ransact (Payable)
'
))
.
append
(
$
(
'<div class="payable"/>'
).
text
(
'T
/Payable
'
))
.
append
(
$
(
'<div class="call"/>'
).
text
(
'Call'
))
.
append
(
$
(
'<div class="call"/>'
).
text
(
'Call'
))
self
.
$el
.
append
(
$legend
)
self
.
$el
.
append
(
$legend
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment