Skip to content

Commit

Permalink
layout update
Browse files Browse the repository at this point in the history
  • Loading branch information
rsoika committed Jun 3, 2020
1 parent 750f670 commit 8a9c053
Show file tree
Hide file tree
Showing 19 changed files with 730 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/main/webapp/layout/css/basic.css
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ body, html {

button, input[type="button"], input[type="submit"], .button, a.button,
.imixs-button {
background: #FCB802;
background: #1c3c5e;
color: #fff !important;
font-weight: normal !important;
}
Expand Down
9 changes: 5 additions & 4 deletions src/main/webapp/layout/header.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:a="http://xmlns.jcp.org/jsf/passthrough">

<h:form>
<h:form onkeypress="if (event.keyCode == 13) { $('.header-search-button').click(); return false; }">
<div class="header">


Expand All @@ -23,8 +24,8 @@
<div class="searchbox col-6">


<h:inputText style="width: 80%;" value="#{searchController.input}" />
<h:commandLink actionListener="#{searchController.search()}"
<h:inputText style="width: 80%;" value="#{searchController.input}" a:placeholder="search..."/>
<h:commandLink actionListener="#{searchController.search()}" styleClass="header-search-button"
action="/pages/search" title="#{global.search}" ><span class="typcn typcn-zoom-outline"></span></h:commandLink>

</div>
Expand Down
15 changes: 0 additions & 15 deletions src/main/webapp/layout/headerold.xhtml

This file was deleted.

3 changes: 2 additions & 1 deletion src/main/webapp/layout/template.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
<i:imixsHeader disablecss="false"
dateformat="#{global.datePatternShort}" disabletinymce="false"
disablefileupload="false"
xxtheme="#{facesContext.externalContext.requestContextPath}/layout/themes/ui-darkness/jquery-ui-1.8.21.custom.css" />
xxtheme="#{facesContext.externalContext.requestContextPath}/layout/themes/office/jquery-ui-1.10.4.custom.css"
theme="#{facesContext.externalContext.requestContextPath}/layout/themes/smoothness/jquery-ui.css" />

<!-- tinyMCE -->
<script type="text/javascript"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
474 changes: 474 additions & 0 deletions src/main/webapp/layout/themes/smoothness/jquery-ui.css

Large diffs are not rendered by default.

248 changes: 248 additions & 0 deletions src/main/webapp/layout/themes/smoothness/jquery.ui.theme.css

Large diffs are not rendered by default.

0 comments on commit 8a9c053

Please sign in to comment.