Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Extensively polished the navbar (desktop); Added favicon

  • Loading branch information...
scar45 committed Feb 16, 2014
1 parent c5b57ff commit 45784bb3ca4554652d2d1885c55e1d48b073e20a
@@ -26,6 +26,14 @@ hr {
border-style: solid none solid;
}

a, a:hover, a *, a:hover * {
-webkit-transition: all 500ms ease-in-out !important;
-moz-transition: all 500ms ease-in-out !important;
-ms-transition: all 500ms ease-in-out !important;
-o-transition: all 500ms ease-in-out !important;
transition: all 500ms ease-in-out !important;
}

table a, table a:visited {
border-bottom: 1px dotted #fff;
}
@@ -245,19 +253,6 @@ a.navbar-brand img {
}

#dash-add-panel {
margin: 0px 5px 0px -5px;
position: absolute;
top: 0;
right: 0;
display: none;
}

#dash-add-panel a i {
margin-right: 0;
color: #fff;
}

#nav-login-button {
display: none;
}

@@ -280,6 +275,10 @@ a.navbar-brand img {
color: #fff;
}

.nav-pills li a:hover b.caret, .nav-pills li a:active b.caret {
border-width: 4px;
}

.nav-pills li a span {
display: block;
padding-top: 2px;
@@ -353,7 +352,7 @@ a.dropdown-toggle:active, a.dropdown-toggle:focus {

.navbar-nav li.open .dropdown-menu i {
color: #999;
margin: 0px 7px 0px -8px;
margin: 0px 7px 0px 0px;
}

.navbar-nav > li > a {
@@ -380,6 +379,10 @@ a.dropdown-toggle:active, a.dropdown-toggle:focus {
padding-left: 25px;
}

a#dash-add-panel {
display: none;
}

.site-width-slider {
display: none;
}
@@ -411,11 +414,11 @@ a.dropdown-toggle:active, a.dropdown-toggle:focus {
.dashboard-dropzone {
border: 1px dashed #0f0;
border-radius: 4px;
display: inline-block;
display: block;
text-align: center;
margin: 0 0 100px;
background: rgba(120,255,120,0.3);
height: 45px;
height: 145px;
width: 100%;

}
@@ -543,7 +546,7 @@ a.dropdown-toggle:active, a.dropdown-toggle:focus {
}


.panel-rig ul li a.pill-success, #dash-add-panel a {
.panel-rig ul li a.pill-success, #dash-add-panel {
cursor: pointer;
color: rgb(255, 255, 255);
background-color: rgb(98, 196, 98);
@@ -553,13 +556,12 @@ a.dropdown-toggle:active, a.dropdown-toggle:focus {
filter: none;
}

.panel-rig ul li a.pill-success:hover, .panel-rig ul li.active a.pill-success, #dash-add-panel a:hover {
.panel-rig ul li a.pill-success:hover, .panel-rig ul li.active a.pill-success, #dash-add-panel:hover {
background-image: linear-gradient(rgb(47, 125, 47), rgb(55, 147, 55) 40%, rgb(61, 162, 61));
background-repeat: no-repeat;
filter: none;
}


.panel-rig ul li a.pill-warning {
color: rgb(255, 255, 255);
background-color: rgb(248, 148, 6);
@@ -983,18 +985,26 @@ a.dropdown-toggle:active, a.dropdown-toggle:focus {
margin: 40px auto;
}

.navbar {
min-height: 45px;
}

.navbar-collapse {
box-shadow: none;
}

a.navbar-brand img {
height: 64px;
height: 56px;
}

.navbar .container {
width: 100%;
}

.navbar-nav {
width: auto;
float: right;
margin: -1px 0px 5px 20px;
margin: -1px 0px 0px 20px;
}

.nav-pills > li {
@@ -1014,16 +1024,85 @@ a.dropdown-toggle:active, a.dropdown-toggle:focus {
}

.nav-pills li a {
-webkit-border-radius: 0 0 9px 9px;
border-radius: 0 0 9px 9px;
font-size: 19px;
-webkit-border-radius: 0;
border-radius: 0;
border-width: 0 1px 1px;
text-align: left;
}

.nav-pills>li+li {
margin-left: -1px;
}

.navbar-nav > li > a {
padding-top: 10px;
padding-bottom: 7px;
}

.nav-pills>li.active>a, .nav-pills>li.active>a:hover {
border-width: 0 1px 1px;
}

.nav-pills .dropdown-menu li a {
padding: 4px 13px 5px;
}

.nav-pills li:nth-child(2) a {
-webkit-border-radius: 0 0 0 9px;
border-radius: 0 0 0 9px;
}

.nav-pills li:last-child a {
-webkit-border-radius: 0 0 9px 0;
border-radius: 0 0 9px 0;
}

.nav-pills li a#dash-link {
margin-right: 45px;
-webkit-border-radius: 0 0 0 9px;
border-radius: 0 0 0 9px;
}

#dash-add-panel {
position: relative;
.nav-pills li a#dash-add-panel {
margin: 0px 5px 0px -5px;
padding: 9px 6px 0;
height: 100%;
display: inline-block;
position: absolute;
top: 0;
right: 5px;
-webkit-border-radius: 0 0 9px 0;
border-radius: 0 0 9px 0;
}

.nav-pills li.topnav-icon a {
padding-left: 45px;

}

.nav-pills li.topnav-icon a i {
position: absolute;
top: 9px;
left: 10px;

}

.nav-pills li a#dash-add-panel i {
position: relative;
top: -1px;
left: 0;
margin-right: 0;
color: #050;
text-shadow: 0px -1px 0 #bdb;
}

.nav-pills li a#dash-add-panel:hover i {
color: #fff;
text-shadow: 0px 1px 0 #050;
}


.navbar-nav .open .dropdown-menu {
background: #3A3F44;
padding-left: 0;
@@ -1144,10 +1223,7 @@ a.dropdown-toggle:active, a.dropdown-toggle:focus {

/* Medium devices (desktops, 992px and up) */
@media (min-width: 992px) {

#coin-watcher, .panel-news-feed {
}


.panel-in-footer .panel-body .stat-pair-qr .stat-value img {
height: 48px;
width: 48px;
BIN +1.24 KB favicon.png
Binary file not shown.
Binary file not shown.
@@ -11,12 +11,11 @@
<span class="sr-only">Toggle navigation</span>
<i class="icon icon-dropmenu"></i>
</button>
<a class="navbar-brand" href="index.php"><img src="images/rigwatch-logo-landscape.png" alt="RigWatch" /></a>
<a class="navbar-brand" href="index.php"><img src="images/rigwatch-logo-landscape-shadow.png" alt="RigWatch" /></a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav nav-pills navbar-nav">
<li class="active"><a href="index.php"><i class="icon icon-speed"></i> Dashboard</a></li>
<li id="dash-add-panel" class="grad-green"><a title="Add Panel" data-toggle="modal" data-target="#editPool" data-backdrop="static"><i class="icon icon-newwindow"></i></a> </li>
<li class="active topnav-icon"><a id="dash-link" href="index.php"><i class="icon icon-speed"></i> Dashboard</a><a id="dash-add-panel" class="grad-green" title="Add Panel" data-toggle="modal" data-target="#editPool" data-backdrop="static"><i class="icon icon-newtab"></i></a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Tools <b class="caret"></b></a>
<ul class="dropdown-menu">
@@ -43,9 +42,8 @@
<li><a href="https://github.com/scar45/rigwatch" rel="external">Reddit Post</a></li>
</ul>
</li>
<li id="nav-login-button"><a href="login.php">Login</a></li>
<li id="nav-logout-button"><a href="logout.php">Logout</a></li>
<li class="panel-controls"><a id="collapse-all-panels" href="#" title="Collapse ALL Panels"><i class="icon icon-fastup"></i><span>Collapse All</span></a><a id="expand-all-panels" href="#" title="Expand ALL Panels"><i class="icon icon-fastdown"></i><span>Expand All</span></a></li>
<li id="nav-login-button" class="topnav-icon"><a href="login.php"><i class="icon icon-enteralt"></i> Login</a></li>
<!-- <li id="nav-logout-button" class="topnav-icon"><a href="logout.php"><i class="icon icon-exitalt"></i> Logout</a></li> -->
</ul>
</div>
<!--/.nav-collapse -->

0 comments on commit 45784bb

Please sign in to comment.
You can’t perform that action at this time.