Przeglądaj źródła

added variables for scss

Tanya Sashyna 5 lat temu
rodzic
commit
4bd2167d39

Plik diff jest za duży
+ 2955 - 2933
package-lock.json


+ 8 - 6
package.json

@@ -7,12 +7,7 @@
     "node-sass": "^4.12.0",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "react-redux": "^7.1.0",
-    "react-router-dom": "^5.0.1",
-    "react-scripts": "3.0.1",
-    "redux": "^4.0.1",
-    "redux-form": "^8.2.4",
-    "redux-thunk": "^2.3.0"
+    "react-scripts": "3.0.1"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -34,5 +29,12 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "devDependencies": {
+    "react-redux": "^7.1.0",
+    "react-router-dom": "^5.0.1",
+    "redux": "^4.0.4",
+    "redux-form": "^8.2.4",
+    "redux-thunk": "^2.3.0"
   }
 }

+ 1 - 1
src/conteiners/adminMainPage/adminMainPage.js

@@ -27,5 +27,5 @@ const mapStateToProps = state => ({
     
 export default connect(
     mapStateToProps,
-    // actions
+    //actions
 )(AdminMainPage);

+ 0 - 3
src/index.scss

@@ -1,9 +1,6 @@
 @import "./styles/base.scss";
 body {
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
-    "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
-    sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }

+ 10 - 5
src/styles/base.scss

@@ -1,3 +1,6 @@
+@import url('https://fonts.googleapis.com/css?family=Josefin+Sans:300,400,600,700&display=swap');
+@import "variables";
+
 *,
 *:after,
 *:before {
@@ -93,11 +96,11 @@ acronym {
 }
 
 body {
-	font-family: "Raleway", sans-serif !important;
-	line-height: 1.7 !important;
-	font-size: inherit !important;
-	box-sizing: border-box;
-	min-width: 320px;
+    font-family: $typo-1;
+    line-height: 1.7 !important;
+    font-size: inherit !important;
+    box-sizing: border-box;
+    min-width: 320px;
 }
 
 a:hover {
@@ -106,4 +109,6 @@ a:hover {
 
 button {
 	cursor: pointer;
+    outline: none;
+    box-shadow: none;
 }

+ 16 - 0
src/styles/variables.scss

@@ -0,0 +1,16 @@
+//color
+$color-blue: #1f7394;
+$color-white: #ffffff;
+$color-black: #000000;
+$color-black: #eeeeee;
+$color-mint: #5acec2;
+
+//font-weight
+$light: 300;
+$normal: 400;
+$semi-bold: 600;
+$bold: 700;
+
+
+//font-family
+$typo-1: 'Josefin Sans', sans-serif;