Commit ef4ac611 authored by Matija Obreza's avatar Matija Obreza
Browse files

Bootstrap 3

parent b4ac1122
...@@ -54,6 +54,17 @@ ...@@ -54,6 +54,17 @@
</div> </div>
<!-- <h4 class="pull-left"><spring:message code="sample.message.welcome"/></h4> --> <!-- <h4 class="pull-left"><spring:message code="sample.message.welcome"/></h4> -->
<div class="pull-right searcher" style="margin-top: 5px;">
<form class="form-inline" method="get" action="<c:url value="/search" />">
<div class="input-group">
<input type="text" name="q" class="form-control" placeholder="<spring:message code="search.input.placeholder" />"/>
<span class="input-group-btn">
<button type="submit" class="btn notimportant"><spring:message code="search.button.label" /></button>
</span>
</div>
</form>
</div>
<div class="navbar pull-right"> <div class="navbar pull-right">
<div class="nav-collapse"> <div class="nav-collapse">
<ul class="nav"> <ul class="nav">
...@@ -87,12 +98,7 @@ ...@@ -87,12 +98,7 @@
</ul> </ul>
</sec:authorize> </sec:authorize>
</div> </div>
<div class="pull-right searcher" style="margin-top: 5px;">
<form class="search form-search" method="get" action="<c:url value="/search" />">
<input type="text" name="q" class="" placeholder="<spring:message code="search.input.placeholder" />"/> <button type="submit" class="btn notimportant"><spring:message code="search.button.label" /></button>
</form>
</div>
</div> </div>
</div> </div>
......
...@@ -51,9 +51,13 @@ ...@@ -51,9 +51,13 @@
</div> </div>
<div class="pull-right" id="header-searcher"> <div class="pull-right" id="header-searcher">
<form class="search form-search" method="get" action="<c:url value="/search" />"> <form class="form-inline" method="get" action="<c:url value="/search" />">
<input type="text" name="q" class="" placeholder="<spring:message code="search.input.placeholder" />" /> <div class="input-group">
<button type="submit" class="btn"><spring:message code="search.button.label" /></button> <input type="text" name="q" class="form-control" placeholder="<spring:message code="search.input.placeholder" />"/>
<span class="input-group-btn">
<button type="submit" class="btn notimportant"><spring:message code="search.button.label" /></button>
</span>
</div>
</form> </form>
</div> </div>
</div> </div>
......
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
<li><a href="<c:url value="/geo/" />"><spring:message code="menu.countries" /></a></li> <li><a href="<c:url value="/geo/" />"><spring:message code="menu.countries" /></a></li>
<li><a href="<c:url value="/wiews/active" />"><spring:message code="menu.institutes" /></a></li> <li><a href="<c:url value="/wiews/active" />"><spring:message code="menu.institutes" /></a></li>
<li><a href="<c:url value="/sel/" />"><spring:message code="menu.my-list" /> <li><a href="<c:url value="/sel/" />"><spring:message code="menu.my-list" />
<sup id="selcounter">${selection.size() gt 0 ? selection.size() : ''}</sup></a></li> <span class="badge" id="selcounter">${selection.size() gt 0 ? selection.size() : ''}</span></a></li>
</ul> </ul>
</div> </div>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
...@@ -104,6 +104,13 @@ a.disabled { ...@@ -104,6 +104,13 @@ a.disabled {
.nav-header { .nav-header {
padding: 1em 0; padding: 1em 0;
color: #999999;
display: block;
font-size: 11px;
font-weight: bold;
line-height: 20px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
text-transform: uppercase;
} }
#invite-list .btn{ #invite-list .btn{
...@@ -219,15 +226,17 @@ li.hoofdleter small { ...@@ -219,15 +226,17 @@ li.hoofdleter small {
ul.funny-list { ul.funny-list {
margin: 0; margin: 0;
padding: 0;
} }
ul.funny-list li { ul.funny-list li {
list-style-type: none; list-style-type: none;
} }
body { /* body {
background-color: #e8e5e0; background-color: #e8e5e0;
color: #4d4c47; color: #4d4c47;
} } */
#content { #content {
...@@ -249,7 +258,7 @@ body { ...@@ -249,7 +258,7 @@ body {
font-size: 16px; font-size: 16px;
text-transform: uppercase; text-transform: uppercase;
background-color: #88ba41; background-color: #88ba41;
color: #e5e6e0; color: White;
margin: -10px; margin: -10px;
margin-bottom: 10px; margin-bottom: 10px;
padding: 5px 10px; padding: 5px 10px;
...@@ -274,6 +283,7 @@ body { ...@@ -274,6 +283,7 @@ body {
#nav-main ul { #nav-main ul {
margin: 0; margin: 0;
padding: 0;
/* border-bottom: solid 3px White; */ /* border-bottom: solid 3px White; */
} }
...@@ -301,6 +311,7 @@ body { ...@@ -301,6 +311,7 @@ body {
#nav-foot ul { #nav-foot ul {
margin: 0 0 1em 0; margin: 0 0 1em 0;
padding: 0;
} }
#nav-foot ul li { #nav-foot ul li {
...@@ -315,6 +326,11 @@ body { ...@@ -315,6 +326,11 @@ body {
padding-left: 0; padding-left: 0;
} }
.navbar {
margin-bottom: 0;
min-height: 30px;
}
.navbar .nav > li > a { .navbar .nav > li > a {
text-shadow: none; text-shadow: none;
} }
...@@ -358,7 +374,7 @@ tr.acn .sel.picked { ...@@ -358,7 +374,7 @@ tr.acn .sel.picked {
#selcounter { #selcounter {
} }
.btn-primary { /* .btn-primary {
background-color: #88ba41; background-color: #88ba41;
background-image: linear-gradient(to bottom, #88ba41, #88ba41); background-image: linear-gradient(to bottom, #88ba41, #88ba41);
} }
...@@ -366,7 +382,7 @@ tr.acn .sel.picked { ...@@ -366,7 +382,7 @@ tr.acn .sel.picked {
.btn-primary:hover, .btn-primary:focus, .btn-primary:active { .btn-primary:hover, .btn-primary:focus, .btn-primary:active {
background-color: #88ba41; background-color: #88ba41;
background-image: linear-gradient(to bottom, #88ba41, #88ba41); background-image: linear-gradient(to bottom, #88ba41, #88ba41);
} } */
#allfilters, .filterinfo { #allfilters, .filterinfo {
margin: -10px; margin: -10px;
...@@ -418,11 +434,14 @@ tr.acn .sel.picked { ...@@ -418,11 +434,14 @@ tr.acn .sel.picked {
} }
select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { /* select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
height: auto; height: auto;
} } */
.free-text { .free-text {
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
} }
\ No newline at end of file
.page-header {
margin: 20px 0 10px;
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment