Skip to content

Commit cbc6a19

Browse files
author
Hassan Radwan
committed
Making the sidebar "toolbar" buttons look and feel the same
1 parent 96c45ca commit cbc6a19

File tree

7 files changed

+47
-57
lines changed

7 files changed

+47
-57
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,4 +389,28 @@ a.to-login:hover { border-bottom-style: solid; }
389389

390390
.button-bar .item.button:hover {
391391
background-color: #CCC;
392+
}
393+
394+
/************************\
395+
| Controls menu toolbars |
396+
\************************/
397+
.controls-menu {
398+
box-sizing: border-box;
399+
background: #C7C7C7;
400+
padding-left: 20px;
401+
}
402+
403+
.controls-menu .menu-button {
404+
font-size: 14px;
405+
color: steelblue;
406+
background: #C7C7C7;
407+
vertical-align: top;
408+
cursor: pointer;
409+
padding: 0 4px;
410+
margin: 0 auto;
411+
text-align: center;
412+
}
413+
414+
.controls-menu .menu-button:hover {
415+
background: #BEBEBE;
392416
}

‎codepulse/src/main/resources/toserve/pages/projects/PackageWidget.css‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,30 +81,6 @@
8181
padding-left: 0;
8282
}
8383

84-
/*****************************\
85-
| Clear All Selections Button |
86-
\*****************************/
87-
88-
#clear-selections-button {
89-
margin-bottom: 3px;
90-
width: 200px;
91-
color: white;
92-
font-size: small;
93-
padding: 0px 4px;
94-
box-sizing: border-box;
95-
cursor: pointer;
96-
97-
background-color: #66B6B6;
98-
}
99-
100-
#clear-selections-button:hover {
101-
background-color: #2C9494;
102-
}
103-
104-
#clear-selections-button.hidden {
105-
visibility: hidden;
106-
}
107-
10884
/*****************************\
10985
| Package Widget Label Styles |
11086
\*****************************/

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,19 @@ body > .overlay:before {
8989
.projectSwitcher .slideDownSidebar { z-index: 4; }
9090
.projectSwitcher .slideOutForm { z-index: 3; }
9191

92+
#packages { margin-bottom: 26px; }
93+
94+
/* Position the controls toolbar at the bottom left of the area */
95+
#packages-controls-menu {
96+
position: fixed;
97+
bottom: 25px;
98+
z-index: 1;
99+
}
100+
101+
#packages-controls-menu.hidden {
102+
visibility: hidden;
103+
}
104+
92105
/***********************************************\
93106
| Subheader Styles (breadcrumbs + options menu) |
94107
\***********************************************/

‎codepulse/src/main/resources/toserve/pages/projects/projects.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ $(document).ready(function(){
238238
Trace.onTreeDataReady(function(){
239239
var packageTree = Trace.packageTree
240240

241-
var controller = new PackageController(packageTree, depCheckController, packagesContainer, $('#totals'), $('#clear-selections-button'))
241+
var controller = new PackageController(packageTree, depCheckController, packagesContainer, $('#totals'), $('#packages-controls-menu'))
242242

243243
// When the selection of "instrumented" packages changes, trigger a coloring update
244244
// on the treemap, since nodes get special treatment if they are uninstrumented.

‎codepulse/src/main/resources/toserve/pages/projects/trace-recording-controls.css‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,6 @@
2323
#recording-controls .controls-menu {
2424
position: absolute;
2525
bottom: 0;
26-
height: 24px;
27-
width: 100%;
28-
padding: 2px;
29-
box-sizing: border-box;
30-
}
31-
32-
/***********************\
33-
| Controls menu buttons |
34-
\***********************/
35-
36-
.controls-menu .menu-button {
37-
font-size: 14px;
38-
color: steelblue;
39-
background: #C7C7C7;
40-
vertical-align: top;
41-
cursor: pointer;
42-
43-
width: 100px;
44-
margin: 0 auto;
45-
text-align: center;
46-
}
47-
48-
.controls-menu .menu-button:hover {
49-
background: #BEBEBE;
5026
}
5127

5228
/*************************\

‎codepulse/src/main/webapp/projects.html‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,17 @@ <h1 class="editable">
100100
</div>
101101
</div>
102102

103-
<div class="main-column" id="packages">
104-
<div class="package-totals" id="totals">
105-
<!-- auto-generated content for the root package -->
103+
<div class="main-column">
104+
<div id="packages">
105+
<!-- auto-generated content for package widgets/barchart stuff -->
106106
</div>
107+
</div>
107108

108-
<div id="clear-selections-button" class="hidden">
109-
Clear all selections
109+
<div id="packages-controls-menu" class="controls-menu hidden">
110+
<div id="clear-selections-button" class="menu-button" id="recording-color-resetter">
111+
<i class="fa fa-square-o"></i>
112+
Clear selections
110113
</div>
111-
112-
<!-- auto-generated content for package widgets/barchart stuff -->
113114
</div>
114115

115116
<div class="middle-column-alt fixed-sidebar" id="treemap">

‎codepulse/src/main/webapp/templates-hidden/trace-recording-controls.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ <h1>
117117
<div class="controls-menu">
118118
<div class="menu-button" id="recording-color-resetter">
119119
<i class="fa fa-tint"></i>
120-
reset colors
120+
Reset colors
121121
</div>
122122
</div>
123123

0 commit comments

Comments
 (0)