Merge pull request #2102 from dmeltzer/layout-fixes

Improve navbar/header layout
This commit is contained in:
snipe 2016-06-01 21:25:40 -07:00
commit 368bb77cf0
7 changed files with 106 additions and 683 deletions

View file

@ -57,7 +57,6 @@ body {
.content-wrapper,
.right-side,
.main-footer {
transition: -webkit-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
transition: transform 0.3s ease-in-out, margin 0.3s ease-in-out;
margin-left: 230px;
z-index: 820;
@ -85,7 +84,6 @@ body {
.sidebar-open .content-wrapper,
.sidebar-open .right-side,
.sidebar-open .main-footer {
-webkit-transform: translate(230px, 0);
transform: translate(230px, 0);
}
}
@ -427,7 +425,6 @@ a:focus {
min-height: 100%;
width: 230px;
z-index: 810;
transition: -webkit-transform 0.3s ease-in-out, width 0.3s ease-in-out;
transition: transform 0.3s ease-in-out, width 0.3s ease-in-out;
}
@media (max-width: 767px) {
@ -439,21 +436,18 @@ a:focus {
@media (max-width: 767px) {
.main-sidebar,
.left-side {
-webkit-transform: translate(-230px, 0);
transform: translate(-230px, 0);
}
}
@media (min-width: 768px) {
.sidebar-collapse .main-sidebar,
.sidebar-collapse .left-side {
-webkit-transform: translate(-230px, 0);
transform: translate(-230px, 0);
}
}
@media (max-width: 767px) {
.sidebar-open .main-sidebar,
.sidebar-open .left-side {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
}
@ -539,7 +533,6 @@ a:focus {
margin-top: 3px;
}
.sidebar-menu li.active > a > .fa-angle-left {
-webkit-transform: rotate(-90deg);
transform: rotate(-90deg);
}
.sidebar-menu li.active > .treeview-menu {
@ -583,7 +576,6 @@ a:focus {
z-index: 840;
}
.sidebar-mini.sidebar-collapse .main-sidebar {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
width: 50px!important;
z-index: 850;
@ -1150,58 +1142,30 @@ a:focus {
/* Add fade animation to dropdown menus by appending
the class .animated-dropdown-menu to the .dropdown-menu ul (or ol)*/
.open:not(.dropup) > .animated-dropdown-menu {
-webkit-backface-visibility: visible !important;
backface-visibility: visible !important;
-webkit-animation: flipInX 0.7s both;
animation: flipInX 0.7s both;
}
@keyframes flipInX {
0% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
transition-timing-function: ease-in;
opacity: 0;
}
40% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
transition-timing-function: ease-in;
}
60% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
opacity: 1;
}
80% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
}
100% {
-webkit-transform: perspective(400px);
transform: perspective(400px);
}
}
@-webkit-keyframes flipInX {
0% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
-webkit-transition-timing-function: ease-in;
opacity: 0;
}
40% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
-webkit-transition-timing-function: ease-in;
}
60% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
opacity: 1;
}
80% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
}
100% {
-webkit-transform: perspective(400px);
}
}
/* Fix dropdown menu in navbars */
.navbar-custom-menu > .navbar-nav > li {
position: relative;
@ -2495,11 +2459,9 @@ table.text-center th {
padding: 0;
}
.direct-chat.chat-pane-open .direct-chat-contacts {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
.direct-chat-messages {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
padding: 10px;
height: 250px;
@ -2522,7 +2484,6 @@ table.text-center th {
}
.direct-chat-messages,
.direct-chat-contacts {
transition: -webkit-transform 0.5s ease-in-out;
transition: transform 0.5s ease-in-out;
}
.direct-chat-text {
@ -2586,11 +2547,9 @@ table.text-center th {
color: #999;
}
.direct-chat-contacts-open .direct-chat-contacts {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
.direct-chat-contacts {
-webkit-transform: translate(101%, 0);
transform: translate(101%, 0);
position: absolute;
top: 0;
@ -3943,11 +3902,9 @@ fieldset[disabled] .btn-yahoo.active {
line-height: 30px;
}
.fc-color-picker > li .fa {
transition: -webkit-transform linear 0.3s;
transition: transform linear 0.3s;
}
.fc-color-picker > li .fa:hover {
-webkit-transform: rotate(30deg);
transform: rotate(30deg);
}
#add-new-event {
@ -4642,7 +4599,6 @@ fieldset[disabled] .btn-yahoo.active {
.main-footer {
margin-left: 0!important;
min-height: 0!important;
-webkit-transform: translate(0, 0) !important;
transform: translate(0, 0) !important;
}
.fixed .content-wrapper,
@ -4853,7 +4809,8 @@ fieldset[disabled] .btn-yahoo.active {
background-color: inherit;
}
.main-header .logo {
min-width: 380px;
width: 100% !important;
white-space: nowrap;
text-align: left;
display: block;
clear: both;
@ -5159,112 +5116,50 @@ a.logo.no-hover a:hover {
}
/* WRENCHING */
@-webkit-keyframes wrench {
0% {
-webkit-transform: rotate(-12deg);
}
8% {
-webkit-transform: rotate(12deg);
}
10% {
-webkit-transform: rotate(24deg);
}
18% {
-webkit-transform: rotate(-24deg);
}
20% {
-webkit-transform: rotate(-24deg);
}
28% {
-webkit-transform: rotate(24deg);
}
30% {
-webkit-transform: rotate(24deg);
}
38% {
-webkit-transform: rotate(-24deg);
}
40% {
-webkit-transform: rotate(-24deg);
}
48% {
-webkit-transform: rotate(24deg);
}
50% {
-webkit-transform: rotate(24deg);
}
58% {
-webkit-transform: rotate(-24deg);
}
60% {
-webkit-transform: rotate(-24deg);
}
68% {
-webkit-transform: rotate(24deg);
}
75% {
-webkit-transform: rotate(0deg);
}
}
@keyframes wrench {
0% {
-webkit-transform: rotate(-12deg);
transform: rotate(-12deg);
}
8% {
-webkit-transform: rotate(12deg);
transform: rotate(12deg);
}
10% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
18% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
20% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
28% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
30% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
38% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
40% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
48% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
50% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
58% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
60% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
68% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
75% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
}
@ -5282,91 +5177,44 @@ a.logo.no-hover a:hover {
-ms-transform-origin-x: 90%;
-ms-transform-origin-y: 35%;
-ms-transform-origin-z: initial;
-webkit-animation: wrench 2.5s ease infinite;
animation: wrench 2.5s ease infinite;
transform-origin-x: 90%;
transform-origin-y: 35%;
transform-origin-z: initial;
}
/* BELL */
@-webkit-keyframes ring {
0% {
-webkit-transform: rotate(-15deg);
}
2% {
-webkit-transform: rotate(15deg);
}
4% {
-webkit-transform: rotate(-18deg);
}
6% {
-webkit-transform: rotate(18deg);
}
8% {
-webkit-transform: rotate(-22deg);
}
10% {
-webkit-transform: rotate(22deg);
}
12% {
-webkit-transform: rotate(-18deg);
}
14% {
-webkit-transform: rotate(18deg);
}
16% {
-webkit-transform: rotate(-12deg);
}
18% {
-webkit-transform: rotate(12deg);
}
20% {
-webkit-transform: rotate(0deg);
}
}
@keyframes ring {
0% {
-webkit-transform: rotate(-15deg);
transform: rotate(-15deg);
}
2% {
-webkit-transform: rotate(15deg);
transform: rotate(15deg);
}
4% {
-webkit-transform: rotate(-18deg);
transform: rotate(-18deg);
}
6% {
-webkit-transform: rotate(18deg);
transform: rotate(18deg);
}
8% {
-webkit-transform: rotate(-22deg);
transform: rotate(-22deg);
}
10% {
-webkit-transform: rotate(22deg);
transform: rotate(22deg);
}
12% {
-webkit-transform: rotate(-18deg);
transform: rotate(-18deg);
}
14% {
-webkit-transform: rotate(18deg);
transform: rotate(18deg);
}
16% {
-webkit-transform: rotate(-12deg);
transform: rotate(-12deg);
}
18% {
-webkit-transform: rotate(12deg);
transform: rotate(12deg);
}
20% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
}
@ -5384,142 +5232,68 @@ a.logo.no-hover a:hover {
-ms-transform-origin-x: 50%;
-ms-transform-origin-y: 0px;
-ms-transform-origin-z: initial;
-webkit-animation: ring 2s ease infinite;
animation: ring 2s ease infinite;
transform-origin-x: 50%;
transform-origin-y: 0px;
transform-origin-z: initial;
}
/* VERTICAL */
@-webkit-keyframes vertical {
0% {
-webkit-transform: translate(0, -3px);
}
4% {
-webkit-transform: translate(0, 3px);
}
8% {
-webkit-transform: translate(0, -3px);
}
12% {
-webkit-transform: translate(0, 3px);
}
16% {
-webkit-transform: translate(0, -3px);
}
20% {
-webkit-transform: translate(0, 3px);
}
22% {
-webkit-transform: translate(0, 0);
}
}
@keyframes vertical {
0% {
-webkit-transform: translate(0, -3px);
transform: translate(0, -3px);
}
4% {
-webkit-transform: translate(0, 3px);
transform: translate(0, 3px);
}
8% {
-webkit-transform: translate(0, -3px);
transform: translate(0, -3px);
}
12% {
-webkit-transform: translate(0, 3px);
transform: translate(0, 3px);
}
16% {
-webkit-transform: translate(0, -3px);
transform: translate(0, -3px);
}
20% {
-webkit-transform: translate(0, 3px);
transform: translate(0, 3px);
}
22% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
}
.faa-vertical.animated,
.faa-vertical.animated-hover:hover {
-webkit-animation: vertical 2s ease infinite;
animation: vertical 2s ease infinite;
}
/* HORIZONTAL */
@-webkit-keyframes horizontal {
0% {
-webkit-transform: translate(0, 0);
}
6% {
-webkit-transform: translate(5px, 0);
}
12% {
-webkit-transform: translate(0, 0);
}
18% {
-webkit-transform: translate(5px, 0);
}
24% {
-webkit-transform: translate(0, 0);
}
30% {
-webkit-transform: translate(5px, 0);
}
36% {
-webkit-transform: translate(0, 0);
}
}
@keyframes horizontal {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
6% {
-webkit-transform: translate(5px, 0);
transform: translate(5px, 0);
}
12% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
18% {
-webkit-transform: translate(5px, 0);
transform: translate(5px, 0);
}
24% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
30% {
-webkit-transform: translate(5px, 0);
transform: translate(5px, 0);
}
36% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
}
.faa-horizontal.animated,
.faa-horizontal.animated-hover:hover {
-webkit-animation: horizontal 2s ease infinite;
animation: horizontal 2s ease infinite;
}
/* FLASHING */
@-webkit-keyframes flash {
0%,
100%,
50% {
opacity: 1;
}
25%,
75% {
opacity: 0;
}
}
@keyframes flash {
0%,
100%,
@ -5533,132 +5307,71 @@ a.logo.no-hover a:hover {
}
.faa-flash.animated,
.faa-flash.animated-hover:hover {
-webkit-animation: flash 2s ease infinite;
animation: flash 2s ease infinite;
}
/* BOUNCE */
@-webkit-keyframes bounce {
0%,
100%,
20%,
50%,
80% {
-webkit-transform: translateY(0);
}
40% {
-webkit-transform: translateY(-15px);
}
60% {
-webkit-transform: translateY(-15px);
}
}
@keyframes bounce {
0%,
10%,
20%,
50%,
80% {
-webkit-transform: translateY(0);
transform: translateY(0);
}
40% {
-webkit-transform: translateY(-15px);
transform: translateY(-15px);
}
60% {
-webkit-transform: translateY(-15px);
transform: translateY(-15px);
}
}
.faa-bounce.animated,
.faa-bounce.animated-hover:hover {
-webkit-animation: bounce 2s ease infinite;
animation: bounce 2s ease infinite;
}
/* SPIN */
@-webkit-keyframes spin {
0% {
-webkit-transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
}
}
@keyframes spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
}
.faa-spin.animated,
.faa-spin.animated-hover:hover {
-webkit-animation: spin 1.5s linear infinite;
animation: spin 1.5s linear infinite;
}
/* FLOAT */
@-webkit-keyframes float {
0% {
-webkit-transform: translateY(0);
}
50% {
-webkit-transform: translateY(-6px);
}
100% {
-webkit-transform: translateY(0);
}
}
@keyframes float {
0% {
-webkit-transform: translateY(0);
transform: translateY(0);
}
50% {
-webkit-transform: translateY(-6px);
transform: translateY(-6px);
}
100% {
-webkit-transform: translateY(0);
transform: translateY(0);
}
}
.faa-float.animated,
.faa-float.animated-hover:hover {
-webkit-animation: float 2s linear infinite;
animation: float 2s linear infinite;
}
/* PULSE */
@-webkit-keyframes pulse {
0% {
-webkit-transform: scale(1);
}
50% {
-webkit-transform: scale(0.8);
}
100% {
-webkit-transform: scale(1);
}
}
@keyframes pulse {
0% {
-webkit-transform: scale(1.1);
transform: scale(1.1);
}
50% {
-webkit-transform: scale(0.8);
transform: scale(0.8);
}
100% {
-webkit-transform: scale(1);
transform: scale(1);
}
}
.faa-pulse.animated,
.faa-pulse.animated-hover:hover {
-webkit-animation: pulse 2s linear infinite;
animation: pulse 2s linear infinite;
}
/* SHAKE */

File diff suppressed because one or more lines are too long

View file

@ -57,7 +57,6 @@ body {
.content-wrapper,
.right-side,
.main-footer {
transition: -webkit-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
transition: transform 0.3s ease-in-out, margin 0.3s ease-in-out;
margin-left: 230px;
z-index: 820;
@ -85,7 +84,6 @@ body {
.sidebar-open .content-wrapper,
.sidebar-open .right-side,
.sidebar-open .main-footer {
-webkit-transform: translate(230px, 0);
transform: translate(230px, 0);
}
}
@ -427,7 +425,6 @@ a:focus {
min-height: 100%;
width: 230px;
z-index: 810;
transition: -webkit-transform 0.3s ease-in-out, width 0.3s ease-in-out;
transition: transform 0.3s ease-in-out, width 0.3s ease-in-out;
}
@media (max-width: 767px) {
@ -439,21 +436,18 @@ a:focus {
@media (max-width: 767px) {
.main-sidebar,
.left-side {
-webkit-transform: translate(-230px, 0);
transform: translate(-230px, 0);
}
}
@media (min-width: 768px) {
.sidebar-collapse .main-sidebar,
.sidebar-collapse .left-side {
-webkit-transform: translate(-230px, 0);
transform: translate(-230px, 0);
}
}
@media (max-width: 767px) {
.sidebar-open .main-sidebar,
.sidebar-open .left-side {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
}
@ -539,7 +533,6 @@ a:focus {
margin-top: 3px;
}
.sidebar-menu li.active > a > .fa-angle-left {
-webkit-transform: rotate(-90deg);
transform: rotate(-90deg);
}
.sidebar-menu li.active > .treeview-menu {
@ -583,7 +576,6 @@ a:focus {
z-index: 840;
}
.sidebar-mini.sidebar-collapse .main-sidebar {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
width: 50px!important;
z-index: 850;
@ -1150,58 +1142,30 @@ a:focus {
/* Add fade animation to dropdown menus by appending
the class .animated-dropdown-menu to the .dropdown-menu ul (or ol)*/
.open:not(.dropup) > .animated-dropdown-menu {
-webkit-backface-visibility: visible !important;
backface-visibility: visible !important;
-webkit-animation: flipInX 0.7s both;
animation: flipInX 0.7s both;
}
@keyframes flipInX {
0% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
transition-timing-function: ease-in;
opacity: 0;
}
40% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
transition-timing-function: ease-in;
}
60% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
opacity: 1;
}
80% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
}
100% {
-webkit-transform: perspective(400px);
transform: perspective(400px);
}
}
@-webkit-keyframes flipInX {
0% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
-webkit-transition-timing-function: ease-in;
opacity: 0;
}
40% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
-webkit-transition-timing-function: ease-in;
}
60% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
opacity: 1;
}
80% {
-webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
}
100% {
-webkit-transform: perspective(400px);
}
}
/* Fix dropdown menu in navbars */
.navbar-custom-menu > .navbar-nav > li {
position: relative;
@ -2495,11 +2459,9 @@ table.text-center th {
padding: 0;
}
.direct-chat.chat-pane-open .direct-chat-contacts {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
.direct-chat-messages {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
padding: 10px;
height: 250px;
@ -2522,7 +2484,6 @@ table.text-center th {
}
.direct-chat-messages,
.direct-chat-contacts {
transition: -webkit-transform 0.5s ease-in-out;
transition: transform 0.5s ease-in-out;
}
.direct-chat-text {
@ -2586,11 +2547,9 @@ table.text-center th {
color: #999;
}
.direct-chat-contacts-open .direct-chat-contacts {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
.direct-chat-contacts {
-webkit-transform: translate(101%, 0);
transform: translate(101%, 0);
position: absolute;
top: 0;
@ -3943,11 +3902,9 @@ fieldset[disabled] .btn-yahoo.active {
line-height: 30px;
}
.fc-color-picker > li .fa {
transition: -webkit-transform linear 0.3s;
transition: transform linear 0.3s;
}
.fc-color-picker > li .fa:hover {
-webkit-transform: rotate(30deg);
transform: rotate(30deg);
}
#add-new-event {
@ -4642,7 +4599,6 @@ fieldset[disabled] .btn-yahoo.active {
.main-footer {
margin-left: 0!important;
min-height: 0!important;
-webkit-transform: translate(0, 0) !important;
transform: translate(0, 0) !important;
}
.fixed .content-wrapper,
@ -4853,7 +4809,8 @@ fieldset[disabled] .btn-yahoo.active {
background-color: inherit;
}
.main-header .logo {
min-width: 380px;
width: 100% !important;
white-space: nowrap;
text-align: left;
display: block;
clear: both;
@ -5159,112 +5116,50 @@ a.logo.no-hover a:hover {
}
/* WRENCHING */
@-webkit-keyframes wrench {
0% {
-webkit-transform: rotate(-12deg);
}
8% {
-webkit-transform: rotate(12deg);
}
10% {
-webkit-transform: rotate(24deg);
}
18% {
-webkit-transform: rotate(-24deg);
}
20% {
-webkit-transform: rotate(-24deg);
}
28% {
-webkit-transform: rotate(24deg);
}
30% {
-webkit-transform: rotate(24deg);
}
38% {
-webkit-transform: rotate(-24deg);
}
40% {
-webkit-transform: rotate(-24deg);
}
48% {
-webkit-transform: rotate(24deg);
}
50% {
-webkit-transform: rotate(24deg);
}
58% {
-webkit-transform: rotate(-24deg);
}
60% {
-webkit-transform: rotate(-24deg);
}
68% {
-webkit-transform: rotate(24deg);
}
75% {
-webkit-transform: rotate(0deg);
}
}
@keyframes wrench {
0% {
-webkit-transform: rotate(-12deg);
transform: rotate(-12deg);
}
8% {
-webkit-transform: rotate(12deg);
transform: rotate(12deg);
}
10% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
18% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
20% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
28% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
30% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
38% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
40% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
48% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
50% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
58% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
60% {
-webkit-transform: rotate(-24deg);
transform: rotate(-24deg);
}
68% {
-webkit-transform: rotate(24deg);
transform: rotate(24deg);
}
75% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
}
@ -5282,91 +5177,44 @@ a.logo.no-hover a:hover {
-ms-transform-origin-x: 90%;
-ms-transform-origin-y: 35%;
-ms-transform-origin-z: initial;
-webkit-animation: wrench 2.5s ease infinite;
animation: wrench 2.5s ease infinite;
transform-origin-x: 90%;
transform-origin-y: 35%;
transform-origin-z: initial;
}
/* BELL */
@-webkit-keyframes ring {
0% {
-webkit-transform: rotate(-15deg);
}
2% {
-webkit-transform: rotate(15deg);
}
4% {
-webkit-transform: rotate(-18deg);
}
6% {
-webkit-transform: rotate(18deg);
}
8% {
-webkit-transform: rotate(-22deg);
}
10% {
-webkit-transform: rotate(22deg);
}
12% {
-webkit-transform: rotate(-18deg);
}
14% {
-webkit-transform: rotate(18deg);
}
16% {
-webkit-transform: rotate(-12deg);
}
18% {
-webkit-transform: rotate(12deg);
}
20% {
-webkit-transform: rotate(0deg);
}
}
@keyframes ring {
0% {
-webkit-transform: rotate(-15deg);
transform: rotate(-15deg);
}
2% {
-webkit-transform: rotate(15deg);
transform: rotate(15deg);
}
4% {
-webkit-transform: rotate(-18deg);
transform: rotate(-18deg);
}
6% {
-webkit-transform: rotate(18deg);
transform: rotate(18deg);
}
8% {
-webkit-transform: rotate(-22deg);
transform: rotate(-22deg);
}
10% {
-webkit-transform: rotate(22deg);
transform: rotate(22deg);
}
12% {
-webkit-transform: rotate(-18deg);
transform: rotate(-18deg);
}
14% {
-webkit-transform: rotate(18deg);
transform: rotate(18deg);
}
16% {
-webkit-transform: rotate(-12deg);
transform: rotate(-12deg);
}
18% {
-webkit-transform: rotate(12deg);
transform: rotate(12deg);
}
20% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
}
@ -5384,142 +5232,68 @@ a.logo.no-hover a:hover {
-ms-transform-origin-x: 50%;
-ms-transform-origin-y: 0px;
-ms-transform-origin-z: initial;
-webkit-animation: ring 2s ease infinite;
animation: ring 2s ease infinite;
transform-origin-x: 50%;
transform-origin-y: 0px;
transform-origin-z: initial;
}
/* VERTICAL */
@-webkit-keyframes vertical {
0% {
-webkit-transform: translate(0, -3px);
}
4% {
-webkit-transform: translate(0, 3px);
}
8% {
-webkit-transform: translate(0, -3px);
}
12% {
-webkit-transform: translate(0, 3px);
}
16% {
-webkit-transform: translate(0, -3px);
}
20% {
-webkit-transform: translate(0, 3px);
}
22% {
-webkit-transform: translate(0, 0);
}
}
@keyframes vertical {
0% {
-webkit-transform: translate(0, -3px);
transform: translate(0, -3px);
}
4% {
-webkit-transform: translate(0, 3px);
transform: translate(0, 3px);
}
8% {
-webkit-transform: translate(0, -3px);
transform: translate(0, -3px);
}
12% {
-webkit-transform: translate(0, 3px);
transform: translate(0, 3px);
}
16% {
-webkit-transform: translate(0, -3px);
transform: translate(0, -3px);
}
20% {
-webkit-transform: translate(0, 3px);
transform: translate(0, 3px);
}
22% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
}
.faa-vertical.animated,
.faa-vertical.animated-hover:hover {
-webkit-animation: vertical 2s ease infinite;
animation: vertical 2s ease infinite;
}
/* HORIZONTAL */
@-webkit-keyframes horizontal {
0% {
-webkit-transform: translate(0, 0);
}
6% {
-webkit-transform: translate(5px, 0);
}
12% {
-webkit-transform: translate(0, 0);
}
18% {
-webkit-transform: translate(5px, 0);
}
24% {
-webkit-transform: translate(0, 0);
}
30% {
-webkit-transform: translate(5px, 0);
}
36% {
-webkit-transform: translate(0, 0);
}
}
@keyframes horizontal {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
6% {
-webkit-transform: translate(5px, 0);
transform: translate(5px, 0);
}
12% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
18% {
-webkit-transform: translate(5px, 0);
transform: translate(5px, 0);
}
24% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
30% {
-webkit-transform: translate(5px, 0);
transform: translate(5px, 0);
}
36% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
}
.faa-horizontal.animated,
.faa-horizontal.animated-hover:hover {
-webkit-animation: horizontal 2s ease infinite;
animation: horizontal 2s ease infinite;
}
/* FLASHING */
@-webkit-keyframes flash {
0%,
100%,
50% {
opacity: 1;
}
25%,
75% {
opacity: 0;
}
}
@keyframes flash {
0%,
100%,
@ -5533,132 +5307,71 @@ a.logo.no-hover a:hover {
}
.faa-flash.animated,
.faa-flash.animated-hover:hover {
-webkit-animation: flash 2s ease infinite;
animation: flash 2s ease infinite;
}
/* BOUNCE */
@-webkit-keyframes bounce {
0%,
100%,
20%,
50%,
80% {
-webkit-transform: translateY(0);
}
40% {
-webkit-transform: translateY(-15px);
}
60% {
-webkit-transform: translateY(-15px);
}
}
@keyframes bounce {
0%,
10%,
20%,
50%,
80% {
-webkit-transform: translateY(0);
transform: translateY(0);
}
40% {
-webkit-transform: translateY(-15px);
transform: translateY(-15px);
}
60% {
-webkit-transform: translateY(-15px);
transform: translateY(-15px);
}
}
.faa-bounce.animated,
.faa-bounce.animated-hover:hover {
-webkit-animation: bounce 2s ease infinite;
animation: bounce 2s ease infinite;
}
/* SPIN */
@-webkit-keyframes spin {
0% {
-webkit-transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
}
}
@keyframes spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
}
.faa-spin.animated,
.faa-spin.animated-hover:hover {
-webkit-animation: spin 1.5s linear infinite;
animation: spin 1.5s linear infinite;
}
/* FLOAT */
@-webkit-keyframes float {
0% {
-webkit-transform: translateY(0);
}
50% {
-webkit-transform: translateY(-6px);
}
100% {
-webkit-transform: translateY(0);
}
}
@keyframes float {
0% {
-webkit-transform: translateY(0);
transform: translateY(0);
}
50% {
-webkit-transform: translateY(-6px);
transform: translateY(-6px);
}
100% {
-webkit-transform: translateY(0);
transform: translateY(0);
}
}
.faa-float.animated,
.faa-float.animated-hover:hover {
-webkit-animation: float 2s linear infinite;
animation: float 2s linear infinite;
}
/* PULSE */
@-webkit-keyframes pulse {
0% {
-webkit-transform: scale(1);
}
50% {
-webkit-transform: scale(0.8);
}
100% {
-webkit-transform: scale(1);
}
}
@keyframes pulse {
0% {
-webkit-transform: scale(1.1);
transform: scale(1.1);
}
50% {
-webkit-transform: scale(0.8);
transform: scale(0.8);
}
100% {
-webkit-transform: scale(1);
transform: scale(1);
}
}
.faa-pulse.animated,
.faa-pulse.animated-hover:hover {
-webkit-animation: pulse 2s linear infinite;
animation: pulse 2s linear infinite;
}
/* SHAKE */

File diff suppressed because one or more lines are too long

View file

@ -1,4 +1,4 @@
{
"assets/css/app.css": "assets/css/app-21c49439ba.css",
"assets/css/app.css": "assets/css/app-ec8e97e7ca.css",
"assets/js/all.js": "assets/js/all-edd914620a.js"
}

View file

@ -2,7 +2,8 @@
background-color: inherit;
}
.main-header .logo {
min-width: 380px;
width: 100% !important;
white-space: nowrap;
text-align: left;
display: block;
clear: both;

View file

@ -54,6 +54,15 @@
@if (\App\Models\Setting::getSettings()->custom_css)
{{ \App\Models\Setting::getSettings()->show_custom_css() }}
@endif
@media (max-width: 400px) {
.navbar-left {
margin: 2px;
}
.nav::after {
clear: none;
}
}
</style>
<script>
@ -85,19 +94,8 @@
<a href="#" style="color: white" class="sidebar-toggle btn btn-white" data-toggle="offcanvas" role="button">
<span class="sr-only">Toggle navigation</span>
</a>
<!-- Navbar Right Menu -->
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<!-- Sidebar toggle button-->
<li><a href="#" style="color: white; float: right;" class="sidebar-toggle-mobile visible-xs btn btn-white pull-right" data-toggle="offcanvas" role="button">
<span class="sr-only">Toggle navigation</span>
<i class="fa fa-bars"></i>
</a>
</li>
<div class="left-navblock">
<div class="pull-left">
<ul class="nav navbar-nav navbar-left">
<li class="left-navblock">
@if (\App\Models\Setting::getSettings()->brand == '3')
<a class="logo navbar-brand no-hover" href="{{ config('app.url') }}">
<img class="navbar-brand-img" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}">
@ -112,34 +110,35 @@
{{ \App\Models\Setting::getSettings()->site_name }}
</a>
@endif
</li>
</ul>
</div>
</div>
<!-- Navbar Right Menu -->
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
@if (Auth::user()->hasAccess('admin'))
@if (!Request::is('/'))
<li{!! (Request::is('hardware*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('hardware*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('hardware') }}">
<i class="fa fa-barcode"></i>
</a>
</li>
<li{!! (Request::is('admin/licenses*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/licenses*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/licenses') }}">
<i class="fa fa-floppy-o"></i>
</a>
</li>
<li{!! (Request::is('admin/accessories*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/accessories*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/accessories') }}">
<i class="fa fa-keyboard-o"></i>
</a>
</li>
<li{!! (Request::is('admin/consumables*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/consumables*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/consumables') }}">
<i class="fa fa-tint"></i>
</a>
</li>
<li{!! (Request::is('admin/components*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/components*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/components') }}">
<i class="fa fa-hdd-o"></i>
</a>
@ -195,7 +194,6 @@
<i class="fa fa-hdd-o"></i>
@lang('general.component')</a>
</li>
</ul>
</li>
@ -233,12 +231,7 @@
</a>
</li>
<!-- end task item -->
@endfor
</ul>
</li>
{{-- <li class="footer">
@ -262,7 +255,7 @@
<ul class="dropdown-menu">
<!-- User image -->
<li>
<li{!! (Request::is('account/profile') ? ' class="active"' : '') !!}>
<li {!! (Request::is('account/profile') ? ' class="active"' : '') !!}>
<a href="{{ route('view-assets') }}">
<i class="fa fa-check fa-fw"></i> @lang('general.viewassets')
</a>
@ -277,6 +270,7 @@
@lang('general.logout')
</a>
</li>
</li>
</ul>
</li>
@ -288,57 +282,57 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li{!! (Request::is('admin/settings/companies*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/settings/companies*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/companies') }}">
<i class="fa fa-building-o fa-fw"></i> @lang('general.companies')
</a>
</li>
<li{!! (Request::is('hardware/models*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('hardware/models*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('hardware/models') }}">
<i class="fa fa-th fa-fw"></i> @lang('general.asset_models')
</a>
</li>
<li{!! (Request::is('admin/settings/categories*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/settings/categories*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/categories') }}">
<i class="fa fa-check fa-fw"></i> @lang('general.categories')
</a>
</li>
<li{!! (Request::is('admin/settings/manufacturers*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/settings/manufacturers*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/manufacturers') }}">
<i class="fa fa-briefcase fa-fw"></i> @lang('general.manufacturers')
</a>
</li>
<li{!! (Request::is('admin/settings/suppliers*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/settings/suppliers*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/suppliers') }}">
<i class="fa fa-credit-card fa-fw"></i> @lang('general.suppliers')
</a>
</li>
<li{!! (Request::is('admin/settings/statuslabels*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/settings/statuslabels*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/statuslabels') }}">
<i class="fa fa-list fa-fw"></i> @lang('general.status_labels')
</a>
</li>
<li{!! (Request::is('admin/settings/depreciations*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/settings/depreciations*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/depreciations') }}">
<i class="fa fa-arrow-down fa-fw"></i> @lang('general.depreciation')
</a>
</li>
<li{!! (Request::is('admin/settings/locations*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/settings/locations*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/locations') }}">
<i class="fa fa-globe fa-fw"></i> @lang('general.locations')
</a>
</li>
<li{!! (Request::is('admin/groups*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/groups*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/groups') }}">
<i class="fa fa-group fa-fw"></i> @lang('general.groups')
</a>
</li>
<li{!! (Request::is('admin/settings/backups*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/settings/backups*') ? ' class="active"' : '') !!}>
<a href="{{ URL::to('admin/settings/backups') }}">
<i class="fa fa-download fa-fw"></i> @lang('admin/settings/general.backups')
</a>
</li>
<li{!! (Request::is('admin/custom_fields*') ? ' class="active"' : '') !!}>
<li {!! (Request::is('admin/custom_fields*') ? ' class="active"' : '') !!}>
<a href="{{ route('admin.custom_fields.index') }}">
<i class="fa fa-wrench fa-fw"></i> @lang('admin/custom_fields/general.custom_fields')
</a>
@ -349,17 +343,19 @@
<i class="fa fa-cog fa-fw"></i> @lang('general.settings')
</a>
</li>
</ul>
</li>
@endif
</ul>
</div>
</nav>
<a href="#" style="float:left" class="sidebar-toggle-mobile visible-xs btn" data-toggle="offcanvas" role="button">
<span class="sr-only">Toggle navigation</span>
<i class="fa fa-bars"></i>
</a>
<!-- Sidebar toggle button-->
</header>
<!-- Left side column. contains the logo and sidebar -->
<aside class="main-sidebar">
<!-- sidebar: style can be found in sidebar.less -->