Skip to content

Commit

Permalink
Merge pull request codestates-seb#26 from codestates-seb/feat/1-fe-레이아웃
Browse files Browse the repository at this point in the history
[FE] Feat/1 fe 레이아웃
  • Loading branch information
shinker1002 committed Nov 13, 2022
2 parents eb35350 + 4557c56 commit 2964f36
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 7 deletions.
2 changes: 1 addition & 1 deletion client/src/App.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import './App.scss';
import { Route, Routes } from 'react-router-dom';
import Layout from './components/layout/js/Layout';
import Home from './components/home/js/Home';
import Home from './pages/home/js/Home';

function App() {
//json-server 주소
Expand Down
11 changes: 11 additions & 0 deletions client/src/assets/scss/common.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
선언: $variable-name: variable-value;
사용: scss파일 import 후, 속성: $variable-name;
*/


// color


// Media Query 분기점
10 changes: 5 additions & 5 deletions client/src/components/layout/css/layout.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.appLayout{
box-sizing: border-box;
// width: 100vw;
// height: 100vh;
// display: grid;
// grid-template-columns: 1fr;
// grid-template-rows: 53px 1fr 250px;
width: 100vw;
height: 100vh;
// display: grid;
// grid-template-columns: 1fr;
// grid-template-rows: 53px 1fr 250px;
}
2 changes: 1 addition & 1 deletion client/src/components/main/js/Main.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '../css/main.scss';
import '../css/Main.scss';
import { Outlet } from 'react-router-dom';

export default function Main() {
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 2964f36

Please sign in to comment.