merged
This commit is contained in:
commit
6ac0aab378
|
@ -77,7 +77,7 @@ font-weight:bold;
|
||||||
font-size:16px;
|
font-size:16px;
|
||||||
text-transform:uppercase;
|
text-transform:uppercase;
|
||||||
color:#838383;
|
color:#838383;
|
||||||
padding-top:4px;}
|
padding-top:8px;}
|
||||||
|
|
||||||
#entropyLink
|
#entropyLink
|
||||||
{text-decoration:none;
|
{text-decoration:none;
|
||||||
|
@ -85,10 +85,24 @@ margin-top:-10px;}
|
||||||
|
|
||||||
.content
|
.content
|
||||||
{/*padding-bottom: 100px;*/
|
{/*padding-bottom: 100px;*/
|
||||||
margin-bottom:2%;
|
margin-bottom:1%;
|
||||||
height:71%;
|
height:68%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.nav ul
|
||||||
|
{background-image:url(../img/admin/default-bg.gif);
|
||||||
|
background-color:#7CA0C7;}
|
||||||
|
|
||||||
|
.nav ul li
|
||||||
|
{height:4%;
|
||||||
|
width:100%;
|
||||||
|
padding-right: 60px;
|
||||||
|
list-style:none;
|
||||||
|
display:inline;
|
||||||
|
color:#FFF;
|
||||||
|
font-weight:bold;
|
||||||
|
cursor:pointer;}
|
||||||
|
|
||||||
.mapListSection
|
.mapListSection
|
||||||
{float:left;
|
{float:left;
|
||||||
width:33%;
|
width:33%;
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
<div id="user-tools">
|
<div id="user-tools">
|
||||||
|
|
||||||
<!--Welcome,<strong> admin.</strong><a href="/admin/password_change/"> Change password</a> /
|
Welcome,<strong> admin.</strong><a href="/admin/password_change/"> Change password</a> /
|
||||||
<a href="/admin/logout/">Log out</a>-->
|
<a href="/admin/logout/">Log out</a>-->
|
||||||
<p id="logoText">Digital Gazetteer Demo</p>
|
<p id="logoText">Digital Gazetteer Demo</p>
|
||||||
<p id="entropyLink"><a href="http://entropyfree.com">by Entropy Free LLC</a></p>
|
<p id="entropyLink"><a href="http://entropyfree.com">by Entropy Free LLC</a></p>
|
||||||
|
@ -48,6 +48,14 @@
|
||||||
|
|
||||||
<div class="content">
|
<div class="content">
|
||||||
|
|
||||||
|
<div class="nav module">
|
||||||
|
<ul id="navMenu">
|
||||||
|
<li>Dummy Link A</li>
|
||||||
|
<li>Dummy Link B</li>
|
||||||
|
<li>Dummy Link C</li>
|
||||||
|
<li>Dummy Link D</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="mapListSection module">
|
<div class="mapListSection module">
|
||||||
<p class="resultsList" id="totalResults">Total Results: <span id="noOfResults">21 </span></p><p class="resultsList" id="showingResults">Showing Page: <span id="currPageNo">1</span> <span id="of">of</span> <span id="totalPages"> 10</span></p>
|
<p class="resultsList" id="totalResults">Total Results: <span id="noOfResults">21 </span></p><p class="resultsList" id="showingResults">Showing Page: <span id="currPageNo">1</span> <span id="of">of</span> <span id="totalPages"> 10</span></p>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user