basic technology working!

drseb · Feb 3, 2016 · 5fa22bc · 5fa22bc
1 parent 6f8782b
commit 5fa22bc
Show file tree

Hide file tree

Showing 34 changed files with 1,353 additions and 1,394 deletions.
diff --git a/.classpath b/.classpath
@@ -13,13 +13,11 @@
  </classpathentry>
  <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
  <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=hpoweb&amp;ivyXmlPath=ivy.xml&amp;confs=default&amp;ivySettingsPath=%24%7Bworkspace_loc%3Ahpoweb%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;ivyUserDir=&amp;propertyFiles=">
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/phenOwl"/>
+ <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=hpoweb&amp;ivyXmlPath=ivy.xml&amp;confs=*">
  <attributes>
  <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
  </attributes>
  </classpathentry>
- <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=hpoweb&amp;ivyXmlPath=ivy.xml&amp;confs=widgetset-compile&amp;ivySettingsPath=%24%7Bworkspace_loc%3Ahpoweb%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;ivyUserDir=&amp;propertyFiles="/>
- <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=hpoweb&amp;ivyXmlPath=ivy.xml&amp;confs=nodeploy&amp;ivySettingsPath=%24%7Bworkspace_loc%3Ahpoweb%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;ivyUserDir=&amp;propertyFiles="/>
- <classpathentry combineaccessrules="false" exported="true" kind="src" path="/phenOwl"/>
  <classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/.settings/com.vaadin.integration.eclipse.prefs b/.settings/com.vaadin.integration.eclipse.prefs
@@ -1,5 +1,5 @@
-com.vaadin.integration.eclipse.previousCompileAction=theme
+com.vaadin.integration.eclipse.previousCompileAction=both
 com.vaadin.integration.eclipse.useLatestNightly=false
-com.vaadin.integration.eclipse.widgetsetCompilationEta=37859
+com.vaadin.integration.eclipse.widgetsetCompilationEta=112508
 com.vaadin.integration.eclipse.widgetsetDirty=false
 eclipse.preferences.version=1
diff --git a/WebContent/VAADIN/themes/hpoweb/hpoweb.scss b/WebContent/VAADIN/themes/hpoweb/hpoweb.scss
@@ -1,7 +1,7 @@
 // Global variable overrides. Must be declared before importing Valo.
 
 // Defines the plaintext font size, weight and family. Font size affects general component sizing.
-
+//$v-font-size: 16px;
 //$v-font-weight: 300;
 //$v-font-family: "Open Sans", sans-serif;
 
@@ -27,114 +27,10 @@
 // For more information, see: https://vaadin.com/book/-/page/themes.valo.html
 // Example variants can be copy/pasted from https://vaadin.com/wiki/-/wiki/Main/Valo+Examples
 
-
-
-$v-app-loading-text: "Loading HPO data... please wait";
-$v-font-size: 14px;
-
-$v-layout-margin-right: 5px;
-$v-layout-margin-left: 5px;
-$v-layout-margin-top: 5px;
-$v-layout-margin-bottom: 5px;
-
 @import "../valo/valo.scss";
 
-// graph stuff
-@import "../graph-explorer/graph-explorer.scss";
-
 @mixin hpoweb {
- @include valo;
- // graph stuff
- @include graph-explorer;
-
- .itembox {
- white-space: normal;
- vertical-align: center;
- }
-
- .flexwrap[width-range~="0-599px"] {
- .itembox {width: 100%}
- }
-
- .flexwrap[width-range~="600px-999px"] {
- .itembox {width: 50%}
- }
- .flexwrap[width-range~="1000px-"] {
- .itembox {width: 33.333%}
- }
-
- .outerpanel{
- padding: 4px;
- color: white;
- border: none;
- box-shadow: none;
- }
-
- .innerpanel{
- width: 100%;
- }
-
- .no-top-bottom-margin{
- margin-top: 1px;
- margin-bottom: 1px;
- }
-
- .innerpanel_vlayout{
- padding-left: 5px;
- font-size: 13px;
- }
- .v-label-wrap{
- white-space:normal;
- }
-
- .v-panel-caption-innerpanel{
- font-size: 13px;
- }
-
-
- .tab-content-vl{
- padding: 5px;
- }
-
- .tab-content-header{
- padding-left: 1px;
- }
-
- .tab-content-content{
- padding-left: 5px;
- padding-bottom: 5px;
- }
-
- /////////////////
- // graph stuff //
- /////////////////
-
-
- .v-graph-explorer .node{
- padding: 1px;
- font-size: 90%;
- }
-
- .v-graph-explorer .node.root {
- background-color: #E7E4D3 ;
- }
-
- .v-graph-explorer .node.subclass {
- background-color: #EBF4FA ;
- }
-
-.v-graph-explorer .node.subsubclass {
- background-color: #BBD9EE ;
- }
-
- .v-graph-explorer .node.superclass {
- background-color: #EBF4FA ;
- }
-
-.v-graph-explorer .node.supersuperclass {
- background-color: #BBD9EE ;
- }
-
+ @include valo;
 
-  
+ // Insert your own theme rules here
 }