Skip to content

Commit

Permalink
Merge pull request #12 from drseb/use-vaadstrap
Browse files Browse the repository at this point in the history
Use vaadstrap
  • Loading branch information
drseb committed Feb 23, 2016
2 parents 358d23e + 107c5fc commit 7ca7b75
Show file tree
Hide file tree
Showing 44 changed files with 1,918 additions and 1,474 deletions.
6 changes: 2 additions & 4 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -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 exported="true" 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>
2 changes: 1 addition & 1 deletion .settings/com.vaadin.integration.eclipse.prefs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
com.vaadin.integration.eclipse.previousCompileAction=theme
com.vaadin.integration.eclipse.useLatestNightly=false
com.vaadin.integration.eclipse.widgetsetCompilationEta=37859
com.vaadin.integration.eclipse.widgetsetCompilationEta=41585
com.vaadin.integration.eclipse.widgetsetDirty=false
eclipse.preferences.version=1
1 change: 1 addition & 0 deletions WebContent/VAADIN/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/widgetsets/
141 changes: 141 additions & 0 deletions WebContent/VAADIN/themes/hpoweb/backup_hpoweb.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
// 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-weight: 300;
//$v-font-family: "Open Sans", sans-serif;

// Defines the border used by all components.
//$v-border: 1px solid (v-shade 0.7);
//$v-border-radius: 4px;

// Affects the color of some component elements, e.g Button, Panel title, etc
//$v-background-color: hsl(210, 0%, 98%);
// Affects the color of content areas, e.g Panel and Window content, TextField input etc
//$v-app-background-color: $v-background-color;

// Affects the visual appearance of all components
//$v-gradient: v-linear 8%;
//$v-bevel-depth: 30%;
//$v-shadow-opacity: 5%;

// Defines colors for indicating status (focus, success, failure)
//$v-focus-color: valo-focus-color(); // Calculates a suitable color automatically
//$v-friendly-color: #2c9720;
//$v-error-indicator-color: #ed473b;

// 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;
border: solid;
}

.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 ;
}



}
90 changes: 21 additions & 69 deletions WebContent/VAADIN/themes/hpoweb/hpoweb.scss
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -24,97 +24,51 @@
//$v-friendly-color: #2c9720;
//$v-error-indicator-color: #ed473b;

// 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";
// 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

// graph stuff
@import "../graph-explorer/graph-explorer.scss";
@import "../valo/valo.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;
}


@include valo;

// Insert your own theme rules here

.tab-content-vl{
background-color: white;
border: solid 1px lightgray;
padding: 5px;
border-radius: 3px;
}

.tab-content-header{
padding-left: 1px;
}

.tab-content-content{
padding-left: 5px;
padding-bottom: 5px;

.v-csslayout-gridelement{
padding-top: 10px;
}

/////////////////
/////////////////
// graph stuff //
/////////////////



.v-graph-explorer .node{
padding: 1px;
font-size: 90%;
}

.v-graph-explorer .node .label{
color: black;
}

.v-graph-explorer .node.root {
background-color: #E7E4D3 ;
}
Expand All @@ -134,7 +88,5 @@ $v-layout-margin-bottom: 5px;
.v-graph-explorer .node.supersuperclass {
background-color: #BBD9EE ;
}




}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading

0 comments on commit 7ca7b75

Please sign in to comment.