Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
semancik committed Apr 25, 2016
2 parents 6a93c07 + 858e571 commit cf3251a
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 15 deletions.
30 changes: 30 additions & 0 deletions gui/admin-gui/src/main/webapp/less/midpoint-theme-variables.less
@@ -0,0 +1,30 @@
/*
* Copyright (c) 2010-2016 Evolveum
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

@text-label-color: #3c8dbc;
@text-dimmed-color: #808080;

@table-divider-color: #ddd;
@table-stripe-bg-color: #f9f9f9;

@object-user-color: #dd4b39;
@object-role-color: #00a65a;
@object-org-color: #F39C12;
@object-service-color: #00C0EF;
@object-resource-color: #605CA8;
@object-task-color: #001f3f;

@box-projection-color: #001F3F;
36 changes: 21 additions & 15 deletions gui/admin-gui/src/main/webapp/less/midpoint-theme.less
@@ -1,23 +1,29 @@

@text-label-color: #3c8dbc;
@text-dimmed-color: #808080;

@table-divider-color: #ddd;
@table-stripe-bg-color: #f9f9f9;

@object-user-color: #dd4b39;
@object-role-color: #00a65a;
@object-org-color: #F39C12;
@object-service-color: #00C0EF;
@object-resource-color: #605CA8;
@object-task-color: #001f3f;

@box-projection-color: #001F3F;
/*
* Copyright (c) 2010-2016 Evolveum
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

@import "midpoint-theme-variables.less";

.skin-blue-light .main-header {
& .logo {
//background-color: red;

&:hover {
//background-color: red;
}

& > span {
height: 100%;
width: 100%;
Expand Down

0 comments on commit cf3251a

Please sign in to comment.