summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sass'John Ahlroos2012-10-0875-1455/+1510
|\
| * Merge branch 'master' into sassJohn Ahlroos2012-10-082-12/+3
| |\
| * \ Merge branch 'master' into sassMarc Englund2012-10-044-37/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: WebContent/VAADIN/themes/base/formlayout/formlayout.scss WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss Change-Id: Ie895a1bbafdcf2fe79d500efb04c6eef3f5a812e
| * \ \ Merge branch 'master' into sassMarc Englund2012-10-012-10/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss theme-compiler/src/com/vaadin/sass/tree/ListRemoveNode.java theme-compiler/src/com/vaadin/sass/visitor/EachVisitor.java
| * | | | Sass restructure: split button into nativebutton and checkboxMarc Englund2012-09-288-100/+149
| | | | |
| * | | | Sass restructure: fixed bug in embedded.scssMarc Englund2012-09-281-1/+1
| | | | |
| * | | | Sass restructure: base theme with renameable componentsMarc Englund2012-09-2831-495/+495
| | | | |
| * | | | Sass restructure: tried some variants, this should be a reindeer structure ↵Marc Englund2012-09-2831-712/+712
| | | | | | | | | | | | | | | | | | | | that should work w/o overlay-container
| * | | | Sass restructure: need to disable .themename{} -wrapping until we get ↵Marc Englund2012-09-2810-64/+70
| | | | | | | | | | | | | | | | | | | | overlay-container.
| * | | | Rearranging sass theme structure in phases.Marc Englund2012-09-268-109/+109
| | | | |
* | | | | Bootstrap UI using relative URLs with servlets (#6771)Leif Åstrand2012-10-081-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Configure widgetset using URLs relative to the requested page * Provide a Util method for getting an absolute URL from a relative URL * Test by using an embedded Jetty acting as a transparent proxy * Make /embed1 use the Buttons test to enable testing UIDL requests Change-Id: I4ef9b40e3954ae16b682d743a339f4360db40d4d
* | | | | Merge "Add Page.getLocation() (#9249)"Leif Åstrand2012-10-051-5/+3
|\ \ \ \ \
| * | | | | Add Page.getLocation() (#9249)Johannes Dahlström2012-10-051-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Send the whole window location, not just fragment, in bootstrap and when the fragment changes * BrowserDetails now has URI getLocation() instead of String getUriFragment() * Keep FragmentChangeListeners as-is, should perhaps change to LocationChangeListeners at some point * Implement Page.getFragment() by means of Page.getLocation() * Differentiate between no fragment (null) and empty fragment ("") as java.net.URI does Change-Id: I1da1ea0664304d0c121a57e85d127fe48605e940
* | | | | | Merge "Fixed datefield height #9798"Johannes Dahlström2012-10-051-0/+1
|\ \ \ \ \ \
| * | | | | | Fixed datefield height #9798John Ahlroos2012-10-041-0/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Change-Id: Iabd4c7e7729efeed02f8be087769de5f51634662
* | | | | | Merge "Fixed selectors in layout.scss #9860"John Ahlroos2012-10-051-2/+2
|\ \ \ \ \ \
| * | | | | | Fixed selectors in layout.scss #9860John Ahlroos2012-10-041-2/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: I297de32c4123ecc70bbadd92171b7858d7ef7399
* | | | | | Merge "Added IE8 HTML5 doctype fix for removing unneeded scrollbars in ↵John Ahlroos2012-10-051-0/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | splitpanel #9552"
| * | | | | Added IE8 HTML5 doctype fix for removing unneeded scrollbars in splitpanel #9552John Ahlroos2012-10-041-0/+10
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I2d9abc2add60809412a8625d4b4753aca408c7cd
* | | | | Merge "Fixed combobox line heights in Chameleon theme #9838"Johannes Dahlström2012-10-041-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed combobox line heights in Chameleon theme #9838John Ahlroos2012-10-031-0/+3
| |/ / / | | | | | | | | | | | | Change-Id: I2193f9304b378084bdd9f0e750e049af5af5e0ec
* / / / Remove default bootstrap parameter support (#9824)Leif Åstrand2012-10-021-12/+0
|/ / / | | | | | | | | | | | | | | | | | | Also remove the code that used to set the pathInfo parameter which is never used. Change-Id: I0ec7cc8453766bccf9527bfcf5e78411364da5f0
* | | Merge from 6.8: Limit propagation of vertical spacing and margins inHenri Sara2012-10-013-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nested FormLayouts, related test (#9427) svn changeset:24503/svn branch:6.8 svn changeset:24504/svn branch:6.8 svn changeset:24506/svn branch:6.8 Change-Id: I7eca0fccdd9fc9258514c68025bd9e99dcc0b89d
* | | Added a dummy value to the parameter to make Websphere happy (#9776)Artur Signell2012-09-281-1/+1
| |/ |/| | | | | Change-Id: If44a4705fe6c2d9ce381924b2d2a47de532a712c
* | Add missing semicolons to vaadinBootstrap.jsHenri Sara2012-09-281-9/+9
| | | | | | | | Change-Id: I7917798ab2f3bf092b2c3e18f173f720e9e43e49
* | Fix and test case for #9294 (hideTabs() hides a nested tabsheet tabs as well)Johannes Dahlström2012-09-271-1/+1
|/
* Fix logic error in initialPath handling (#9747)Leif Åstrand2012-09-251-1/+1
|
* Restored content:"" for layout slots which fixes #9736John Ahlroos2012-09-251-1/+1
|
* Show internal error reponses for browser details request (#8243)Artur Signell2012-09-241-0/+2
|
* Only use UI from web.xml for requests without additional path (#9722)Leif Åstrand2012-09-241-1/+4
|
* Caption text should be middle aligned #8294John Ahlroos2012-09-241-1/+1
|
* Revert "Fixed different spacing height in IE and Opera #8294". Was causing ↵John Ahlroos2012-09-241-5/+0
| | | | too many other tests to fail.
* Fixed different spacing height in IE and Opera #8294John Ahlroos2012-09-241-0/+5
|
* Revert "Restored table row heights #8294".John Ahlroos2012-09-211-2/+2
|
* Restored table row heights #8294John Ahlroos2012-09-211-2/+2
|
* Fixed panel caption height causing 1px jump #8294John Ahlroos2012-09-201-0/+1
|
* Fixed select row height changes #8294John Ahlroos2012-09-201-0/+4
|
* Revert "Fixed NativeButton 1px caption jump #8294"John Ahlroos2012-09-201-2/+1
|
* Fixed NativeButton 1px caption jump #8294John Ahlroos2012-09-201-1/+2
|
* Fixed 1px jump in caption #8294John Ahlroos2012-09-191-1/+1
|
* Trying again, this time making layouts block elements #8294John Ahlroos2012-09-191-2/+2
|
* Fixed issue where layouts with empty slots gets line height. #8294John Ahlroos2012-09-191-0/+1
|
* Removed empty content: in css rules since they generate a empty line with ↵John Ahlroos2012-09-186-7/+6
| | | | html5 content type
* Moved grid layout margin and spacing fixes from reindeer to base theme #9559John Ahlroos2012-09-132-18/+20
|
* Fixed previously broken gridlayout margins and spacings.John Ahlroos2012-09-121-5/+5
|
* Moved background-position before sprite so sprite generator can override itArtur Signell2012-09-111-1/+1
|
* Fixed combobox item selector offset bug John Ahlroos2012-09-111-0/+1
|
* Add missing closing brace to @mixin base-commonJohannes Dahlström2012-09-101-0/+2
|
* Merge branch '6.8'John Ahlroos2012-09-101-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: WebContent/VAADIN/themes/base/common/common.scss server/src/com/vaadin/server/VaadinServlet.java server/src/com/vaadin/ui/AbstractField.java src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java tests/testbench/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java tests/testbench/com/vaadin/tests/components/table/TableReduceContainerSize.java tests/testbench/com/vaadin/tests/tickets/Ticket8291.java uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java uitest/src/com/vaadin/tests/tickets/Ticket8291.java uitest/test.xml
| * Enable (hopefully this time for real) native touch scrolling on Mobile ↵Johannes Dahlström2012-09-041-1/+5
| | | | | | | | | | | | Safari 6+ (#8792) svn changeset:24300/svn branch:6.8
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 08:16:16 +0000