fix navigation bar

master
Chakib Benziane 10 years ago
parent 8bdb988761
commit 6cddf3cf64

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

File diff suppressed because one or more lines are too long

@ -25,11 +25,11 @@
<div class="container-fluid main ng-cloak"> <div class="container-fluid main ng-cloak">
<div ng-view></div> <div ng-view></div>
</div> </div>
<div class="container-fluid dock animated fadeInUp ng-cloak" ng-class="{isProjects: selected == 1}" ng-controller="dockCtrl"> <div class="dock animated fadeInRight" ng-class="{isProjects: selected == 1}" ng-controller="dockCtrl">
<div ng-class="hovered && 'hovered'"class="hoverText"> <!-- <div ng-class="hovered && 'hovered'"class="hoverText">
<h3>{{icons[hoveredIndex].text}}</h3> <h3>{{icons[hoveredIndex].text}}</h3>
</div> </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> </div>

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

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.7.1 // Generated by CoffeeScript 1.8.0
(function() { (function() {
this.projectsCtrl = function($scope) { this.projectsCtrl = function($scope) {
$scope.carousels = { $scope.carousels = {
@ -41,16 +41,6 @@
text: 'Ideas' 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; $scope.selected = null;
defaultSelected = function() { defaultSelected = function() {
var icon, _i, _len, _ref, _results; var icon, _i, _len, _ref, _results;

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

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

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

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