Skip to content

Commit

Permalink
restyle overview section headers and lists
Browse files Browse the repository at this point in the history
  • Loading branch information
@gashcrumb
gashcrumb committed Aug 5, 2013
1 parent 926496e commit 24cd757
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 66 deletions.
14 changes: 7 additions & 7 deletions hawtio-web/src/main/webapp/app/fabric/html/fabricView.html
View file
Expand Up @@ -49,13 +49,13 @@
</div>

<div class="box-right">
<i class="icon1point5x icon-plus clickable" ng-show="container.root && container.alive" title="Create a new child container" ng-click="createChildContainer(container)"></i>
<i class="icon-plus clickable" ng-show="container.root && container.alive" title="Create a new child container" ng-click="createChildContainer(container)"></i>

<i class="icon1point5x clickable" title="{{getStatusTitle(container)}}" ng-class='statusIcon(container)' ng-click="showContainer(container)"></i>
<i class="clickable" title="{{getStatusTitle(container)}}" ng-class='statusIcon(container)' ng-click="showContainer(container)"></i>

<i class="icon1point5x icon-signin clickable" ng-show="container.jolokiaUrl && container.alive" title="Open a new window and connect to this container" ng-click="doConnect(container)"></i>
<i class="icon-signin clickable" ng-show="container.jolokiaUrl && container.alive" title="Open a new window and connect to this container" ng-click="doConnect(container)"></i>

<i class="icon1point5x clickable icon-info-sign" title="Show Details" ng-click="showContainer(container)"></i>
<i class="clickable icon-info-sign" title="Show Details" ng-click="showContainer(container)"></i>
</div>

</div>
Expand Down Expand Up @@ -143,7 +143,7 @@
</div>

<div class="box-right">
<i class="icon1point5x clickable icon-info-sign" title="Show Details" ng-click="showProfile(profile)"></i>
<i class="clickable icon-info-sign" title="Show Details" ng-click="showProfile(profile)"></i>
</div>

</div>
Expand Down Expand Up @@ -187,7 +187,7 @@
</div>

<div class="box-right">
<i class="icon1point5x clickable icon-info-sign" title="Show Details" ng-click="showProfile(profile)"></i>
<i class="clickable icon-info-sign" title="Show Details" ng-click="showProfile(profile)"></i>
</div>

</div>
Expand Down Expand Up @@ -239,7 +239,7 @@
</div>

<div modal="createProfileDialog">
<form name="createProfile" class="form-horizontal no-bottom-margin" ng-submit="doCreateProfile(newProfileName)">
<form name="createProfile" class="form-horizontal no-bottom-margin" ng-submit="doCreateProfile()">
<div class="modal-header"><h4>Create new Profile in Version {{version.id}}...</h4></div>
<div class="modal-body">
<label>Profile Name: </label>
Expand Down
88 changes: 29 additions & 59 deletions hawtio-web/src/main/webapp/css/site-base.less
View file
Expand Up @@ -1389,6 +1389,22 @@ li.stacktrace {
}

.box {

background: none repeat scroll 0 0 white;
border-bottom: 1px solid #D4D4D4;
cursor: pointer;
height: 20px;
line-height: 2em;
margin-bottom: 5px;
margin-top: 5px;
overflow: hidden;
padding: 10px;
position: relative;
text-overflow: ellipsis;
transition: all 0.2s ease 0s;
white-space: nowrap;

/*
border: 1px solid @control-border;
border-radius: 1em;
padding: 10px;
Expand All @@ -1408,11 +1424,12 @@ li.stacktrace {
cursor: pointer;
background: white;
height: 28px;
height: 20px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
*/

}

Expand Down Expand Up @@ -1444,8 +1461,10 @@ li.stacktrace {
color: hsl(210, 100%, 40%);
text-shadow: hsla(210,100%,20%,.3) 0 -1px 0, hsl(210,100%,85%) 0 2px 1px, hsla(200,100%,80%,1) 0 0 5px, hsla(210,100%,50%,.6) 0 0 20px;

/*
box-shadow: inset 2px 2px 10px rgba(0, 0, 0, 0.1),
inset 1px 1px 5px rgba(0, 0, 0, 0.4);
*/
}

.box.selected .box-right i {
Expand Down Expand Up @@ -1517,8 +1536,15 @@ li.stacktrace {
}

.section-header {
padding-left: 5px;
padding-right: 5px;
background-color: #FAFAFA;
background-image: linear-gradient(to bottom, #FFFFFF, #F2F2F2);
background-repeat: repeat-x;
padding: 5px 7px;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
border: 1px solid @control-border;
box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);

}

.selection-controls {
Expand Down Expand Up @@ -1667,59 +1693,3 @@ input[type="checkbox"].ng-invalid {
.container-settings dd input[type=radio] {
display: inline-block;
}

This comment has been minimized.

Sign in to view

Copy link
@jstrachan

jstrachan Aug 19, 2013

Contributor

hey @gashcrumb just wondered why you commented out the code to enable nav-primary on the nav bars? I was using this for #445 to highlight when a camel/dozer file has been changed so that it needs to be saved?

This comment has been minimized.

Sign in to view

Copy link
@jstrachan

jstrachan Aug 19, 2013

Contributor

would be happy to switch to another css style btw; just figured simplest thing to do for now was replicate the btn-primary; for nav bars

This comment has been minimized.

Sign in to view

Copy link
@gashcrumb

gashcrumb Aug 19, 2013

Author Member

Think I know what happened here, was trying out a vim plugin that day that did on-the-fly recompiling and highlighted syntax errors. I bet I forgot to reload this file after doing a pull before I edited it.

/** allow nav bar items to have highlights like btn-primary etc */
/*
.nav-warning.active,
.nav-danger.active,
.nav-success.active,
.nav-info.active,
.nav-inverse.active {
*/
div#main div ul.nav li a.nav-primary.active {
color: rgba(255, 255, 255, 0.75);
}
div#main div ul.nav li a.nav-primary {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #006dcc;
background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
background-image: -o-linear-gradient(top, #0088cc, #0044cc);
background-image: linear-gradient(to bottom, #0088cc, #0044cc);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
border-color: #0044cc #0044cc #002a80;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
*background-color: #0044cc;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */

filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
div#main div ul.nav li a.nav-primary:hover,
div#main div ul.nav li a.nav-primary:active,
div#main div ul.nav li a.nav-primary.active,
div#main div ul.nav li a.nav-primary.disabled,
div#main div ul.nav li a.nav-primary[disabled] {
color: #ffffff;
background-color: #0044cc;
*background-color: #003bb3;
}
div#main div ul.nav li a.nav-primary:active,
div#main div ul.nav li a.nav-primary.active {
background-color: #003399 \9;
}

/*
.nav-warning .caret,
.nav-danger .caret,
.nav-info .caret,
.nav-success .caret,
.nav-inverse .caret,
*/
div#main div ul.nav li a.nav-primary .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}

1 comment on commit 24cd757

@gashcrumb
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interestingly enough I didn't actually delete/comment this stuff out. Seems more like a bad merge.

Please sign in to comment.