Skip to content
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.

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

subiendo trabajo #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 29 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"parserOptions": {
"ecmaVersion": 6
},
"rules": {
"keyword-spacing": 1,
"space-before-function-paren": [1, "never"],
"eqeqeq": 1,
"space-infix-ops": 1,
"comma-spacing": 1,
"brace-style": 1,
"no-multiple-empty-lines": 1,
"camelcase": 1,
"func-call-spacing": 1,
"key-spacing": 1,
"semi": 1,
"no-floating-decimal": 1,
"no-multi-spaces": 1,
"object-property-newline": 1,
"padded-blocks": [1, "never"],
"space-before-blocks": 1,
"space-in-parens": 1,
"spaced-comment": 1,
"quotes": [1, "single"],
"id-length": [1, { "exceptions": ["i", "j", "x"] }],
"indent": [1, 2],
"no-array-constructor": 1
}
}
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"commerce": "lab-commerce"
}
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.vscode
node_modules
100 changes: 100 additions & 0 deletions assets/css/main.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
.row, .col{
padding: 0;
margin: 0;
}

#freeShipping{
background-color: black;
}
#freeShipping a, #freeShipping p{
color: white;
font-size: 14px;
padding: 1vh 0 0 0;
}

nav{
margin: 2vh 0;
}
nav img{
width: 15vh;
}

nav li, .someCategories li{
list-style-type: none;
display: inline;
padding: 0 5vh;
}

nav a, .show a, .someCategories a{
color: black;
text-decoration: none;
}

.someCategories a:hover, #signIn:hover, #signOut:hover{
color: grey;
text-decoration: underline;
}

#inlineFormInputGroup{
width: 40vh;
}

.show {
border : 1px solid #F0F8FF;
text-align: center;
}

/* ------------------ INICIO PRODUCTS */
.products{
width: 80%;
margin: 2vh auto;
padding: 1vh;
border-radius: 2vh;
}

.productImg{
object-fit: cover;
object-position: center;
}

.show li{
list-style-type: none;
}

.btnView{
background-color: black;
border: black;
color: white;
}

/* ------------------ FIN PRODUCTS */


/* --------- INICIO PAGINA DECO */
.shortcuts li{
display: inline;
list-style-type: none;
}

.shortcuts a{
text-decoration: none;
margin: 0 0.2vh;
color: black;
}

.departaments li{
list-style-type: none;
}

.departaments a{
text-decoration: none;
margin: 0 2vh;
color: black;
}

/* --------- FIN PAGINA DECO */

.show {
border : 1px solid #F0F8FF;
text-align: center;
}
Binary file added assets/img/capture_it.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/dream_big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/fab_faves.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/fab_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/favicon_insp.ico
Binary file not shown.
Binary file added assets/img/gifts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/turn_on.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions assets/js/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
'use strict';

(function() {
function init() {
let router = new Router([
new Route('home', 'home.html', true),
new Route('deco', 'deco.html'),
new Route('art', 'art.html'),
new Route('productinfo', 'productinfo.html')
]);
}
init();
}());


// $('#lol').click(function() {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

olvidaste borrar esto?

// $('p').css('color', 'red');
// });
Loading