Skip to content

Animations #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReggieSibley merged 18 commits into from
Oct 5, 2016
Merged

Animations #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
73f5901
trying to fix font sizes
Oct 5, 2016
15cf2bd
fixed top branding padding
Oct 5, 2016
cd88b83
code cleanup
Oct 5, 2016
2872fc7
navbar has colors that stay on clicking different tabs
Oct 5, 2016
57fc003
refactoring Dashboard style
Oct 5, 2016
40215c5
commented in a note about the webroot for cordova vs server
Oct 5, 2016
c97e428
removed this component
Oct 5, 2016
cc46183
resized inputs
Oct 5, 2016
d7b261a
reordered components, removed Settings
Oct 5, 2016
afce37a
just commiting to get rid of it, deprecated component
Oct 5, 2016
6f5ef61
capitalizing navbar component
Oct 5, 2016
114b7f6
unfinished commit, commented out styles
Oct 5, 2016
bf44514
un-capitalizing navbar
Oct 5, 2016
61bb10e
indented styles
Oct 5, 2016
a049bfa
viewport meta tag
Oct 5, 2016
e11285f
restorededit and save functionality on input field
Oct 5, 2016
03a2963
fixed all issues with goal component
Oct 5, 2016
6d2c44a
fixed merge conflicts
Oct 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ module.exports = {
index: path.resolve(__dirname, '../dist/index.html'),
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static',
assetsPublicPath: '/',
// remove the dot below if you want it for webroot vs cordova
assetsPublicPath: './',
productionSourceMap: true,
// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.
Expand Down
1 change: 1 addition & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title>Incentify</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
<!-- built files will be auto injected -->
Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
},
"dependencies": {
"vue": "^1.0.21",
"babel-runtime": "^6.0.0"
"animate.css": "^3.5.2",
"babel-runtime": "^6.0.0",
"vue": "^1.0.21"
},
"devDependencies": {
"babel-core": "^6.0.0",
Expand Down
36 changes: 13 additions & 23 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
import navbar from './components/navbar';
import topBranding from './components/top-branding';

// require('spectre.css/dist/spectre.css');
// require('bulma/css/bulma.css');
require('bulma/bulma.sass');
require('font-awesome/css/font-awesome.css');
require('animate.css/animate.css');
Expand All @@ -26,55 +24,47 @@
</script>

<style>
.global-font-size {
font-size: 50px;
}

.navbar-one {
position: fixed;
bottom: 0px;
position: fixed;
bottom: 0px;
width: 100%;
}
body {
align-items: center;
justify-content: center;
padding: 5px !important;
flex-wrap: nowrap !important;
background-color: ghostwhite !important;
}

.wrapper {
height: 81vh !important;
width: 100% !important;
}
.btn-padding {
padding: 10px !important;
font-size: 20px !important;
text-transform: uppercase !important;
height: 150px !important;
height: 81vh;
width: 100%;
}
/*

.red-nav {
color: red !important;
border-color: red !important;
background-color: white !important;
}

.red-nav:hover {
background-color: black !important;
color: white !important;
border-color: red !important;
background-color: white;
}

.red-nav:focus {
background-color: black !important;
color: white !important;
border-color: red !important;
background-color: white;
}

.red-nav:active {
background-color: black !important;
color: white !important;
border-color: white !important;
background-color: white;
}

.lil-marg {
margin-right: 25px !important;
}
} */
</style>
54 changes: 23 additions & 31 deletions src/components/Dashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,26 @@
<template>

<div class="global-font-size">
<div class="content">
<div class="is-mobile lil-marg">
<div class="has-text-right page-title">Dashboard</div>
</div>
<div class="card is-fullwidth margin-dash">
<div class="card-content">
<div class="content">
<strong>Goal Name</strong> username with GoalProvider
<progress class="progress is-small is-success" value="15" max="100">15%</progress>
percentage of goal completion%
</div>
</div>
</div>
<div class="card is-fullwidth margin-dash">

<div class="card is-fullwidth goal-vertical-spacing">
<div class="card-content">
<div class="content">
<strong>Treehouse</strong> comrww
<img src="../assets/treehouse-logo.png" class="is-pulled-right goal-provider-icon">
<h1><strong>Treehouse</strong> comrww <img src="../assets/treehouse-logo.png" class="is-pulled-right goal-provider-icon"></h1>
<progress class="progress is-small is-success" value="45" max="100">45%</progress>
45%
<h3>45% of {{55}} Points</h3> Time Remaining: 1 day, 23 hours, 21 minutes
</div>
</div>
</div>
<div class="card is-fullwidth margin-dash">

<div class="card is-fullwidth goal-vertical-spacing">
<div class="card-content">
<div class="content">
<strong>DuoLingo</strong> comrww
<img src="../assets/duolingo-logo.png" class="is-pulled-right goal-provider-icon">
<h1><strong>DuoLingo</strong> comrww <img src="../assets/duolingo-logo.png" class="is-pulled-right goal-provider-icon"></h1>
<progress class="progress is-small is-success" value="5" max="100">5%</progress>
5%
<h3>5% of {{55}} Points</h3> Time Remaining: 2 days, 3 hours, 10 minutes
</div>
</div>
</div>
Expand All @@ -40,8 +31,6 @@
<script>
export default {

// name: 'component_name',

data() {
return {

Expand All @@ -51,15 +40,18 @@ export default {
</script>

<style lang="css" scoped>
.margin-dash {
margin-top: 15px;
}
.page-title {
font-size: 40px;
color: #587272;
}
.goal-provider-icon {
height: 50px;
width: 50px;
}
.goal-vertical-spacing {
margin-top: .75rem;
}

.page-title {
font-size: 1.8rem;
color: #587272;
margin-right: 3%;
}

.goal-provider-icon {
height: 2.2rem;
width: 2.2rem;
}
</style>
Loading