Dev

.gitignore

@@ -0,0 +1 @@
+update*.sh

.gitmodules

@@ -1,6 +1,4 @@
-[submodule "VAADIN/files"]
-	path = VAADIN/files
-	url = https://github.com/EUDAT-B2ACCESS/b2access-files.git
 [submodule "VAADIN/themes/html"]
 	path = VAADIN/themes/html
 	url = https://github.com/EUDAT-B2ACCESS/b2access-theme.git
+	branch = dev

VAADIN/files

@@ -0,0 +1 @@
+themes/html/templates/

VAADIN/themes/common/_common.scss

@@ -94,7 +94,7 @@
 	}
 
 	.u-header {
-		background: $headerBackgroundImage;
+		background-color: $headerBackgroundColor;
 	}
 
 	.u-textLarge {
@@ -137,14 +137,12 @@
 	}
 
 	.u-bigTab:hover {
-	    background: $bigTabHoverBgImage;
-	    box-shadow: 6px 6px 3px $shadowColor;
+	    color: $bigTabHoverColor;
 	}
 
 	.u-bigTabSelected {
-		background: $bigTabSelectedBgImage;
-		color: black;
-		box-shadow: 6px 6px 3px $shadowColor;
+		background-color: $bigTabSelectedBgColor;
+		color: $bigTabSelectedColor;
 	}
 
 	.u-textCenter {
@@ -311,7 +309,7 @@
 	}
 
 	.u-link {
-		color : #197de1;
+		color : #264899;
 	}
 
 	.u-hidden {
@@ -460,7 +458,7 @@
 	}
 
 	.v-menubar-popup .v-menubar-menuitem .v-icon  {
-		color: #197de1;
+		color: #264899
 	}
 
 	.u-error-icon .v-icon  {
@@ -511,7 +509,7 @@
 	}
 
     .drop-layout .v-horizontallayout-drag-center {
- 		background-color: #197de1;
+ 		background-color: #264899
  	}
 
  	.drop-on {
@@ -606,7 +604,7 @@
 	}
 
 	.u-externalSignInButton {
-		background: #53A0C6;
+		background: #264899;
 		text-decoration: none;
 		color: white;
 		font-weight: bold;
@@ -616,8 +614,8 @@
 	}
 
 	.u-externalSignInButton:hover {
-		background: #3486AE;
-		color: white;
+		background: #264899;
+		color: #f45d00;
 	}
 
 	.u-externalGridSignInButton {

VAADIN/themes/common/_configuration.scss

@@ -25,9 +25,10 @@ $shadowColor: 			#888;
 
 $font: "Open Sans", sans-serif, Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana;
 
-$headerBackgroundImage: 	url(../common/img/top-bar-bg.jpg);
-$bigTabHoverBgImage:		url(../common/img/bigTab-bg2-gray.jpg);
-$bigTabSelectedBgImage:		url(../common/img/bigTab-bg2-blue.jpg);
+$headerBackgroundColor: 	#f2f2f2;
+$bigTabHoverColor:		    #f45d00;
+$bigTabSelectedBgColor:		#f2f2f2;
+$bigTabSelectedColor:       #264899;
 
 $flagImageEn: 				url(../common/img/flag/en.png);
 $flagImagePl: 				url(../common/img/flag/pl.png);