Skip to content

Commit

Permalink
seems good
Browse files Browse the repository at this point in the history
  • Loading branch information
drseb committed Feb 4, 2016
1 parent dcb21f4 commit b3ff732
Show file tree
Hide file tree
Showing 14 changed files with 369 additions and 237 deletions.
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<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=*">
<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>
Expand Down
6 changes: 3 additions & 3 deletions .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=both
com.vaadin.integration.eclipse.previousCompileAction=theme
com.vaadin.integration.eclipse.useLatestNightly=false
com.vaadin.integration.eclipse.widgetsetCompilationEta=112508
com.vaadin.integration.eclipse.widgetsetDirty=true
com.vaadin.integration.eclipse.widgetsetCompilationEta=43862
com.vaadin.integration.eclipse.widgetsetDirty=false
eclipse.preferences.version=1
21 changes: 21 additions & 0 deletions WebContent/VAADIN/themes/hpoweb/hpoweb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,25 @@
@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;
}

}
21 changes: 18 additions & 3 deletions WebContent/VAADIN/themes/hpoweb/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@
*/

.v-vaadin-version:after {
content: "7.6.1";
content: "7.6.2";
}

.v-widget {
Expand Down Expand Up @@ -4751,11 +4751,11 @@ div.v-layout.v-horizontal.v-widget {
}

.v-ie8 .hpoweb .v-grid-editor-cells > div .v-datefield-button {
margin-left: -30px;
margin-left: -37px;
}

.v-ie8 .hpoweb .v-grid-editor-cells > div .v-filterselect-button {
margin-left: -27px;
margin-left: -25px;
}

.hpoweb .v-grid-editor-cells > div .v-select, .hpoweb .v-grid-editor-cells > div .v-select-select {
Expand Down Expand Up @@ -13010,4 +13010,19 @@ div.v-layout.v-horizontal.v-widget {
display: inline-block;
width: 19px;
overflow: hidden;
}

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

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

.hpoweb .v-csslayout-gridelement {
padding-top: 10px;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0FD65A58CCA529BD16E7A98900656F65.cache.js
0A26D8DAF21BA673DCB7F88E151D8CD7.cache.js
ClientBundle.enableInlining true
audioElementSupport maybe
canvasElementSupport maybe
Expand Down Expand Up @@ -28,7 +28,7 @@ vaadin.profiler false
videoElementSupport maybe
webApiUsage modern

0FD65A58CCA529BD16E7A98900656F65.cache.js
0A26D8DAF21BA673DCB7F88E151D8CD7.cache.js
ClientBundle.enableInlining true
audioElementSupport maybe
canvasElementSupport maybe
Expand Down Expand Up @@ -58,7 +58,7 @@ vaadin.profiler false
videoElementSupport maybe
webApiUsage modern

0FD65A58CCA529BD16E7A98900656F65.cache.js
0A26D8DAF21BA673DCB7F88E151D8CD7.cache.js
ClientBundle.enableInlining true
audioElementSupport maybe
canvasElementSupport maybe
Expand Down Expand Up @@ -88,7 +88,7 @@ vaadin.profiler false
videoElementSupport maybe
webApiUsage modern

0FD65A58CCA529BD16E7A98900656F65.cache.js
0A26D8DAF21BA673DCB7F88E151D8CD7.cache.js
ClientBundle.enableInlining true
audioElementSupport no
canvasElementSupport no
Expand Down Expand Up @@ -118,7 +118,7 @@ vaadin.profiler false
videoElementSupport no
webApiUsage modern

0FD65A58CCA529BD16E7A98900656F65.cache.js
0A26D8DAF21BA673DCB7F88E151D8CD7.cache.js
ClientBundle.enableInlining true
audioElementSupport maybe
canvasElementSupport maybe
Expand Down Expand Up @@ -148,7 +148,7 @@ vaadin.profiler false
videoElementSupport maybe
webApiUsage modern

0FD65A58CCA529BD16E7A98900656F65.cache.js
0A26D8DAF21BA673DCB7F88E151D8CD7.cache.js
ClientBundle.enableInlining true
audioElementSupport maybe
canvasElementSupport maybe
Expand Down

Large diffs are not rendered by default.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
8 changes: 3 additions & 5 deletions ivy.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE ivy-module [
<!ENTITY vaadin.version "7.6.1">
<!ENTITY vaadin.version "7.6.2">
]>
<ivy-module version="2.0"
xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
Expand Down Expand Up @@ -34,13 +34,11 @@

<!-- Compiler for custom widget sets. Should not be deployed -->
<dependency org="com.vaadin" name="vaadin-client-compiler" rev="&vaadin.version;" conf="widgetset-compile->default" />

<dependency org="org.vaadin" name="viritin" rev="1.34" />
<dependency org="org.vaadin.addons" name="graph-explorer" rev="0.7.0" />
<dependency org="org.vaadin.addon" name="tableexport-for-vaadin" rev="1.5.1.5" />
<dependency org="org.vaadin.addons" name="googleanalyticstracker" rev="2.1.0" />
<dependency org="com.github.vaadin4qbanos" name="jsclipboard" rev="1.0.2" />
<dependency org="com.sebworks" name="vaadstrap" rev="0.1.2" />

</dependencies>
<dependency org="com.sebworks" name="vaadstrap" rev="0.1.2" />
</dependencies>
</ivy-module>
2 changes: 1 addition & 1 deletion ivysettings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-- Vaadin Add-on repository -->
<ibiblio name="vaadin-addons" usepoms="true" m2compatible="true"
root="http:https://maven.vaadin.com/vaadin-addons" />

<!-- Vaadin snapshots repository -->
<ibiblio name="vaadin-snapshots" usepoms="true" m2compatible="true"
root="https://oss.sonatype.org/content/repositories/vaadin-snapshots" />
Expand Down
Loading

0 comments on commit b3ff732

Please sign in to comment.