From 353a5dfcc1782744684922b7d41c8030750d1533 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 14:54:24 -0400 Subject: add a server settings button to the top bar if you have permission --- app/assets/stylesheets/custom.css.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'app/assets') diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index 1a9b09a..febcbb8 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -24,6 +24,7 @@ a, input[type="submit"] { &.signup { @extend .btn-success; } &.signin { @extend .btn-info; } &.signout { @extend .btn-danger; } + &.server { @extend .btn-danger; } } p.errors { -- cgit v1.2.3-2-g168b From dc417a48ec2abc83a3ffad742c3c4a4207054300 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Sun, 6 Apr 2014 20:03:32 -0400 Subject: Dragging to Rank --- app/assets/javascripts/application.js | 3 +++ app/assets/stylesheets/matches.css.scss | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) (limited to 'app/assets') diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa..cb6edeb 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,6 @@ //= require jquery_ujs //= require turbolinks //= require_tree . +//= require 'drag.js' +//= require 'dragsort.js' +//= require 'coordinates.js' diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss index 4c396e3..3ef9170 100644 --- a/app/assets/stylesheets/matches.css.scss +++ b/app/assets/stylesheets/matches.css.scss @@ -1,3 +1,27 @@ // Place all the styles related to the matches controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ +#boxes li { + cursor: move; + position: relative; + float: left; + margin: 5px; + width: 180px; + height: 240px; + border: 1px solid rgb(0, 0, 0); + text-align: center; + padding-top: 10px; + background-color: rgb(238, 238, 255); +} +#numeric li { + cursor: move; + position: relative; + float: left; + margin: 5px; + width: 180px; + height: 240px; + border: 1px solid rgb(0, 0, 0); + text-align: center; + padding-top: 10px; + background-color: rgb(238, 238, 255); +} \ No newline at end of file -- cgit v1.2.3-2-g168b