fix navigation bar

This commit is contained in:
Chakib Benziane 2014-11-21 00:03:52 +01:00
parent 8bdb988761
commit 6cddf3cf64
9 changed files with 37 additions and 46 deletions

View File

@ -44,16 +44,15 @@ projectsCtrl.$inject = ['$scope']
,
]
$scope.hovered = false
# $scope.hovered = false
$scope.hoverText = ($index)->
$scope.hovered = true
$scope.hoveredIndex = $index
console.log $scope.hovered
# $scope.hoverText = ($index)->
# $scope.hovered = true
# $scope.hoveredIndex = $index
$scope.hoverOut = ()->
$scope.hovered = false
$scope.hoveredIndex = null
# $scope.hoverOut = ()->
# $scope.hovered = false
# $scope.hoveredIndex = null
$scope.selected = null

File diff suppressed because one or more lines are too long

View File

@ -25,11 +25,11 @@
<div class="container-fluid main ng-cloak">
<div ng-view></div>
</div>
<div class="container-fluid dock animated fadeInUp ng-cloak" ng-class="{isProjects: selected == 1}" ng-controller="dockCtrl">
<div ng-class="hovered && 'hovered'"class="hoverText">
<div class="dock animated fadeInRight" ng-class="{isProjects: selected == 1}" ng-controller="dockCtrl">
<!-- <div ng-class="hovered && 'hovered'"class="hoverText">
<h3>{{icons[hoveredIndex].text}}</h3>
</div>
<a ui-event="{ mouseover: 'hoverText($index)', mouseout: 'hoverOut()' }" ng-click="switch($index)" ng-class="selected == $index && 'active'" ng-repeat="icon in icons" href="javascript:void(0);"><i ng-class="[icon.class, icon.icon]"></i></a>
--> <a ui-event="{ mouseover: 'hoverText($index)', mouseout: 'hoverOut()' }" ng-click="switch($index)" ng-class="selected == $index && 'active'" ng-repeat="icon in icons" href="javascript:void(0);"><i ng-class="[icon.class, icon.icon]"></i></a>
</div>

View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.7.1
// Generated by CoffeeScript 1.8.0
(function() {
angular.module('myApp', ['myApp.filters', 'myApp.services', 'myApp.directives', 'ui', 'ui.directives']).config([
'$routeProvider', function($routeProvider) {

View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.7.1
// Generated by CoffeeScript 1.8.0
(function() {
this.projectsCtrl = function($scope) {
$scope.carousels = {
@ -41,16 +41,6 @@
text: 'Ideas'
}
];
$scope.hovered = false;
$scope.hoverText = function($index) {
$scope.hovered = true;
$scope.hoveredIndex = $index;
return console.log($scope.hovered);
};
$scope.hoverOut = function() {
$scope.hovered = false;
return $scope.hoveredIndex = null;
};
$scope.selected = null;
defaultSelected = function() {
var icon, _i, _len, _ref, _results;

View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.7.1
// Generated by CoffeeScript 1.8.0
(function() {
angular.module('myApp.directives', []).directive('appVersion', [
'version', function(version) {

View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.7.1
// Generated by CoffeeScript 1.8.0
(function() {
angular.module('myApp.filters', []).filter('interpolate', [
'version', function(version) {

View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.7.1
// Generated by CoffeeScript 1.8.0
(function() {
angular.module('myApp.services', []).value('version', '0.1');

View File

@ -20,6 +20,7 @@ body {
}
}
.btc-address {
@ -150,7 +151,7 @@ body {
.left-panel {
top: 0px;
height: 37rem;
height: auto;
overflow: hidden;
position: fixed;
@ -333,21 +334,20 @@ body {
}
.dock {
.animation-delay(1.5s);
width: 100%;
position: fixed;
bottom: 0;
.transition(all 200ms ease-in);
text-align: center;
.animation-delay(1s);
// .transition(all 200ms ease-in);
position: absolute;
right: 0px;
top: 10px;
width: 60px;
&.isProjects {
width: auto;
text-align: left;
// &.isProjects {
// text-align: left;
a {
font-size: .5em;
}
}
// a {
// font-size: .5em;
// }
// }
.hoverText {
@ -362,11 +362,13 @@ body {
a {
color: @dockIconColor;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.18);
padding-left: 1.5em;
padding-right: 1.5em;
.transition(all 100ms ease);
display: inline-block;
float: left;
position: relative;
width: 100%;
text-align: center;
font-size: .5em;
&:hover, &.active {
text-decoration: none;