diff --git a/.gitignore b/.gitignore index b2320f72a..4eed927db 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ doc/ *.iml Gemfile.lock +.sass-cache diff --git a/app/assets/stylesheets/jamkazam.css.scss b/app/assets/stylesheets/jamkazam.css.scss index 92d8f0d7c..dee1ab834 100644 --- a/app/assets/stylesheets/jamkazam.css.scss +++ b/app/assets/stylesheets/jamkazam.css.scss @@ -36,15 +36,28 @@ form { clear:both; margin: 1em; } +form .body { + /* TODO - size with layout */ + width: 100%; + height: 40%; + max-height: 40%; + overflow:auto; +} fieldset { - border: 1px solid #555; - padding: 1em; - margin: 2em 1em; - width:auto; - float:left; + /*border: 1px solid #555;*/ + /*padding: 1em;*/ + /*margin: 2em 1em;*/ + /*width:auto;*/ + /*float:left;*/ +} +fieldset.unstyled { + border: 1px solid #f00; } .formrow { - margin: 3em 0em; + margin: 1em; + padding: 1em; + border: 1px solid #555; + float:left; } label { display:block; diff --git a/app/views/clients/index.html.erb b/app/views/clients/index.html.erb index e3e50d962..c751a03b7 100644 --- a/app/views/clients/index.html.erb +++ b/app/views/clients/index.html.erb @@ -101,116 +101,143 @@
-

Viewers: If it isn't obvious, no visual work has been done on this. Just putting the "stuff" on the page. We should be able to start making it function, and then styling can happen in parallel later.

-
-
- Session Type - - - - -
-
- -
-
- - -
-
- -
- -
-
+
+
+
+ Unstyled (obviously) +
+ +
- -
- - -
- Invite Musicians - - -
-
- Invite Fans - - - - +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+ +

+ Upgrade your Studio subscription to let more fans listen +

+
+ +
+ +
+
+