lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into MECS-1454_Search_filter_improvements

Browse Source 
Conflicts:
	hawkbit-ui/src/main/resources/messages.properties
	hawkbit-ui/src/main/resources/messages_de.properties
	hawkbit-ui/src/main/resources/messages_en.properties
This commit is contained in:
venu1278
2016-02-05 11:55:55 +05:30
parent f6ae3cbfe5 fcff3e9917
commit a9b36c0fc7
152 changed files with 14213 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss
View File

@@ -127,3 +127,11 @@ $white-hex-color: #fff;
$tag-border-green-color: #2c9720;
$tag-button-disabled-grey:#c0c0c0;
$twin-table-border-grey:#888;
$progress-bar-scheduled-part: $blue-color;
$progress-bar-running-part: $signal-yellow-color;
$progress-bar-error-part: $signal-red-color;
$progress-bar-finished-part: $signal-green-color;
$progress-bar-cancelled-part: $grey-light;
$progress-bar-notstarted-part: $grey-color;

37
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss
View File

@@ -198,19 +198,34 @@
.statusIconNeutral {
color: $hawkbit-primary-color;
}
.greySpinner{
@include valo-spinner($size: $v-font-size--small,$color: $grey-color);
pointer-events: auto !important;
}
.yellowSpinner{
@include valo-spinner($size: $v-font-size--small,$color: $signal-yellow-color);
pointer-events: auto !important;
}
.blueSpinner{
@include valo-spinner($size: $v-font-size--small,$color: $bosch-color-light-blue);
pointer-events: auto !important;
}
// Disabled row style when distribution is incomplete
.v-table-row-incomplete-distribution {
color: $disabled-row-color-grey !important;
}
.v-table-row-incomplete-distribution {
color: $disabled-row-color-grey !important;
}
.v-link {
text-decoration: none;
padding-right: 10px;
font-weight: 300;
}
.v-link {
text-decoration: none;
padding-right: 10px;
font-weight: 300;
}
.v-tooltip{
max-width:43em;
}
.v-tooltip{
max-width:43em;
}
}

60
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss Normal file
View File

@@ -0,0 +1,60 @@
/**
* Copyright (c) 2015 Bosch Software Innovations GmbH and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
@mixin rollout {
.rollout-option-group{
font-size:12px;
font-weight:400;
margin-left:8px;
}
.rollout-action-type-layout {
.v-caption-padding-right-style{
padding-right:0px !important;
}
}
.v-context-menu .v-context-menu-item-basic-icon-container{
height:0px !important;
width:0px !important;
}
.v-context-menu, .v-context-menu .v-context-menu-item-basic{
background-color: #feffff !important;
border-radius: 4px;
}
.v-context-menu .v-context-menu-item-basic:focus, .v-context-menu .v-context-menu-item-basic-submenu:focus, .v-context-menu .v-context-menu-item-basic-open {
@include valo-gradient($color: $hawkbit-primary-color);
background-color: $hawkbit-primary-color !important;
color: #e8eef3;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.05);
}
.disable-action-type-layout{
opacity: 0.5;
}
.rollout-caption-links{
font-weight: 400;
height: 25px ;
padding: 0px 4px ;
}
.rollout-target-count-message{
color: $info-message-color-grey;
}
.rollout-table{
.v-table-cell-wrapper {
cursor: default;
}
}
}

64
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/statusprogressbar.scss Normal file
View File

@@ -0,0 +1,64 @@
/**
* Copyright (c) 2015 Bosch Software Innovations GmbH and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
@mixin statusprogressbar {
.alump-dbar {
.status-bar-part-scheduled {
background-color: $progress-bar-scheduled-part !important;
}
.status-bar-part-running {
background-color: $progress-bar-running-part !important;
}
.status-bar-part-error {
background-color: $progress-bar-error-part !important;
}
.status-bar-part-finished {
background-color: $progress-bar-finished-part !important;
}
.status-bar-part-cancelled {
background-color: $progress-bar-cancelled-part !important;
}
.status-bar-part-notstarted {
background-color: $progress-bar-notstarted-part !important;
}
.alump-dbar-left {
padding: 3px 0px 3px 0px !important;
}
.alump-dbar-middle {
padding: 3px 0px 3px 0px !important;
}
.alump-dbar-right {
padding: 3px 0px 3px 0px !important;
}
.alump-dbar-only {
padding: 3px 0px 3px 0px !important;
}
}
&.alump-dbar-tooltip {
background-color: rgba(27, 54, 73, 0.9);
border-radius: 3px;
color: white;
z-index: 100;
padding: 3px;
font-size: 10px;
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 2px 12px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 2px 12px rgba(0, 0, 0, 0.2);
}
}

2
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-header-common.scss
View File

@@ -11,7 +11,7 @@
//Table header - filter text field style
.filter-box {
height: 21px !important;
height: 25px !important;
transition: width .5s ease-in-out;
float: right;
border-radius: $v-border-radius;

9
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/hawkbittheme.scss
View File

@@ -54,6 +54,9 @@ $v-table-border-color: $widget-border-color;
@import 'customstyles/footer-common';
@import 'customstyles/popup-common';
@import 'customstyles/target-filter-query';
@import 'customstyles/statusprogressbar';
@import 'customstyles/rollout';
// Optimize the CSS output
$v-included-components: remove($v-included-components, calendar);
@@ -88,7 +91,10 @@ $v-included-components: remove($v-included-components, form);
@include popup-common;
@include valo-menu-responsive;
@include target-filter-query;
@include statusprogressbar;
@include rollout;
.v-app-loading {
background-color: rgba(0, 0, 0, 0);
background-image: $app-background-image, linear-gradient(to bottom, $app-background-image-gradient);
@@ -120,5 +126,4 @@ $v-included-components: remove($v-included-components, form);
left: 50%;
margin-left: -20px;
}
}

2
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/styles.scss
View File

@@ -8,9 +8,11 @@
*/
@import "customstyles/hawkbitvariables";
@import "../hawkbit/hawkbittheme";
@import "../hawkbit/addons";
/* This file prefixes all rules with the theme name to avoid causing conflicts with other themes. */
/* The actual styles should be defined in testvalothemedemo.scss */
.hawkbit {
@include addons;
@include hawkbittheme;
}