Hide the bullets for all unordered lists in forms

4 files changed, 58 insertions, 10 deletions

diff --git a/app/assets/stylesheets/application/scaffolds.css.scss b/app/assets/stylesheets/application/scaffolds.css.scss
index ae26907..703e3d6 100644
--- a/app/assets/stylesheets/application/scaffolds.css.scss
+++ b/app/assets/stylesheets/application/scaffolds.css.scss
@@ -115,6 +115,10 @@ fieldset {
 	}
 }
 
+form ul {
+	list-style: none;
+}
+
 a, button, input[type="submit"] {
 	@extend .btn;
 	&.user { @extend .btn-info; }
diff --git a/app/assets/stylesheets/patch b/app/assets/stylesheets/patch
new file mode 100644
index 0000000..0997417
--- /dev/null
+++ b/app/assets/stylesheets/patch
@@ -0,0 +1,54 @@
+commit 10f01633176ca214e7aec6be61ed3344035ec77e
+Merge: 99dff7e 20f7b74
+Author: webb39 <webb39@purdue.edu>
+Date:   Mon Mar 10 20:41:27 2014 -0400
+
+    Merge branch 'master' of https://github.com/LukeShu/Leaguer
+
+commit 99dff7e01a65986338824804651367e97a0d1923
+Merge: 1f00553 f0c03cd
+Author: webb39 <webb39@purdue.edu>
+Date:   Mon Mar 10 20:41:16 2014 -0400
+
+    Merge https://github.com/LukeShu/Leaguer
+    
+    Conflicts:
+    	doc/Sprint1-Retrospective.md
+
+commit 1f00553cbc5d281efe3ac1b434d16537a17bc969
+Author: webb39 <webb39@purdue.edu>
+Date:   Mon Mar 10 20:36:31 2014 -0400
+
+    added match controller information
+
+diff --git a/doc/Sprint1-Retrospective.md b/doc/Sprint1-Retrospective.md
+index 3da3669..ae1b07a 100644
+--- a/doc/Sprint1-Retrospective.md
++++ b/doc/Sprint1-Retrospective.md
+@@ -97,13 +97,24 @@ f
+ f
+ 
+ ## Login (UI) {#login-ui}
+-
++  
+ ## Tournament settings {#tourney-settings}
+-
++  
+ ## Tournament registration {#tourney-registration}
+ 
+ ## Match controller {#match-controller}
+ 
++The Match Controller creates the separate matches for a specific tournament.
++When a tournament is started, it begins with an initial match that contains
++no players.  Currently, a player must join a match by entering the specific
++tournament (by clicking the 'show' button on the tournament), 
++then they must enter the match (again by clicking the 'show' button but this
++time on the match they desire to participate in) and then finally clicking
++the 'join' button.  This updates the match with the user as a participant in
++the matc and then finally clicking the 'join' button.  This updates the match
++with the user as a participant in the match.  A match can also be destroyed 
++by clicking the 'delete' button on the no longer desired match on the page.
++
+ ## Permissions system {#permissions}
+ 
+ ## Tournament view {#tourney-view}
diff --git a/app/assets/stylesheets/servers.css.scss b/app/assets/stylesheets/servers.css.scss
index bb20956..e69de29 100644
--- a/app/assets/stylesheets/servers.css.scss
+++ b/app/assets/stylesheets/servers.css.scss
@@ -1,5 +0,0 @@
-.edit_server {
-	li {
-		list-style: none;
-	}
-}
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
index 790aa5f..e69de29 100644
--- a/app/assets/stylesheets/users.css.scss
+++ b/app/assets/stylesheets/users.css.scss
@@ -1,5 +0,0 @@
-.new_user, .edit_user {
-	li {
-		list-style: none;
-	}
-}