| <<<<<<< HEAD |
| <<<<<<< HEAD |
| <<<<<<< HEAD |
| ======= |
| >>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files |
| <!-- |
| Licensed to the Apache Software Foundation (ASF) under one |
| or more contributor license agreements. See the NOTICE file |
| distributed with this work for additional information |
| regarding copyright ownership. The ASF licenses this file |
| to you under the Apache License, Version 2.0 (the |
| "License"); you may not use this file except in compliance |
| with the License. You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, |
| software distributed under the License is distributed on an |
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| KIND, either express or implied. See the License for the |
| specific language governing permissions and limitations |
| under the License. |
| --> |
| |
| <<<<<<< HEAD |
| <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' |
| xmlns:g='urn:import:com.google.gwt.user.client.ui'> |
| <g:FlowPanel ui:field="topWrapper"> |
| <g:HorizontalPanel ui:field="buttonContainer"> |
| <g:HorizontalPanel ui:field="loginInfoPanel"></g:HorizontalPanel> |
| <g:Label ui:field="loginUserLabel"></g:Label> |
| <g:Anchor ui:field="mainButton"></g:Anchor> |
| <g:Anchor ui:field="logoutButton"></g:Anchor> |
| </g:HorizontalPanel> |
| <g:HorizontalPanel ui:field="infoContainer"> |
| <g:Label ui:field="appnameLabel"></g:Label> |
| <g:Label ui:field="extraLabel"></g:Label> |
| </g:HorizontalPanel> |
| <<<<<<< HEAD |
| ======= |
| ======= |
| >>>>>>> decorate the theme |
| ======= |
| >>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files |
| <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' |
| xmlns:g='urn:import:com.google.gwt.user.client.ui'> |
| <<<<<<< HEAD |
| <ui:style> |
| .round-corner-panel { |
| border: 1px solid #7FAAFF; |
| box-shadow: 0 1px 4px grey; |
| border-radius: 5px; |
| overflow: hidden; |
| } |
| </ui:style> |
| <<<<<<< HEAD |
| <<<<<<< HEAD |
| <<<<<<< HEAD |
| <g:FlowPanel addStyleNames="{style.round-corner-panel}"> |
| >>>>>>> decorate the theme |
| ======= |
| <g:FlowPanel ui:field="topWrapper" addStyleNames="{style.round-corner-panel}"> |
| >>>>>>> introduce the top activity |
| ======= |
| <g:FlowPanel addStyleNames="{style.round-corner-panel}"> |
| >>>>>>> decorate the theme |
| ======= |
| <g:FlowPanel ui:field="topWrapper" addStyleNames="{style.round-corner-panel}"> |
| >>>>>>> introduce the top activity |
| ======= |
| <g:FlowPanel ui:field="topWrapper"> |
| >>>>>>> make it look more beautiful |
| ======= |
| >>>>>>> replace with uibinder |
| </g:FlowPanel> |
| </ui:UiBinder> |
