Merge branch 'master' into tres

Conflicts:
	view/css/mod_events.css
	view/theme/redbasic/css/style.css

5 files changed, 51 insertions, 2 deletions

diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index 20facbaf8..7b149d744 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -3,8 +3,10 @@
 	clear: both;
 }
 .directory-name {
-	text-align: center;
+	float: left;
+	width: 250px;
 }
+
 .directory-photo {
 	margin-left: 25px;
 }
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index 8f4a69b4f..4c418340a 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -12,11 +12,16 @@
 	float: left;
 }
 
+#event-category-wrap {
+	margin-top: 15px;
+}
+
 .event-cats {
 	margin-top: 15px;
 	width: 400px;
 }
 
+
 .required {
 	float: left;
 }
@@ -26,4 +31,5 @@
 }
 #event-nofinish-break {
 	margin-bottom: 10px;
-}
\ No newline at end of file
+}
+
diff --git a/view/css/mod_rate.css b/view/css/mod_rate.css
new file mode 100644
index 000000000..58e87b9b4
--- /dev/null
+++ b/view/css/mod_rate.css
@@ -0,0 +1,8 @@
+#rating-slider {
+    width: 600px !important;
+}
+
+#rating-text {
+    width: 400px;
+    height: 60px;
+}
diff --git a/view/css/mod_prep.css b/view/css/mod_ratings.css
index bb29086da..c9f75c58c 100644
--- a/view/css/mod_prep.css
+++ b/view/css/mod_ratings.css
@@ -9,4 +9,13 @@
 
 .directory-item {
 	margin: 10px;
+}
+
+.rating-value {
+	margin-top: 10px;
+}
+
+.prep-rating-value {
+	margin-left: 10px;
+	font-size: 1.5rem;
 }
\ No newline at end of file
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 4db87e633..43d132276 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -104,3 +104,27 @@ li:hover .group-edit-icon {
 .chatroomlist td {
 	padding: 0 5px 0;
 }
+
+/* ratings */
+
+.directory-rating {
+	float: right;
+	margin-right: 5px;
+}
+
+.slider-container {
+	padding: 15px;
+}
+
+.rating-text-label {
+	margin-top: 30px;
+}
+
+.directory-rating-text {
+	width: 90%;
+	margin-left: 5%;
+}
+
+.directory-rating-submit {
+	margin-top: 15px;
+}