resolving Sass issues caused by previous merge conflict resolution in branch

cms/static/sass/_assets.scss

@@ -4,13 +4,7 @@
     width: 260px;
     background-color: #fff;
   }
-  .upload-button {
-    @include blue-button;
-    float: left;
-    margin-right: 20px;
-    padding: 8px 30px 10px;
-    font-size: 12px;
-  }
+
   .asset-library {
     @include clearfix;
 
@@ -104,69 +98,69 @@
 }
 
 .upload-modal {
-	display: none;	
-	width: 640px !important;
-	margin-left: -320px !important;
-
-	.modal-body {
-		height: auto !important;
-		overflow-y: auto !important;
-		text-align: center;
-	}
-
-	.file-input {
-		display: none;
-	}
-
-	.choose-file-button {
-		@include blue-button;
-		padding: 10px 82px 12px;
-		font-size: 17px;
-	}
-
-	.progress-bar {
-		display: none;
-		width: 350px;
-		height: 50px;
-		margin: 30px auto 10px;
-		border: 1px solid $blue;
-
-		&.loaded {
-			border-color: #66b93d;
-
-			.progress-fill {
-				background: #66b93d;
-			}
-		}
-	}
-
-	.progress-fill {
-		width: 0%;
-		height: 50px;
-		background: $blue;
-		color: #fff;
-		line-height: 48px;
-	}
-
-	h1 {
-		float: none;
-		margin: 40px 0 30px;
-		font-size: 34px;
-		font-weight: 300;
-	}
-
-	.close-button {
-		@include white-button;
-		position: absolute;
-		top: 0;
-		right: 15px;
-		width: 29px;
-		height: 29px;
-		padding: 0 !important;
-		border-radius: 17px !important;
-		line-height: 29px;
-		text-align: center;
-	}
+  display: none;  
+  width: 640px !important;
+  margin-left: -320px !important;
+
+  .modal-body {
+    height: auto !important;
+    overflow-y: auto !important;
+    text-align: center;
+  }
+
+  .file-input {
+    display: none;
+  }
+
+  .choose-file-button {
+    @include blue-button;
+    padding: 10px 82px 12px;
+    font-size: 17px;
+  }
+
+  .progress-bar {
+    display: none;
+    width: 350px;
+    height: 50px;
+    margin: 30px auto 10px;
+    border: 1px solid $blue;
+
+    &.loaded {
+      border-color: #66b93d;
+
+      .progress-fill {
+        background: #66b93d;
+      }
+    }
+  }
+
+  .progress-fill {
+    width: 0%;
+    height: 50px;
+    background: $blue;
+    color: #fff;
+    line-height: 48px;
+  }
+
+  h1 {
+    float: none;
+    margin: 40px 0 30px;
+    font-size: 34px;
+    font-weight: 300;
+  }
+
+  .close-button {
+    @include white-button;
+    position: absolute;
+    top: 0;
+    right: 15px;
+    width: 29px;
+    height: 29px;
+    padding: 0 !important;
+    border-radius: 17px !important;
+    line-height: 29px;
+    text-align: center;
+  }
 
   .embeddable {
     display: none;
@@ -184,9 +178,9 @@
     width: 400px;
   }
 
-	.copy-button {
-		@include white-button;
-		display: none;
-		margin-bottom: 100px;
-	}
+  .copy-button {
+    @include white-button;
+    display: none;
+    margin-bottom: 100px;
+  }
 }
\ No newline at end of file

cms/static/sass/_base.scss

 // -------------------------------------
 //
-//	Universal
+//  Universal
 //
 // -------------------------------------
 
@@ -34,30 +34,6 @@ h1 {
     margin: 24px 6px;
 }
 
-strong {
-    font-weight: 700;
-}
-
-em {
-    font-style: italic;
-}
-
-p + p,
-p + ul,
-p + ol {
-    margin-top: 20px;
-}
-
-code {
-    margin: 0 2px;
-    padding: 0px 5px;
-    border-radius: 3px;
-    border: 1px solid #eaeaea;
-    font-family: Monaco, monospace;
-    font-size: 12px;
-    background-color: #f8f8f8;
-}
-
 .waiting {
     opacity: 0.1;
 }