Made all logo links consistent

pull/229/merge
Abdullah Almsaeed 2015-02-04 17:12:18 -05:00
parent 64f0082d8a
commit 19c0faaca0
30 changed files with 82 additions and 203 deletions

View File

@ -2,31 +2,25 @@
* Page: Lock Screen
* -----------------
*/
/* ADD THIS CLASS TO THE <HTML> TAG */
/* ADD THIS CLASS TO THE <BODY> TAG */
.lockscreen {
background: url(../img/blur-background09.jpg) repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}
/* Remove the background from the body element */
.lockscreen > body {
background: transparent;
background: @gray;//url(../img/boxed-bg.png) repeat;
}
/* We will put the dynamically generated digital clock here */
.lockscreen .headline {
color: #fff;
text-shadow: 1px 3px 5px rgba(0,0,0,0.5);
font-weight: 300;
-webkit-font-smoothing: antialiased !important;
opacity: 0.8;
margin: 10px 0 30px 0;
font-size: 90px;
.lockscreen-logo {
font-size: 30px;
text-align: center;
margin-bottom: 25px;
a {
color: #444;
}
}
.lockscreen-wrapper {
max-width: 400px;
margin: 0 auto;
margin-top: 10%;
}
@media (max-width: @screen-xs-max) {
.lockscreen .headline {
font-size: 60px;
@ -38,7 +32,6 @@
.lockscreen .lockscreen-name {
text-align: center;
font-weight: 600;
font-size: 16px;
}
/* Will contain the image and the sign in form */
@ -53,7 +46,7 @@
}
/* User image */
.lockscreen-item > .lockscreen-image {
.lockscreen-image {
position: absolute;
left: -10px;
top: -30px;
@ -69,7 +62,7 @@
}
/* Contains the password input and the login button */
.lockscreen-item > .lockscreen-credentials {
.lockscreen-credentials {
margin-left: 80px;
input {
border: 0 !important;

43
dist/css/AdminLTE.css vendored
View File

@ -2554,27 +2554,23 @@ table.text-center th {
* Page: Lock Screen
* -----------------
*/
/* ADD THIS CLASS TO THE <HTML> TAG */
/* ADD THIS CLASS TO THE <BODY> TAG */
.lockscreen {
background: url(../img/blur-background09.jpg) repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}
/* Remove the background from the body element */
.lockscreen > body {
background: transparent;
background: #d2d6de;
}
/* We will put the dynamically generated digital clock here */
.lockscreen .headline {
color: #fff;
text-shadow: 1px 3px 5px rgba(0, 0, 0, 0.5);
font-weight: 300;
-webkit-font-smoothing: antialiased !important;
opacity: 0.8;
margin: 10px 0 30px 0;
font-size: 90px;
.lockscreen-logo {
font-size: 30px;
text-align: center;
margin-bottom: 25px;
}
.lockscreen-logo a {
color: #444;
}
.lockscreen-wrapper {
max-width: 400px;
margin: 0 auto;
margin-top: 10%;
}
@media (max-width: 767px) {
.lockscreen .headline {
@ -2586,7 +2582,6 @@ table.text-center th {
.lockscreen .lockscreen-name {
text-align: center;
font-weight: 600;
font-size: 16px;
}
/* Will contain the image and the sign in form */
.lockscreen-item {
@ -2606,7 +2601,7 @@ table.text-center th {
clear: both;
}
/* User image */
.lockscreen-item > .lockscreen-image {
.lockscreen-image {
position: absolute;
left: -10px;
top: -30px;
@ -2615,19 +2610,19 @@ table.text-center th {
border-radius: 50%;
z-index: 10;
}
.lockscreen-item > .lockscreen-image > img {
.lockscreen-image > img {
width: 70px;
height: 70px;
border-radius: 50%;
}
/* Contains the password input and the login button */
.lockscreen-item > .lockscreen-credentials {
.lockscreen-credentials {
margin-left: 80px;
}
.lockscreen-item > .lockscreen-credentials input {
.lockscreen-credentials input {
border: 0 !important;
}
.lockscreen-item > .lockscreen-credentials .btn {
.lockscreen-credentials .btn {
background-color: #fff;
border: 0;
}

File diff suppressed because one or more lines are too long

11
dist/js/demo.js vendored
View File

@ -1,3 +1,4 @@
var my_skins = ["skin-blue", "skin-black", "skin-red", "skin-yellow", "skin-purple", "skin-green"];
$(function () {
/* For demo purposes */
var demo = $("<div />").css({
@ -131,9 +132,8 @@ function change_layout(cls) {
$.AdminLTE.layout.fixSidebar();
}
function change_skin(cls) {
var skins = ["skin-blue", "skin-black", "skin-red", "skin-yellow", "skin-purple", "skin-green"];
$.each(skins, function (i) {
$("body").removeClass(skins[i]);
$.each(my_skins, function (i) {
$("body").removeClass(my_skins[i]);
});
$("body").addClass(cls);
@ -156,6 +156,7 @@ function get(name) {
}
function setup() {
if (get('skin'))
change_skin(get('skin'));
var tmp = get('skin');
if (tmp && $.inArray(tmp, my_skins))
change_skin(tmp);
}

View File

@ -142,7 +142,7 @@
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<!-- Logo -->
<a href="../index2.html" class="logo">AdminLTE</a>
<a href="../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->
@ -448,7 +448,7 @@ AdminLTE/
<span class="eg">Main Header Example</span>
<header class="main-header" style="position: relative;">
<!-- Logo -->
<a href="index2.html" class="logo">AdminLTE</a>
<a href="index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar" role="navigation" style="border: 0;">
<!-- Sidebar toggle button-->
@ -728,7 +728,7 @@ AdminLTE/
<span class="eg">Top Nav Example</span>
<header class="main-header">
<!-- Logo -->
<a href="../index2.html" class="logo">AdminLTE</a>
<a href="../index2.html" class="logo"><b>Admin</b>LTE</a>
<nav class="navbar navbar-static-top">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">

View File

@ -40,7 +40,7 @@
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<!-- Logo -->
<a href="index2.html" class="logo">AdminLTE</a>
<a href="index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -32,7 +32,7 @@
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<!-- Logo -->
<a href="index2.html" class="logo">AdminLTE</a>
<a href="index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -25,10 +25,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -42,10 +42,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -71,10 +71,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -39,10 +39,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -31,10 +31,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -25,10 +25,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -28,10 +28,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -25,10 +25,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -25,10 +25,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -27,10 +27,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -25,10 +25,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -25,10 +25,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -26,10 +26,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -25,10 +25,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class .icon to your logo image or logo icon to add some margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html class="lockscreen">
<html>
<head>
<meta charset="UTF-8">
<title>AdminLTE 2 | Lockscreen</title>
@ -16,13 +16,12 @@
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
</head>
<body>
<!-- Automatic element centering using js -->
<div class="center">
<div class="headline text-center" id="time">
<!-- Time auto generated by js -->
</div><!-- /.headline -->
<body class="lockscreen">
<!-- Automatic element centering -->
<div class="lockscreen-wrapper">
<div class="lockscreen-logo">
<a href="../../index2.html"><b>Admin</b>LTE</a>
</div>
<!-- User name -->
<div class="lockscreen-name">John Doe</div>
@ -30,7 +29,7 @@
<div class="lockscreen-item">
<!-- lockscreen image -->
<div class="lockscreen-image">
<img src="../../dist/img/avatar5.png" alt="user image"/>
<img src="../../dist/img/user1-128x128.jpg" alt="user image"/>
</div>
<!-- /.lockscreen-image -->
@ -58,57 +57,11 @@
<!-- page script -->
<script type="text/javascript">
$(function () {
startTime();
$(".center").center();
//$(".center").center();
$(window).resize(function () {
$(".center").center();
});
});
/* */
function startTime()
{
var today = new Date();
var h = today.getHours();
var m = today.getMinutes();
var s = today.getSeconds();
// add a zero in front of numbers<10
m = checkTime(m);
s = checkTime(s);
//Check for PM and AM
var day_or_night = (h > 11) ? "PM" : "AM";
//Convert to 12 hours system
if (h > 12)
h -= 12;
//Add time to the headline and update every 500 milliseconds
$('#time').html(h + ":" + m + ":" + s + " " + day_or_night);
setTimeout(function () {
startTime()
}, 500);
}
function checkTime(i)
{
if (i < 10)
{
i = "0" + i;
}
return i;
}
/* CENTER ELEMENTS IN THE SCREEN */
jQuery.fn.center = function () {
this.css("position", "absolute");
this.css("top", Math.max(0, (($(window).height() - $(this).outerHeight()) / 2) +
$(window).scrollTop()) - 30 + "px");
this.css("left", Math.max(0, (($(window).width() - $(this).outerWidth()) / 2) +
$(window).scrollLeft()) + "px");
return this;
}
</script>
</body>
</html>

View File

@ -35,10 +35,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -27,10 +27,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -25,10 +25,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -26,7 +26,7 @@
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<!-- Logo -->
<a href="../../index2.html" class="logo">AdminLTE</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<nav class="navbar navbar-static-top">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">

View File

@ -29,10 +29,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -27,10 +27,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -25,10 +25,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->

View File

@ -25,10 +25,7 @@
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="../index2.html" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
AdminLTE
</a>
<a href="../index2.html" class="logo"><b>Admin</b>LTE</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->