Skip to content

Commit b642542

Browse files
dylemmadylemma
committed
Merge branch 'master' into feature/server-side-data
Conflicts: codepulse/src/main/scala/com/secdec/codepulse/tracer/TraceUploadData.scala
2 parents 0fcf91e + 5ad2914 commit b642542

File tree

24 files changed

+1075
-394
lines changed

24 files changed

+1075
-394
lines changed

‎codepulse/src/main/resources/toserve/common/common.css‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,4 +393,35 @@ a.to-login:hover { border-bottom-style: solid; }
393393
}
394394

395395
/* unsupported browser alert */
396-
.unsupported-browser { margin-bottom: 0; }
396+
.unsupported-browser { margin-bottom: 0; }
397+
398+
/************\
399+
| Button Bar |
400+
\************/
401+
402+
.button-bar {
403+
font-size: 0;
404+
display: inline;
405+
}
406+
407+
.button-bar .item {
408+
font-size: small;
409+
display: inline-block;
410+
411+
padding: 4px 12px;
412+
color: #000;
413+
border: 1px solid #AAA;
414+
}
415+
416+
.button-bar .item:not(:first-child){
417+
border-left: none;
418+
}
419+
420+
.button-bar .item.button {
421+
cursor: pointer;
422+
background-color: #AAA;
423+
}
424+
425+
.button-bar .item.button:hover {
426+
background-color: #CCC;
427+
}

codepulse/src/main/resources/toserve/pages/traces/common.js renamed to codepulse/src/main/resources/toserve/common/common.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,19 @@
2424
Bacon.Observable.prototype.noLazy = function(){
2525
this.onValue(function(){})
2626
return this
27+
}
28+
29+
Bacon.Model = function(initial){
30+
var value = initial
31+
var changes = new Bacon.Bus()
32+
var prop = changes.toProperty(value).noLazy()
33+
34+
this.get = function(){ return value }
35+
this.set = function(v){
36+
value = v
37+
changes.push(value)
38+
}
39+
40+
this.__defineGetter__('changes', function(){ return changes })
41+
this.__defineGetter__('property', function(){ return prop })
2742
}

‎codepulse/src/main/resources/toserve/common/desktop.css‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@
3232
padding-bottom: 25px;
3333
}
3434

35+
.header-push {
36+
height: 60px;
37+
min-height: 60px;
38+
}
39+
40+
.footer-push {
41+
height: 25px;
42+
min-height: 25px;
43+
}
44+
3545
#footer .half {
3646
padding: 2px 5px;
3747
width: 50%;

‎codepulse/src/main/resources/toserve/pages/TraceInputForm/TraceInputForm.css‎

Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
/*******************\
2+
| High Level Layout |
3+
\*******************/
4+
5+
trace-input-form .form-field {
6+
margin-bottom: 1em;
7+
}
8+
9+
#trace-input-form .input-area {
10+
width: 61.8%;
11+
float: left;
12+
}
13+
14+
#trace-input-form .feedback-area {
15+
width: 38.2%;
16+
float: left;
17+
padding-left: 1em;
18+
box-sizing: border-box;
19+
}
20+
21+
.align-right {
22+
text-align: right;
23+
}
24+
25+
26+
#trace-input-form .input-label {
27+
font-size: large;
28+
font-weight: bold;
29+
margin-bottom: 3px;
30+
}
31+
32+
#trace-input-form input[type=text] {
33+
margin-bottom: 0;
34+
}
35+
36+
#trace-input-form .input-help {
37+
padding-left: 22px;
38+
position: relative;
39+
margin-top: 5px;
40+
color: gray;
41+
font-size: 90%;
42+
}
43+
44+
#trace-input-form .input-help i:first-child {
45+
position: absolute;
46+
left: 0;
47+
}
48+
49+
#new-analysis-form:not(.active),
50+
#new-import-form:not(.active) {
51+
display: none;
52+
}
53+
54+
/***********\
55+
| Form Tabs |
56+
\***********/
57+
58+
#trace-input-form ul.form-tabs-list {
59+
list-style: none;
60+
margin: 0 0 20px 0;
61+
border-bottom: 2px solid steelblue;
62+
}
63+
64+
#trace-input-form .form-tab {
65+
display: inline-block;
66+
box-sizing: border-box;
67+
padding: 5px 10px;
68+
background-color: lightgray;
69+
cursor: pointer;
70+
position: relative;
71+
}
72+
73+
#trace-input-form .form-tab a {
74+
/* overriding bootstrap styles*/
75+
text-decoration: none;
76+
color: #323232;
77+
}
78+
79+
#trace-input-form .form-tab.active {
80+
background-color: steelblue;
81+
}
82+
83+
#trace-input-form .form-tab.active a {
84+
color: white;
85+
}
86+
87+
/***************\
88+
| Feedback Area |
89+
\***************/
90+
91+
#trace-input-form .feedback-area .feedback {
92+
color: steelblue;
93+
}
94+
#trace-input-form .feedback-area .feedback:before {
95+
font-family: FontAwesome;
96+
margin-right: 3px;
97+
content: "\f075"; /* fa-comment */
98+
}
99+
100+
#trace-input-form .feedback-area .feedback.error {
101+
color: crimson;
102+
}
103+
#trace-input-form .feedback-area .feedback.error:before {
104+
content: "\f06a"; /* fa-exclamation-circle */
105+
}
106+
107+
#trace-input-form .feedback-area .feedback.warning {
108+
color: goldenrod;
109+
}
110+
#trace-input-form .feedback-area .feedback.warning:before {
111+
content: "\f071"; /* fa-exclamation-triangle */
112+
}
113+
114+
/*********************\
115+
| File Input Elements |
116+
\*********************/
117+
118+
.file-input-button {
119+
position: relative;
120+
overflow: hidden;
121+
background-color: lightgray;
122+
font-size: 14px;
123+
text-align: center;
124+
}
125+
126+
.file-input-button input[type=file] {
127+
position: absolute;
128+
opacity: 0;
129+
right: 0;
130+
top: 0;
131+
font-size: 200px;
132+
direction: ltr;
133+
cursor: pointer;
134+
height: 100%;
135+
}
136+
137+
.file-input-area .file-input-button {
138+
float: left;
139+
width: 100px;
140+
box-sizing: border-box;
141+
height: 72px;
142+
}
143+
144+
.file-input-area .file-input-button .prompt {
145+
margin-top: 12px;
146+
}
147+
148+
.file-input-area .file-or-msg {
149+
width: 50px;
150+
text-align: center;
151+
font-weight: bold;
152+
float: left;
153+
line-height: 72px;
154+
}
155+
156+
.file-input-area .file-dropzone {
157+
float: left;
158+
width: calc(100% - 150px);
159+
color: gray;
160+
box-sizing: border-box;
161+
padding: .5em;
162+
text-align: center;
163+
height: 72px;
164+
}
165+
166+
.file-input-area .file-dropzone.in {
167+
background-color: lightgray;
168+
}
169+
170+
.file-input-area .file-dropzone.hover {
171+
background-color: lightgreen;
172+
}
173+
174+
.file-input-area .file-dropzone .dropzone-msg {
175+
border: 2px dashed;
176+
padding: 1em;
177+
border-radius: .5em;
178+
}
179+
180+
.file-input-area .file-dropzone .dropzone-msg:before {
181+
content: 'Drag a file here';
182+
}
183+
.file-input-area .file-dropzone.in .dropzone-msg:before {
184+
content: 'Drop it here!';
185+
}
186+
187+
/*********************\
188+
| File Input Feedback |
189+
\*********************/
190+
191+
#trace-input-form .file-input-result {
192+
margin-top: 5px;
193+
font-size: small;
194+
color: gray;
195+
}
196+
197+
#trace-input-form .file-input-result .file-input-name {
198+
font-weight: bold;
199+
}
200+
201+
.filetype {
202+
font-family: monospace;
203+
}

0 commit comments

Comments
 (0)