conflicts fixed and merge

1 files changed, 55 insertions, 0 deletions

diff --git a/frontend/src/views/Config.scss b/frontend/src/views/Config.scss
new file mode 100644
index 0000000..331d7a7
--- /dev/null
+++ b/frontend/src/views/Config.scss
@@ -0,0 +1,55 @@
+@import '../colors.scss';
+
+.curl-output {
+  width: 100%;
+  font-size: 13px;
+}
+
+#passwd-form {
+	margin:auto;
+}
+
+.users-list {
+  .btn {
+    width: 70px;
+  }
+
+  td {
+    background-color: $color-primary-2;
+    border-top: 2px solid $color-primary-0;
+    vertical-align: middle;
+    text-align: center; 
+  }
+
+  th {
+    background-color: $color-primary-1;
+    text-align: center; 
+  }
+}
+
+.btn-color {
+  border: 3px solid #fff;
+}
+
+.dialog-footer {
+  .btn {
+    width: 80px;
+  }
+}
+
+.blink{
+
+	span{
+		animation: blink 1s linear infinite;
+	}
+	@keyframes blink{
+		0%{opacity: 0;}
+		50%{opacity: .5;}
+		100%{opacity: 1;}
+	}
+
+}
+
+.error{
+	color: red;
+}