From 8dade78c49ad03085166c41d8b334a6ade3a287e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 28 Apr 2014 19:36:30 -0400 Subject: Hide the bullets for all unordered lists in forms --- .../stylesheets/application/scaffolds.css.scss | 4 ++ app/assets/stylesheets/patch | 54 ++++++++++++++++++++++ app/assets/stylesheets/servers.css.scss | 5 -- app/assets/stylesheets/users.css.scss | 5 -- 4 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 app/assets/stylesheets/patch (limited to 'app/assets') 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 +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 +Date: Mon Mar 10 20:41:16 2014 -0400 + + Merge https://github.com/LukeShu/Leaguer + + Conflicts: + doc/Sprint1-Retrospective.md + +commit 1f00553cbc5d281efe3ac1b434d16537a17bc969 +Author: webb39 +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; - } -} -- cgit v1.2.3-2-g168b From 1288b00d612d5969bfdde5b572cb7b6004b0cb66 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Mon, 28 Apr 2014 19:47:48 -0400 Subject: Fixed multiple redirection error. --- app/assets/stylesheets/application/scaffolds.css.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'app/assets') diff --git a/app/assets/stylesheets/application/scaffolds.css.scss b/app/assets/stylesheets/application/scaffolds.css.scss index ae26907..cbe83bf 100644 --- a/app/assets/stylesheets/application/scaffolds.css.scss +++ b/app/assets/stylesheets/application/scaffolds.css.scss @@ -39,9 +39,6 @@ html { form.search { @extend .navbar-form; float: right; - input[type="submit"] { - @extend .btn-warning; - } input[type="text"], input[type="search"] { background-color: #303030; border: 2px solid #ED9C28; @@ -51,6 +48,9 @@ html { height: 30px; padding: 0px 5px; } + input[type="submit"] { + @extend .btn-warning; + } } } @@ -77,7 +77,7 @@ html { clear: both; border-top: solid 1px $orange; text-align: center; - margin: 0 auto; + margin: 1em auto 0; width: 90%; } } @@ -144,7 +144,7 @@ input, textarea{ border: 3px inset #A5A5A5; padding: 8px; - color: $orange !important; + color: $orange; background: rgba(0,0,0,0.5); margin: 0 0 5px 0; } @@ -153,7 +153,7 @@ select { background-color: #333; padding: 5px; border: none; - color: $orange !important; + color: $orange; } pre { -- cgit v1.2.3-2-g168b