diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js index bf00457..b2e0255 100644 --- a/app/scripts/controllers/main.js +++ b/app/scripts/controllers/main.js @@ -3,7 +3,15 @@ define(['app'], function (app) { app.controller('MainCtrl', function ($scope) { $scope.modalTShirtDesign = function() { // console.log($('#tshirt-design').length); - $('#tshirt-design').modal(); + $('#tshirt-design').modal( + { + backdrop: 'static', + keyboard: false + } + ); + }; + $scope.modalClose = function(){ + $('#tshirt-design').modal('hide'); } }); }); diff --git a/app/styles/main.css b/app/styles/main.css index d05f22f..511ffac 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -259,8 +259,48 @@ aside .step .finish-design button{ #tshirt-content .tshirt-choice ul li.focus .image{ border: 1px solid #ff0000; } +/*MODAL Design*/ +#tshirt-design{ + background-color: #000; +} +#tshirt-design .modal-dialog{ + width: 75%; + margin: 0 auto; +} +#tshirt-design .modal-dialog .modal-content{ + background-color: transparent; + border-radius: 0; + border: 0; +} +#tshirt-design .modal-dialog .modal-content .modal-header{ + padding: 0 0 10px 0; + border-bottom: 0; +} +#tshirt-design .modal-dialog .modal-content .modal-body{ + background-color: #ffffff; + padding: 0 0; +} +#tshirt-design header{ + border-bottom: 1px solid #DDDDDD; +} +#tshirt-design header ul.nav{ + padding-left: 0; + list-style: none; +} +#tshirt-design header ul.nav li{ + float: left; + padding: 10px 15px; + border-right: 1px solid #DDDDDD; +} +/*Aside modal*/ +.aside{ +} +.aside #choice-design-option{ + list-style: none; + padding-left: 0; +} /* Customize container */ @media (min-width: 768px) { .container { diff --git a/app/views/tshirt-design.html b/app/views/tshirt-design.html index 665490a..24ded64 100644 --- a/app/views/tshirt-design.html +++ b/app/views/tshirt-design.html @@ -1,16 +1,94 @@