From fd159746d98693b65f1c5691506c13522e58832d Mon Sep 17 00:00:00 2001
From: mattkrebs1974 <mattkrebsemail@gmail.com>
Date: Fri, 14 Feb 2020 12:11:20 -0500
Subject: [PATCH 1/9] smarter header looks better

---
 assets/app.css     | 8 ++++----
 assets/css/app.css | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/app.css b/assets/app.css
index 8de41ea..0322201 100644
--- a/assets/app.css
+++ b/assets/app.css
@@ -1,5 +1,5 @@
 .team-selection {
-
+font-size:120% !important;
 display:inline-block;
 height:120px;
 width:220px;
@@ -32,7 +32,6 @@ header{
 }
 
 header section{
-  font-size: 250%;
   max-width:80%;
   color:white;
   background:rgba(0,0,0,1); 
@@ -50,6 +49,7 @@ header section{
   top:0px;
   left:0px;
  
+ 
   
 }
 #hero1{
@@ -82,7 +82,7 @@ header section{
 
 .copy{
   position:absolute; 
-  top:61%; 
+  top:55%; 
   height:10em; 
   margin-top:-5em; 
   width:100%;
@@ -99,7 +99,7 @@ header section{
 h1{
   margin:0px;
   font-family: 'Roboto Slab', serif;
-  font-weight:400;
+  font: weight 400;
   font-size:32px;
   padding:0px 20px;
 }
diff --git a/assets/css/app.css b/assets/css/app.css
index d275f29..9504b29 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -31,7 +31,7 @@ header{
 }
 
 header section{
-  font-size: 250%;
+  font-size: 120%;
   max-width:80%;
   color:white;
   background:rgba(0,0,0,1); 

From 15d4429e3cada3652a1e67d679d77f9727579756 Mon Sep 17 00:00:00 2001
From: Tim-Shaffer <tcshaf24@ptd.net>
Date: Fri, 14 Feb 2020 12:16:03 -0500
Subject: [PATCH 2/9] corrected css location in assets and call within
 index.html

---
 assets/app.css     | 176 ---------------------------------------------
 assets/css/app.css |  11 ++-
 index.html         |   8 +--
 3 files changed, 12 insertions(+), 183 deletions(-)
 delete mode 100644 assets/app.css

diff --git a/assets/app.css b/assets/app.css
deleted file mode 100644
index 8de41ea..0000000
--- a/assets/app.css
+++ /dev/null
@@ -1,176 +0,0 @@
-.team-selection {
-
-display:inline-block;
-height:120px;
-width:220px;
-border:1px solid #ccc;
-font:16px/26px Georgia, Garamond, Serif;
-overflow:auto;
-text-align:left;
-}
-
-@import "compass/css3";
-
-html, body{
-  margin:0px; padding:0px;
-}
-
-*, *:after, *:before {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-
-header{
-  text-align: Center;
-  z-index: 1;
-  position:fixed; 
-  width:100%; 
-  height: inherit; 
-  background:rgba(#fff);
- 
-}
-
-header section{
-  font-size: 250%;
-  max-width:80%;
-  color:white;
-  background:rgba(0,0,0,1); 
-  display:inline-block; 
-  padding:10px 30px; 
-  height: auto;
-  line-height: inherit; 
-  text-align:center;
-  font-family: 'Roboto Slab', serif; 
-  text-decoration:none;
-  text-transform:uppercase; 
-  letter-spacing:2px; 
-  font-weight:700;
-  position: relative;
-  top:0px;
-  left:0px;
- 
-  
-}
-#hero1{
- background:url(https://media1.giphy.com/media/kvYQSEwUPhtMCYS98k/giphy.gif?cid=790b7611968104dca6bc7153bece0a9944cf29af130d0fb1&amp);
-  background-size:cover;
-  background-position:center center;
-  background-attachment:fixed;
- 
-}
-#hero2{background: url(https://media3.giphy.com/media/6odUwsfT1xl1fuhXlM/giphy.gif?cid=790b7611c968023fd25245e5375cda7151fa544dd6b646f8&amp);
-  background-size:cover;
-  background-position:center center;
-  background-attachment:fixed;
-}
-.hero, .content{
-  text-align:center; 
-  position:relative;
-  width: 100%;
-}
-
-.inner{
-  min-height:600px;
-  position: relative;
-
-}
-
-.hero .inner{
-  background: rgba(0,0,0,0.6) url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAD0lEQVQIW2NkQABjRmQOAAM+AGkQsDBSAAAAAElFTkSuQmCC) repeat;}
-
-
-.copy{
-  position:absolute; 
-  top:61%; 
-  height:10em; 
-  margin-top:-5em; 
-  width:100%;
-}
-
-.hero h1, .hero p{ 
-  color:#fff;
-}
-
-.content h1, .content p{
-  color:#333;
-}
-
-h1{
-  margin:0px;
-  font-family: 'Roboto Slab', serif;
-  font-weight:400;
-  font-size:32px;
-  padding:0px 20px;
-}
-
-p{
-  font-family: 'Noto Sans', sans-serif; 
-  font-size:14px;
-  padding:0px 20px;
-}
-
-
-.carousel {
-    background:#512DA8;
-}
-
-.carousel-item {
-  height: 300px;
- 
-}
-
-.carousel-item img {
-    position: absolute;
-    top: 0;
-    left: 0;
-    min-height: 300px;
-}
-
-.carousel-caption {
-
-    background-color:rgba(0,0,0,.3);
-    padding: 20px 20px 0 20px;
-    position:absolute;
-    right:0px;
-    left:5%;
-    top:30px;
-    height: 250px;
-    width: 90%;
-    z-index: 0;
-
-}
-
-
-
-
- 
-.carousel-indicators {
-
-z-index: 0;
-
-
-}
-
- 
-.carousel-control-prev {
-
-z-index: 0;
-
-
-}
- 
-.carousel-control-next {
-
-z-index: 0;
-
-
-}
-#logo{
-opacity: .3;
-
-
-}
-
-
-
diff --git a/assets/css/app.css b/assets/css/app.css
index d275f29..8de41ea 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -28,6 +28,7 @@ header{
   width:100%; 
   height: inherit; 
   background:rgba(#fff);
+ 
 }
 
 header section{
@@ -45,9 +46,10 @@ header section{
   text-transform:uppercase; 
   letter-spacing:2px; 
   font-weight:700;
-  position:relative;
+  position: relative;
   top:0px;
   left:0px;
+ 
   
 }
 #hero1{
@@ -55,6 +57,7 @@ header section{
   background-size:cover;
   background-position:center center;
   background-attachment:fixed;
+ 
 }
 #hero2{background: url(https://media3.giphy.com/media/6odUwsfT1xl1fuhXlM/giphy.gif?cid=790b7611c968023fd25245e5375cda7151fa544dd6b646f8&amp);
   background-size:cover;
@@ -70,6 +73,7 @@ header section{
 .inner{
   min-height:600px;
   position: relative;
+
 }
 
 .hero .inner{
@@ -162,6 +166,11 @@ z-index: 0;
 
 
 }
+#logo{
+opacity: .3;
+
+
+}
 
 
 
diff --git a/index.html b/index.html
index 8378ff2..8bd13b7 100644
--- a/index.html
+++ b/index.html
@@ -13,7 +13,6 @@
 
 
     <!-- fontawesome link-->
-
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
 
     <!--  -->
@@ -34,11 +33,8 @@
     <!--  -->
     <link href="https://fonts.googleapis.com/css?family=Rouge+Script&display=swap" rel="stylesheet">
 
-    <!-- Personal Stylesheet -->
-
-   
-
-    <link href="./assets/css/app.css" rel="stylesheet" type="text/css">
+    <!-- Personal Stylesheet --> 
+    <link href="assets/css/app.css" rel="stylesheet" type="text/css">
 
 </head>
 

From 68274bccb9b38e974827f92979831e869f08af78 Mon Sep 17 00:00:00 2001
From: Tim-Shaffer <tcshaf24@ptd.net>
Date: Fri, 14 Feb 2020 12:26:07 -0500
Subject: [PATCH 3/9] added matts header section cahnges from slack

---
 assets/css/app.css | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/assets/css/app.css b/assets/css/app.css
index 8de41ea..118cf85 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -32,7 +32,7 @@ header{
 }
 
 header section{
-  font-size: 250%;
+  font-size: 120%;
   max-width:80%;
   color:white;
   background:rgba(0,0,0,1); 
@@ -46,12 +46,11 @@ header section{
   text-transform:uppercase; 
   letter-spacing:2px; 
   font-weight:700;
-  position: relative;
+  position:relative;
   top:0px;
-  left:0px;
- 
+  left:0px;}
+
   
-}
 #hero1{
  background:url(https://media1.giphy.com/media/kvYQSEwUPhtMCYS98k/giphy.gif?cid=790b7611968104dca6bc7153bece0a9944cf29af130d0fb1&amp);
   background-size:cover;

From 723394ff466d368090bfb5b02e69434094515b78 Mon Sep 17 00:00:00 2001
From: mattkrebs1974 <mattkrebsemail@gmail.com>
Date: Fri, 14 Feb 2020 15:22:50 -0500
Subject: [PATCH 4/9] positioning of the modal elements

---
 assets/css/app.css       | 10 +++++----
 assets/javascript/app.js |  5 +++++
 index.html               | 48 ++++++++++++++++++++++------------------
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/assets/css/app.css b/assets/css/app.css
index 118cf85..bfd2f09 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -7,6 +7,7 @@ border:1px solid #ccc;
 font:16px/26px Georgia, Garamond, Serif;
 overflow:auto;
 text-align:left;
+
 }
 
 @import "compass/css3";
@@ -33,7 +34,7 @@ header{
 
 header section{
   font-size: 120%;
-  max-width:80%;
+  max-width:100%;
   color:white;
   background:rgba(0,0,0,1); 
   display:inline-block; 
@@ -48,7 +49,8 @@ header section{
   font-weight:700;
   position:relative;
   top:0px;
-  left:0px;}
+  left:0px;
+}
 
   
 #hero1{
@@ -76,7 +78,7 @@ header section{
 }
 
 .hero .inner{
-  background: rgba(0,0,0,0.6) url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAD0lEQVQIW2NkQABjRmQOAAM+AGkQsDBSAAAAAElFTkSuQmCC) repeat;}
+  background: rgba(0,0,0,.6) url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAD0lEQVQIW2NkQABjRmQOAAM+AGkQsDBSAAAAAElFTkSuQmCC) repeat;}
 
 
 .copy{
@@ -166,7 +168,7 @@ z-index: 0;
 
 }
 #logo{
-opacity: .3;
+opacity: 1;
 
 
 }
diff --git a/assets/javascript/app.js b/assets/javascript/app.js
index 271ca37..9268c5a 100644
--- a/assets/javascript/app.js
+++ b/assets/javascript/app.js
@@ -404,6 +404,11 @@ function setBackgroundColorNHL(team) {
         if (team === nhlArray[j]) {
             $('#logo').attr('style', 'background:' + primaryColorNHL + ';color:' + secondaryColorNHL + ';"');
         }
+        $("#modalHeading").attr('style', 'background:' + primaryColorNHL + ';color:' + secondaryColorNHL + ';"');
+
+
+
+
     };
 };
 
diff --git a/index.html b/index.html
index 8bd13b7..d1a97a1 100644
--- a/index.html
+++ b/index.html
@@ -44,25 +44,26 @@
     <!-- HTML for modal  -->
 
     <div id="selectLeagureAndTeam" class="modal fade" role="dialog">
-        <div class="modal-dialog modal-lg" style="height: inherit;" role="content">
+        <div class="modal-dialog modal-lg" style="height: inherit; margin-top:100px;" role="content">
             <!-- Modal content-->
             <div class="modal-content">
                 <div class="modal-header" style="background: gray">
-                    <h4 class="modal-title" style="color:white">Register Here!</h4>
+                    <h4 class="modal-title" style="color:white" >Register Here!</h4>
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
                 </div>
                 <div class="modal-body">
                     <form>
 
 
-                        <div class="card-body col-12" style="background-color: #999999; position: align-self-center">
+                        <div class="card-body col-12" style="background-color: #999999; position: align-self-center;">
 
 
 
 
 
                             <div class="row">
-                                <div class="col-5">
+                                <div class="col-lg-4" 
+                                style="text-align: center;">
                                     <fieldset data-role="controlgroup" data-type="horizontal">
                                         <legend>Select A League:</legend>
                                         <div class="radio">
@@ -84,11 +85,12 @@ <h4 class="modal-title" style="color:white">Register Here!</h4>
                                     </fieldset>
                                 </div>
 
-                                <div class="col-5">
+                                <div class="col-lg-4">
+                                    <div class="d-flex justify-content-center">
 
                                     <!-- New HTML for dropdown -->
 
-                                    <div class="dropdown" id="team-dropdown">
+                                    <div class="dropdown" id="team-dropdown" style="margin-bottom: 120px;left:-20px;">
                                         <button class="btn btn-secondary dropdown-toggle" type="button"
                                             id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true"
                                             aria-expanded="false">
@@ -120,26 +122,30 @@ <h4 class="modal-title" style="color:white">Register Here!</h4>
 
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col-5">
-                                    <br>
-                                    <label for="Name" style="color:black">Name:</label>
-                                    <input style="width:140px; position: align-self-center;" id="name" type="text"
+                            
+                                <div class="col-lg-4">
+                                   
+                                    <div class="d-flex justify-content-center">
+                                    
+                                    <label for="Name" style="color:black; margin-top:30px;">Name:</label>
+                                    <input style="width:140px; position: align-self-center; margin-top:30px;" id="name" type="text"
                                         class="form-control" name="fullname"><br>
 
                                 </div>
+                                <br>
+                                <div class="row">
+                                    <div class="col-12">
+                                <div class="d-flex justify-content-center">
+                                    <button type="submit" class="btn btn-primary" id="sub-button" data-dismiss="modal">Submit</button>
+                                
+                                
+                                </div>
+</div>
+                                </div>
 
-                                <div class="col-5">
-                                    <br>
-                                    <br>
-                                    <br>
-                                    <div class="d-flex justify-content-left">
-                                        <button type="submit" class="btn btn-primary" id="sub-button"
-                                            data-dismiss="modal">Submit</button>
-
-
-                                    </div>
                                 </div>
+
+                                         
                             </div>
 
 

From 2154b1561acab0f1cfd2a6b902e08e8c417c31e6 Mon Sep 17 00:00:00 2001
From: mattkrebs1974 <mattkrebsemail@gmail.com>
Date: Fri, 14 Feb 2020 19:00:09 -0500
Subject: [PATCH 5/9] styled modal with team colors

---
 assets/css/app.css       |  4 ++++
 assets/javascript/app.js | 38 +++++++++++++++++++++++++++++++++-----
 index.html               |  4 ++--
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/assets/css/app.css b/assets/css/app.css
index bfd2f09..7e28cda 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -174,4 +174,8 @@ opacity: 1;
 }
 
 
+.names {
 
+
+  margin-top:30px;
+}
diff --git a/assets/javascript/app.js b/assets/javascript/app.js
index 9268c5a..216485e 100644
--- a/assets/javascript/app.js
+++ b/assets/javascript/app.js
@@ -49,7 +49,7 @@ let PcolsNFL = ["#A71930", "#97233F", "#241773", "#00338D", "#0085CA", "#0B162A"
 
 let ScolsNFL = ["#000000", "#000000", "#000000", "#C60C30", "#101820", "#C83803", "#000000", "#311D00", "#041E42",
     "#002244", "#B0B7BC", "#FFB612", "#A71930", "#A2AAAD", "#9F792C", "#FFB81C", "#FFC20E", "#866D4B",
-    "#FC4C02", "#4F2683", "#C60C30", "#101820", "#A71930", "#000000", "#000000", "#004C54", "#101820", "#B3995D",
+    "#FC4C02", "#4F2683", "#C60C30", "#101820", "#A71930", "#000000", "#000000", "#A5ACAF", "#101820", "#B3995D",
     "#69BE28", "#0A0A08", "#4B92DB", "#FFB612"
 ]; 
 
@@ -364,6 +364,14 @@ function setBackgroundColorNBA(team) {
 
         if (team === nbaArray[j]) {
             $('#logo').attr('style', 'background:' + primaryColorNBA + ';color:' + secondaryColorNBA + ';"');
+
+
+            $('.card-body').attr('style', 'background:' + primaryColorNBA +';color:' + secondaryColorNBA + ';"');
+
+            $('div.modal-header').attr('style', 'background:' + primaryColorNBA + ';color:' + secondaryColorNBA + ';"');
+
+            $('.names').attr('style', 'background:' + primaryColorNBA + ';color:' + secondaryColorNBA + ';"');
+
         }
     };
 };
@@ -377,6 +385,13 @@ function setBackgroundColorMLB(team) {
 
         if (team === mlbArray[j]) {
             $('#logo').attr('style', 'background:' + primaryColorMLB + ';color:' + secondaryColorMLB + ';"');
+
+            $('.card-body').attr('style', 'background:' + primaryColorMLB + ';color:' + secondaryColorMLB + ';"');
+
+            $('div.modal-header').attr('style', 'background:' + primaryColorMLB + ';color:' + secondaryColorMLB + ';"');
+
+            $('.names').attr('style', 'background:' + primaryColorMLB + ';color:' + secondaryColorMLB + ';"');
+
         }
     };
 };
@@ -389,7 +404,14 @@ function setBackgroundColorNFL(team) {
         var secondaryColorNFL = ScolsNFL[j];
 
         if (team === nflArray[j]) {
-            $('#logo').attr('style', 'background:' + primaryColorNFL + ';color:' + secondaryColorNFL + ';"');
+            $('#logo').attr('style', 'background:' + primaryColorNFL+ ';color:' + secondaryColorNFL + ';"');
+
+            $('.card-body').attr('style', 'background:' + primaryColorNFL + ';color:' + secondaryColorNFL + ';"');
+
+            $('div.modal-header').attr('style', 'background:' + primaryColorNFL + ';color:' + secondaryColorNFL + ';"');
+
+            $('.names').attr('style', 'background:' + primaryColorNFL + ';color:' + secondaryColorNFL + ';"');
+
         }
     };
 };
@@ -403,8 +425,14 @@ function setBackgroundColorNHL(team) {
 
         if (team === nhlArray[j]) {
             $('#logo').attr('style', 'background:' + primaryColorNHL + ';color:' + secondaryColorNHL + ';"');
-        }
-        $("#modalHeading").attr('style', 'background:' + primaryColorNHL + ';color:' + secondaryColorNHL + ';"');
+        
+            $('.card-body').attr('style', 'background:' + primaryColorNHL + ';color:' + secondaryColorNHL + ';"');
+
+            $('div.modal-header').attr('style', 'background:' + primaryColorNHL + ';color:' + secondaryColorNHL + ';"');
+
+            $('.names').attr('style', 'background:' + primaryColorNHL + ';color:' + secondaryColorNHL + ';"');
+
+       
 
 
 
@@ -412,4 +440,4 @@ function setBackgroundColorNHL(team) {
     };
 };
 
-
+};
diff --git a/index.html b/index.html
index d1a97a1..459b962 100644
--- a/index.html
+++ b/index.html
@@ -48,7 +48,7 @@
             <!-- Modal content-->
             <div class="modal-content">
                 <div class="modal-header" style="background: gray">
-                    <h4 class="modal-title" style="color:white" >Register Here!</h4>
+                    <h4 class="modal-title" id="modalHeader"> Register Here!</h4>
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
                 </div>
                 <div class="modal-body">
@@ -127,7 +127,7 @@ <h4 class="modal-title" style="color:white" >Register Here!</h4>
                                    
                                     <div class="d-flex justify-content-center">
                                     
-                                    <label for="Name" style="color:black; margin-top:30px;">Name:</label>
+                                    <label class="names" for="Name" style= "margin-top:30px;">Name:</label>
                                     <input style="width:140px; position: align-self-center; margin-top:30px;" id="name" type="text"
                                         class="form-control" name="fullname"><br>
 

From 4c126ce9ce9bc25b2dc858af08fe1b5342769002 Mon Sep 17 00:00:00 2001
From: mattkrebs1974 <mattkrebsemail@gmail.com>
Date: Sat, 15 Feb 2020 12:38:57 -0500
Subject: [PATCH 6/9] formatting latest

---
 assets/css/app.css       | 59 +++++++---------------------------------
 assets/javascript/app.js |  9 +++++-
 index.html               |  6 ++--
 3 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/assets/css/app.css b/assets/css/app.css
index 7e28cda..ddc05c0 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -1,6 +1,6 @@
 .team-selection {
 
-display:inline-block;
+display:none;
 height:120px;
 width:220px;
 border:1px solid #ccc;
@@ -112,70 +112,31 @@ p{
 }
 
 
-.carousel {
-    background:#512DA8;
-}
-
-.carousel-item {
-  height: 300px;
- 
-}
-
-.carousel-item img {
-    position: absolute;
-    top: 0;
-    left: 0;
-    min-height: 300px;
-}
-
-.carousel-caption {
-
-    background-color:rgba(0,0,0,.3);
-    padding: 20px 20px 0 20px;
-    position:absolute;
-    right:0px;
-    left:5%;
-    top:30px;
-    height: 250px;
-    width: 90%;
-    z-index: 0;
-
-}
-
-
 
 
  
-.carousel-indicators {
 
-z-index: 0;
+#logo{
+opacity: 1;
 
 
 }
 
- 
-.carousel-control-prev {
 
-z-index: 0;
+.names {
 
 
+  margin-top:30px;
 }
- 
-.carousel-control-next {
 
-z-index: 0;
+#dropdownMenuButton {
 
+display:none;
 
 }
-#logo{
-opacity: 1;
 
+#enterName {
 
-}
+display:none;
 
-
-.names {
-
-
-  margin-top:30px;
-}
+}
\ No newline at end of file
diff --git a/assets/javascript/app.js b/assets/javascript/app.js
index 216485e..cba962f 100644
--- a/assets/javascript/app.js
+++ b/assets/javascript/app.js
@@ -34,7 +34,7 @@ let PcolsNHL = ["#F47A38", "#8C2633", "#FFB81C", "#002654", "#C8102E", "#CC0000"
     "#00205B", "#00205B", "#B4975A", "041E42", "#041E42"
 ];
 
-let ScolsNHL = ["#B9975B", "#E2D6B5", "#000000", "#FCB514", "#F1BE48", "#000000", "#000000", "#236192", "#CE1126",
+let ScolsNHL = ["#C1C6C8", "#E2D6B5", "#000000", "#FCB514", "#F1BE48", "#000000", "#000000", "#236192", "#CE1126",
     "#8F8F8C", "#FFFFFF", "#FF4C00", "#C8102E", "#A2AAAD", "#A6192E", "#192168", "#041E42", "#000000",
     "#F47D30", "#CE1126", "#C2912C", "#000000", "#000000", "#EA7200", "#FCB514", "#FFFFFF",
     "#FFFFFF", "#00843D", "#333F42", "#C8102E", "#004C97"
@@ -441,3 +441,10 @@ function setBackgroundColorNHL(team) {
 };
 
 };
+$('.radio').on('click', function (event) {
+
+    $("#dropdownMenuButton").css("display","inline-block");
+    $(".team-selection").css("display", "inline-block");
+    $("#enterName").css("display", "inline-block");
+
+});
diff --git a/index.html b/index.html
index 459b962..41f3ea2 100644
--- a/index.html
+++ b/index.html
@@ -44,7 +44,7 @@
     <!-- HTML for modal  -->
 
     <div id="selectLeagureAndTeam" class="modal fade" role="dialog">
-        <div class="modal-dialog modal-lg" style="height: inherit; margin-top:100px;" role="content">
+        <div class="modal-dialog modal-lg" style="height: inherit; width: inherit; margin-top:100px;" role="content">
             <!-- Modal content-->
             <div class="modal-content">
                 <div class="modal-header" style="background: gray">
@@ -65,7 +65,7 @@ <h4 class="modal-title" id="modalHeader"> Register Here!</h4>
                                 <div class="col-lg-4" 
                                 style="text-align: center;">
                                     <fieldset data-role="controlgroup" data-type="horizontal">
-                                        <legend>Select A League:</legend>
+                                        <legend >Select A League:</legend>
                                         <div class="radio">
                                             <label><input id="nfl" type="radio" name="optradio" value="nfl"
                                                     unchecked>NFL</label>
@@ -123,7 +123,7 @@ <h4 class="modal-title" id="modalHeader"> Register Here!</h4>
                                 </div>
                             </div>
                             
-                                <div class="col-lg-4">
+                                <div class="col-lg-4" id="enterName">
                                    
                                     <div class="d-flex justify-content-center">
                                     

From 37292c92c2d70280c9afb833793b9ee83e4a6232 Mon Sep 17 00:00:00 2001
From: mattkrebs1974 <mattkrebsemail@gmail.com>
Date: Sat, 15 Feb 2020 14:35:36 -0500
Subject: [PATCH 7/9] bootstrap changes

---
 assets/css/app.css       |  2 +-
 assets/javascript/app.js |  4 ++++
 index.html               | 12 ++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/assets/css/app.css b/assets/css/app.css
index ddc05c0..f73d29d 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -139,4 +139,4 @@ display:none;
 
 display:none;
 
-}
\ No newline at end of file
+}
diff --git a/assets/javascript/app.js b/assets/javascript/app.js
index cba962f..69fc8cd 100644
--- a/assets/javascript/app.js
+++ b/assets/javascript/app.js
@@ -446,5 +446,9 @@ $('.radio').on('click', function (event) {
     $("#dropdownMenuButton").css("display","inline-block");
     $(".team-selection").css("display", "inline-block");
     $("#enterName").css("display", "inline-block");
+    $("#bootstrapClass").removeClass("col-lg-12");
+    $("#bootstrapClass").addClass("col-lg-4");
+    $("#changeSize").attr("style", "margin-top: 100px;");
+
 
 });
diff --git a/index.html b/index.html
index 41f3ea2..1b64e09 100644
--- a/index.html
+++ b/index.html
@@ -44,7 +44,7 @@
     <!-- HTML for modal  -->
 
     <div id="selectLeagureAndTeam" class="modal fade" role="dialog">
-        <div class="modal-dialog modal-lg" style="height: inherit; width: inherit; margin-top:100px;" role="content">
+        <div id="changeSize" class="modal-dialog modal-lg" class="changeToModal" style="margin-top:100px; width:300px;" role="content">
             <!-- Modal content-->
             <div class="modal-content">
                 <div class="modal-header" style="background: gray">
@@ -62,7 +62,11 @@ <h4 class="modal-title" id="modalHeader"> Register Here!</h4>
 
 
                             <div class="row">
-                                <div class="col-lg-4" 
+                                
+                                <div id="bootstrapClass" class="col-lg-12" 
+
+                                
+
                                 style="text-align: center;">
                                     <fieldset data-role="controlgroup" data-type="horizontal">
                                         <legend >Select A League:</legend>
@@ -90,7 +94,7 @@ <h4 class="modal-title" id="modalHeader"> Register Here!</h4>
 
                                     <!-- New HTML for dropdown -->
 
-                                    <div class="dropdown" id="team-dropdown" style="margin-bottom: 120px;left:-20px;">
+                                    <div class="dropdown" id="team-dropdown" style="margin-bottom: 120px;left:-30px;">
                                         <button class="btn btn-secondary dropdown-toggle" type="button"
                                             id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true"
                                             aria-expanded="false">
@@ -127,7 +131,7 @@ <h4 class="modal-title" id="modalHeader"> Register Here!</h4>
                                    
                                     <div class="d-flex justify-content-center">
                                     
-                                    <label class="names" for="Name" style= "margin-top:30px;">Name:</label>
+                                    <label class="names" for="Name" style= "margin-top:30px;margin-right:5px">Name: </label>
                                     <input style="width:140px; position: align-self-center; margin-top:30px;" id="name" type="text"
                                         class="form-control" name="fullname"><br>
 

From ebed36eb31a310617a376a9c40ca680b5fd0c727 Mon Sep 17 00:00:00 2001
From: mattkrebs1974 <mattkrebsemail@gmail.com>
Date: Sun, 16 Feb 2020 07:07:15 -0500
Subject: [PATCH 8/9] last edits from Saturday

---
 assets/javascript/app.js | 6 ++++++
 index.html               | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/assets/javascript/app.js b/assets/javascript/app.js
index 69fc8cd..40f5983 100644
--- a/assets/javascript/app.js
+++ b/assets/javascript/app.js
@@ -449,6 +449,12 @@ $('.radio').on('click', function (event) {
     $("#bootstrapClass").removeClass("col-lg-12");
     $("#bootstrapClass").addClass("col-lg-4");
     $("#changeSize").attr("style", "margin-top: 100px;");
+    $("#bootstrapClass2").removeClass("col-0");
+    $("#bootstrapClass2").addClass("col-lg-4");
+  
 
 
 });
+
+
+
diff --git a/index.html b/index.html
index 1b64e09..71aace1 100644
--- a/index.html
+++ b/index.html
@@ -44,7 +44,7 @@
     <!-- HTML for modal  -->
 
     <div id="selectLeagureAndTeam" class="modal fade" role="dialog">
-        <div id="changeSize" class="modal-dialog modal-lg" class="changeToModal" style="margin-top:100px; width:300px;" role="content">
+        <div id="changeSize" class="modal-dialog modal-lg" class="changeToModal" style="margin-top:100px; width:250px;" role="content">
             <!-- Modal content-->
             <div class="modal-content">
                 <div class="modal-header" style="background: gray">
@@ -89,7 +89,7 @@ <h4 class="modal-title" id="modalHeader"> Register Here!</h4>
                                     </fieldset>
                                 </div>
 
-                                <div class="col-lg-4">
+                                <div id="bootstrapClass2" class="col-0">
                                     <div class="d-flex justify-content-center">
 
                                     <!-- New HTML for dropdown -->

From fe71349a565a5d78279764d1971f2af014f02684 Mon Sep 17 00:00:00 2001
From: Tim-Shaffer <tcshaf24@ptd.net>
Date: Sun, 16 Feb 2020 17:32:49 -0500
Subject: [PATCH 9/9] trying to resolve conflicts

---
 index.html | 124 +++++++++++++++++------------------------------------
 1 file changed, 40 insertions(+), 84 deletions(-)

diff --git a/index.html b/index.html
index 9010837..76c63cc 100644
--- a/index.html
+++ b/index.html
@@ -13,6 +13,7 @@
 
 
     <!-- fontawesome link-->
+
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
 
     <!--  -->
@@ -36,7 +37,7 @@
     <!--  -->
     <link href="https://fonts.googleapis.com/css?family=Rouge+Script&display=swap" rel="stylesheet">
 
-    <!-- Personal Stylesheet --> 
+    <!-- Personal Stylesheet -->
     <link href="assets/css/app.css" rel="stylesheet" type="text/css">
 
 </head>
@@ -44,21 +45,15 @@
 <body class="row-centered column-centered">
 
 
-    <!-- HTML for modal  -->
-
-    <div id="selectLeagureAndTeam" class="modal fade" role="dialog">
-        <div id="changeSize" class="modal-dialog modal-lg" class="changeToModal" style="margin-top:100px; width:250px;" role="content">
-            <!-- Modal content-->
-            <div class="modal-content">
-                <div class="modal-header" style="background: gray">
-                    <h4 class="modal-title" id="modalHeader"> Register Here!</h4>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-                <div class="modal-body">
-                    <form>
-
-
-                        <div class="card-body col-12" style="background-color: #999999; position: align-self-center;">
+        <!-- HTML for modal  -->
+        <div id="selectLeagueAndTeam" class="modal fade" role="dialog">
+            
+            <div class="modal-dialog modal-lg" style="height: inherit; width: inherit; margin-top:100px;" role="content">
+                
+                <!-- Modal content-->
+                <div class="modal-content">
+                    
+                    <div class="modal-header" style="background: gray">
 
                         <!-- <h4 class="modal-title" id="modalHeader"> Register Here!</h4> -->
                         <h4 class="modal-title" id="modalHeader"></h4>
@@ -101,48 +96,20 @@ <h4 class="modal-title" id="modalHeader"></h4>
     
                                     <div class="col-lg-4">
 
+                                        <div class="d-flex justify-content-center">
+    
+                                        <!-- New HTML for dropdown -->
+                                        <div class="dropdown" id="team-dropdown" style="margin-bottom: 120px;left:-20px;">
+                                            
+                                            <button class="btn btn-secondary dropdown-toggle" type="button"
+                                                id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true"
+                                                aria-expanded="false">
+                                                Select a Team
+                                            </button>
 
-                            <div class="row">
-                                
-                                <div id="bootstrapClass" class="col-lg-12" 
-
-                                
-
-                                style="text-align: center;">
-                                    <fieldset data-role="controlgroup" data-type="horizontal">
-                                        <legend >Select A League:</legend>
-                                        <div class="radio">
-                                            <label><input id="nfl" type="radio" name="optradio" value="nfl"
-                                                    unchecked>NFL</label>
-                                        </div>
-                                        <div class="radio">
-                                            <label><input id="nba" type="radio" name="optradio" value="nba"
-                                                    uncheked>NBA</label>
-                                        </div>
-                                        <div class="radio disabled">
-                                            <label><input id="nhl" type="radio" name="optradio" value="nhl"
-                                                    unchecked>NHL</label>
-                                        </div>
-                                        <div class="radio">
-                                            <label><input id="mlb" type="radio" name="optradio" value="mlb"
-                                                    unchecked>MLB</label>
-                                        </div>
-                                    </fieldset>
-                                </div>
-
-                                <div id="bootstrapClass2" class="col-0">
-                                    <div class="d-flex justify-content-center">
-
-                                    <!-- New HTML for dropdown -->
-
-                                    <div class="dropdown" id="team-dropdown" style="margin-bottom: 120px;left:-30px;">
-                                        <button class="btn btn-secondary dropdown-toggle" type="button"
-                                            id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true"
-                                            aria-expanded="false">
-                                            Select a Team
-                                        </button>
-                                        <div class="dropdown-menu team-selection" role="menu" aria-labelledby="dropdownMenuButton"
-                                            id="dropdown-list">
+                                            <div class="dropdown-menu team-selection" role="menu" aria-labelledby="dropdownMenuButton" id="dropdown-list">
+    
+                                            </div>
 
                                         </div>
     
@@ -162,37 +129,26 @@ <h4 class="modal-title" id="modalHeader"></h4>
     
                                     </div>
 
-                                </div>
-                            </div>
-                            
-                                <div class="col-lg-4" id="enterName">
-                                   
-                                    <div class="d-flex justify-content-center">
-                                    
-                                    <label class="names" for="Name" style= "margin-top:30px;margin-right:5px">Name: </label>
-                                    <input style="width:140px; position: align-self-center; margin-top:30px;" id="name" type="text"
-                                        class="form-control" name="fullname"><br>
-
-                                </div>
-                                <br>
-                                <div class="row">
-                                    <div class="col-12">
-                                <div class="d-flex justify-content-center">
-                                    <button type="submit" class="btn btn-primary" id="sub-button" data-dismiss="modal">Submit</button>
-                                
-                                
-                                </div>
-</div>
-                                </div>
-
-                                </div>
-
-                                         
-                            </div>
+                                    <br>
+                                    <div class="row">
 
+                                        <div class="col-12">
 
+                                            <div class="d-flex justify-content-center">
+                                                
+                                                <!-- <button type="submit" class="btn btn-primary" id="sub-button" data-dismiss="modal">Submit</button> -->
+                                                <button type="submit" class="btn btn-primary" id="sub-button">Submit</button>
+                                    
+                                            </div>
 
+                                        </div>
 
+                                    </div>
+    
+                                </div>
+                
+                            </div>       
+    
                         </div>
     
                     </form>