Fix a few remaining style issues

SimonRothUCF · Sep 19, 2024 · 68faba4 · 68faba4
1 parent 02d6cfe
commit 68faba4
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 19 deletions.
diff --git a/fuel/app/classes/controller/qsets.php b/fuel/app/classes/controller/qsets.php
@@ -6,6 +6,7 @@
 
 class Controller_Qsets extends Controller
 {
+	use Trait_CommonControllerTemplate;
 
 	public function action_import()
 	{

diff --git a/fuel/app/classes/controller/questions.php b/fuel/app/classes/controller/questions.php
@@ -6,6 +6,8 @@
 
 class Controller_Questions extends Controller
 {
+	use Trait_CommonControllerTemplate;
+
 	public function get_import()
 	{
 		// Validate Logged in

diff --git a/src/components/bar-graph.jsx b/src/components/bar-graph.jsx
@@ -3,7 +3,7 @@ import { axisBottom, axisLeft, scaleBand, scaleLinear, select } from 'd3'
 
 const BarGraph = ({ data, width, height, rowLabel = `Y Axis`, colLabel = `X Axis`, graphTitle = 'Title' }) => {
 
-	const linesColor = { color: `#a9a9a9` }
+	const linesColor = { color: `#333333` }
 	const margin = { top: 50, bottom: 25, left: 25, right: 25 }
 	const graphWidth = width - margin.left - margin.right
 	const graphHeight = height - margin.top - margin.bottom
@@ -75,7 +75,7 @@ const BarGraph = ({ data, width, height, rowLabel = `Y Axis`, colLabel = `X Axis
 					y={yAxis(value)}
 					width={xAxis.bandwidth()}
 					height={height - yAxis(value)}
-					fill={`#0093e7`}
+					fill={`#0077e7`}
 				/>
 			))}
 		</>)

diff --git a/src/components/my-widgets-scores.scss b/src/components/my-widgets-scores.scss
@@ -614,6 +614,29 @@
 	overflow-y: auto;
 	padding-bottom: 1em;
 
+	.student-activity-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0;
+
+		border-bottom: #08090c dotted 1px;
+
+		.action_button {
+
+			color: $extremely-dark-gray;
+			text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.5);
+			box-shadow: 1px 2px 4px #08090c;
+
+			&.disabled, &.disabled:hover {
+				background: #d4d4d4;
+				color: #545454;
+				cursor: default;
+				opacity: 0.5;
+			}
+		}
+	}
+
 	#export_scores_button.disabled,
 	#export_scores_button.disabled:hover {
 		background: #21232a;
@@ -624,28 +647,28 @@
 
 	.graph {
 		rect.vx-bar {
-			fill: #0093e7;
+			fill: #295b99;
 
 			&:hover {
-				fill: #2aabf5;
+				fill: #3b77c0;
 			}
 		}
 
 		.vx-axis tspan {
-			fill: #666;
+			fill: #08090c;
 		}
 
 		.vx-line {
-			stroke: #a9a9a9;
+			stroke: #08090c;
 		}
 
 		.vx-graph {
-			fill: #21232a;
+			fill: #08090c;
 		}
 	}
 
 	h2 {
-		border-bottom: #999 dotted 1px;
+		/* border-bottom: #08090c dotted 1px; */
 		padding-bottom: 14px;
 		padding-top: 2px;
 		padding-bottom: 13px;
@@ -745,13 +768,13 @@
 		}
 
 		.display.graph {
-			background: #21232a;
+			background: #9696B0;
 			margin: 0;
 			padding: 20px 0 0 20px;
 			border: solid #08090c 1px;
 			width: 550px;
 			float: left;
-			color: #fff;
+			color: #000;
 
 			.type {
 				padding: 0;
@@ -942,7 +965,7 @@
 				input[type='text'] {
 					width: 190px;
 					margin: 7px 10px 0 10px;
-					border: solid 1px #b0b0b0;
+					border: solid 1px #08090c;
 					border-radius: 12px;
 					height: 19px;
 					//background: #fff url('/img/magnifyingglass.png') 5px 50% no-repeat;
@@ -1028,7 +1051,7 @@
 						cursor: pointer;
 
 						&:hover {
-							background: #ffe0a5;
+							background: #b4570a;
 						}
 
 						&:last-child td {
@@ -1052,7 +1075,7 @@
 			}
 
 			tbody tr.rowSelected {
-				background: #ffcb68;
+				background: #b4570a;
 			}
 		}
 

diff --git a/src/components/profile-page.scss b/src/components/profile-page.scss
@@ -309,7 +309,7 @@
 				position: absolute;
 				top: 12px;
 				right: 1px;
-				color: #eee;
+				color: #7b7b7b;
 				font-size: 30px;
 			}
 		}

diff --git a/src/components/question-history.scss b/src/components/question-history.scss
@@ -108,3 +108,19 @@ html {
 		color: #000000;
 	}
 }
+
+.actions {
+	position: fixed;
+	width: 80px;
+	left: 50%;
+	bottom: 0px;
+	margin-left: -40px;
+	padding-bottom: 14px;
+
+	text-align: center;
+	font-size: 1.1em;
+
+	a {
+		color: #61a4e2;
+	}
+}
diff --git a/src/components/question-importer.scss b/src/components/question-importer.scss
@@ -125,7 +125,7 @@
 
 		.showing-text {
 			align-self: flex-end;
-			color: #333;
+			color: #d8d8d8;
 			font-size: 12px;
 		}
 	}

diff --git a/src/components/widget-creator-page.scss b/src/components/widget-creator-page.scss
@@ -408,6 +408,31 @@ a {
 		z-index: 10;
 	}
 }
+
+#embed_dialog {
+	position: absolute;
+	top: -50%;
+	left: 50%;
+	margin: -250px -387px;
+	width: 675px;
+	height: 535px;
+	z-index: 2;
+	box-shadow: 0px 0px 1000px #000, 0px 0px 10px #000;
+	opacity: 0;
+	transition: all 0.3s ease;
+	background: #21232a;
+	overflow-x: hidden;
+
+	&.show {
+		opacity: 1;
+		box-shadow: none;
+		text-align: left;
+		top: 50%;
+		width: 800px;
+		z-index: 10;
+	}
+}
+
 #confirm_dialog {
 	position: absolute;
 	top: -50%;

diff --git a/src/util/api.js b/src/util/api.js
@@ -180,7 +180,7 @@ export const apiAuthorVerify = () => {
 		.catch(error => false)
 }
 
-export const apiUpdateUserSettings = (settings) => {
+/* export const apiUpdateUserSettings = (settings) => {
 	console.log(settings);
 	return fetch('/api/user/settings', {
 		...fetchOptions({}),
@@ -192,9 +192,9 @@ export const apiUpdateUserSettings = (settings) => {
 		body: JSON.stringify(settings)
 	})
 		.then((resp) => resp.json())
-}
+} */
 
-export const apiUpdateUserRoles = (roles) => {
+/* export const apiUpdateUserRoles = (roles) => {
 	return fetch('/api/user/roles', {
 		...fetchOptions({}),
 		headers: {
@@ -205,7 +205,7 @@ export const apiUpdateUserRoles = (roles) => {
 		body: JSON.stringify(roles)
 	})
 		.then((resp) => resp.json())
-}
+} */
 
 export const apiGetNotifications = () => {
 	return fetchGet('/api/json/notifications_get/', { body: `data=${formatFetchBody([])}` })
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     class Controller_Qsets extends Controller
     {
+    	use Trait_CommonControllerTemplate;
     	public function action_import()
     	{
@@ Expand Down @@