global and local button styles finally in their own lanes again.

morganecf · Apr 30, 2020 · d278792 · d278792
1 parent 75d860c
commit d278792
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/app/client/jsx/Welcome.jsx b/app/client/jsx/Welcome.jsx
@@ -36,11 +36,12 @@ class Welcome extends Component {
         let text_entry = {
           padding: '6px 10px',
           border: '2px solid #D6D3CD',
+          backgroundColor: '#D6D3CD',
           borderRadius: '7px',
           color: '#1B1E1F',
           outline: 'none',
           boxShadow: 'none',
-          fontSize: '18px'
+          fontSize: '20px'
         }
 
         let name_opacity = 'form-fade'

diff --git a/app/client/styles/components/_Welcome.scss b/app/client/styles/components/_Welcome.scss
@@ -18,10 +18,6 @@ h1 {
 	font-size: 2.25em;
 }
 
-button,
-input,
-button:disabled,
-button[disabled],
 input[type="button"] {
 	background-color: #D6D3CD;
 	color: #1B1E1F;

diff --git a/app/client/styles/components/_button.scss b/app/client/styles/components/_button.scss
@@ -11,7 +11,7 @@ input[type="button"] {
 	transition: all 0.3s ease;
 	background: none;
 	color: $text-color;
-	font-size: 18px;
+	font-size: 20px;
 
 	svg {
 		margin: 0 8px 0 0;