updated angular routes and partials, wip theme
This commit is contained in:
parent
287ce3f2fe
commit
234d9288c3
@ -2,8 +2,8 @@ angular
|
||||
.module( 'myApp', ['myApp.filters', 'myApp.services', 'myApp.directives'])
|
||||
.config( ['$routeProvider', ($routeProvider)->
|
||||
|
||||
$routeProvider.when('/view1', {templateUrl: 'partials/partial1.html', controller: MyCtrl1})
|
||||
$routeProvider.when('/view2', {templateUrl: 'partials/partial2.html', controller: MyCtrl2})
|
||||
$routeProvider.otherwise({redirectTo: '/view1'})
|
||||
$routeProvider.when('/who_am_i', {templateUrl: 'partials/who_am_i.html', controller: MyCtrl1})
|
||||
$routeProvider.when('/timeline', {templateUrl: 'partials/timeline.html', controller: MyCtrl2})
|
||||
$routeProvider.otherwise({redirectTo: '/who_am_i'})
|
||||
])
|
||||
|
||||
|
@ -31,10 +31,10 @@
|
||||
'js/controllers.js',
|
||||
'js/filters.js',
|
||||
'js/directives.js',
|
||||
//'//cdnjs.cloudflare.com/ajax/libs/less.js/1.3.3/less.min.js',
|
||||
//'//cdnjs.cloudflare.com/ajax/libs/jquery/2.8.3/jquery.min.js',
|
||||
'lib/jquery/jquery.min.js',
|
||||
'lib/less/less.min.js',
|
||||
'//cdnjs.cloudflare.com/ajax/libs/less.js/1.3.3/less.min.js',
|
||||
'//cdnjs.cloudflare.com/ajax/libs/jquery/1.8.3/jquery.min.js',
|
||||
//'lib/jquery/jquery.min.js',
|
||||
//'lib/less/less.min.js',
|
||||
], function() {
|
||||
// when all is done, execute bootstrap angular application
|
||||
angular.bootstrap(document, ['myApp']);
|
||||
@ -56,7 +56,7 @@
|
||||
<!--</ul>-->
|
||||
|
||||
<div class="wrapper">
|
||||
<div class="left-menu ng-cloak">
|
||||
<div class="left-menu ng-cloak" ccontroller="menuCtrl">
|
||||
<div class="menu-wrapper">
|
||||
<div class="animated fadeInLeft ng-cloak portrait">
|
||||
<img src="img/me_tiny.png" alt="my portrait"/>
|
||||
@ -64,7 +64,7 @@
|
||||
<p class="baseline">Freelance <span class="select">WebApp</span> Developer</p>
|
||||
</div>
|
||||
<div class="animated fadeInUp ng-cloak">
|
||||
<p>Who Am I?<p>
|
||||
<p>Who Am I<p>
|
||||
</div>
|
||||
<div class="animated fadeInUp ng-cloak">
|
||||
<p>History<p>
|
||||
|
@ -3,16 +3,16 @@
|
||||
|
||||
angular.module('myApp', ['myApp.filters', 'myApp.services', 'myApp.directives']).config([
|
||||
'$routeProvider', function($routeProvider) {
|
||||
$routeProvider.when('/view1', {
|
||||
templateUrl: 'partials/partial1.html',
|
||||
$routeProvider.when('/who_am_i', {
|
||||
templateUrl: 'partials/who_am_i.html',
|
||||
controller: MyCtrl1
|
||||
});
|
||||
$routeProvider.when('/view2', {
|
||||
templateUrl: 'partials/partial2.html',
|
||||
$routeProvider.when('/timeline', {
|
||||
templateUrl: 'partials/timeline.html',
|
||||
controller: MyCtrl2
|
||||
});
|
||||
return $routeProvider.otherwise({
|
||||
redirectTo: '/view1'
|
||||
redirectTo: '/who_am_i'
|
||||
});
|
||||
}
|
||||
]);
|
||||
|
@ -12,22 +12,30 @@ body, html {
|
||||
|
||||
.left-menu{
|
||||
background: @white;
|
||||
-webkit-box-flex: 2;
|
||||
-webkit-box-flex: 2.2;
|
||||
width: 100%;
|
||||
border-left: 5px solid @orange;
|
||||
opacity: 0.5;
|
||||
.transition(opacity 300ms ease);
|
||||
|
||||
&:hover{
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.content {
|
||||
-webkit-box-flex: 1;
|
||||
width: 100%;
|
||||
background: @darkGrey;
|
||||
/*background: @darkGrey;*/
|
||||
/*background: url(http://subtlepatterns.subtlepatterns.netdna-cdn.com/patterns/stressed_linen.png);*/
|
||||
padding: 4.5em;
|
||||
p {
|
||||
font: 300 18px/28px @textFont;
|
||||
color: @white;
|
||||
color: @darkGrey;
|
||||
}
|
||||
h1, h2, h3, h4, h5{
|
||||
color: @orange;
|
||||
text-shadow: 0px 1px 1px rgba(3, 3, 3, 1);
|
||||
}
|
||||
h1 {
|
||||
font: 400 40px/40px @titleFont;
|
||||
@ -45,10 +53,12 @@ body, html {
|
||||
|
||||
.menu-wrapper {
|
||||
text-align: center;
|
||||
|
||||
div {
|
||||
-webkit-box-flex: 1;
|
||||
height: 100%;
|
||||
|
||||
|
||||
&:nth-child(4n + 1) {
|
||||
-webkit-animation-delay: 2.3s;
|
||||
}
|
||||
@ -75,17 +85,18 @@ body, html {
|
||||
cursor: pointer;
|
||||
.transition(all 300ms ease);
|
||||
border-left: 0px solid @orange;
|
||||
opacity: 0.7;
|
||||
|
||||
&:first-letter {
|
||||
font-weight: 400;
|
||||
color: @orange;
|
||||
}
|
||||
&:hover:first-letter {
|
||||
font-weight: 900;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
border-left-width: 10px;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@ -100,13 +111,13 @@ body, html {
|
||||
}
|
||||
|
||||
.portrait {
|
||||
background: @orange;
|
||||
img {
|
||||
width: 70px;
|
||||
height: 70px;
|
||||
border-radius: 50px;
|
||||
float: left;
|
||||
margin: 20px 0 20px 30px;
|
||||
margin: 20px 0 20px 10px;
|
||||
opacity: 0.8;
|
||||
}
|
||||
|
||||
p {
|
||||
|
@ -1,3 +1,3 @@
|
||||
<h1 class="animated fadeInLeft ng-cloak">This is a title</h1>
|
||||
<h1 class="animated fadeInLeft ng-cloak">Who Am I</h1>
|
||||
<p class="animated fadeInLeft ng-cloak">At this point I can no longer avoid giving a first, provisional statement of my own hypothesis concerning the origin of the “bad conscience”: it may sound rather strange and needs to be pondered, lived with, and slept on for a long time. I regard the bad conscience as the serious illness that man was bound to contract under the stress of the most fundamental change he ever experienced—that change which occurred when he found himself finally enclosed within the walls of society and of peace. The situation that faced sea animals when they were compelled to become land animals or perish was the same as that which faced these semi-animals, well adapted to the wilderness, to war, to prowling, to adventure: suddenly all their instincts were disvalued and “suspended.” From now on they had to walk on their feet and “bear themselves” whereas hitherto they had been borne by the water: a dreadful heaviness lay upon them. They felt unable to cope with the simplest undertakings; in this new world they no longer possessed their former guides, their regulating, unconscious and infallible drives: they were reduced to thinking, inferring, reckoning, coordinating cause and effect, these unfortunate creatures; they were reduced to their “consciousness,” their weakest and most fallible organ! I believe there has never been such a feeling of misery on earth, such a leaden discomfort and at the same time the old instincts had not suddenly ceased to make their usual demands. Only it was hardly or rarely possible to humor them: as a rule they had to seek new and, as it were, subterranean gratifications.
|
||||
This is the partial for view 1.</p>
|
8
scripts/rundev.sh
Executable file
8
scripts/rundev.sh
Executable file
@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
|
||||
# Run web server
|
||||
../scripts/web-server.js &
|
||||
|
||||
# Run coffee compile in watch mode
|
||||
coffee -w --compile --output ../app/js/ ../app/coffee/
|
Reference in New Issue
Block a user