Merge pull request #43 from cca-team3-webproject/master

10-2  1시 배포
Merge pull request #45 from cca-team3-webproject/master

10-2  1시 배포
Merge pull request #47 from cca-team3-webproject/master

보드가바디로
Merge pull request #48 from cca-team3-webproject/master

보드가바디로
images/파일 변경
도메인 수정 및 업로드 로직 변경(구현중)
Merge pull request #49 from cca-team3-webproject/kwak

Kwak
Merge pull request #50 from cca-team3-webproject/goodbye

Goodbye
@charset "utf-8";

* { font-family: 굴림, gulim, tahoma, sans-serif; font-size: 12px; }
a:link { text-decoration: none; color: #000000; }
a:visited { text-decoration: none; color: #000000; }
a:hover, a:active { text-decoration: underline; color: #cc6600; }

ul#loginerrormsg { padding: 0px 10px 0px 20px; }
table#topbartable {margin:0 auto;}
table#sidebartable { margin: 20px 10px 10px 10px;}
table#sidebartable hr { margin: 0px 0px 5px 0px; width: 120px; }
table#categoryPosition{ float: right;}
table#logintable, table#logouttable { float: right;}
table#logotable {float: left;}
table#logintable td.label { text-align: center; color: red; font-weight:
bold;}
.logo { text-align: center; vertical-align: middle; width: 160px;
height: 100px; }  
.maintable table{text-align: center; padding: 20px; margin: 20px;
border: thin solid;}

.tableRow {display: table-row;}
.tableCell { display: table-cell; vertical-align: top; }
.topbar { display: table-cell; height: 200px; padding: 20px 10px 0px
10px; vertical-align: top; width: 100%;}
.category { padding: 0px 20px 0px 20px; text-align: center;}
td.category a {
		position: relative;
	display: inline-block;
	color: black; /* font color */
	text-decoration: none;
	text-transform: uppercase;
	font-family: 'Raleway', sans-serif; /* font style (uses Google fonts)
*/
	font-size: 22px; /* font size */
	letter-spacing: 2px; /* letter spacing */
	border-bottom: 2px solid transparent; /* Bottom border style */
}

td.category a:hover, td.category a:focus{
	outline: none;
	border-bottom: 2px solid #eee; /* Bottom border style on hover */
}

td.category a::before, td.category a:after{ /* shared style for two
circles */
	position: absolute;
	top: 50%;
	left: 50%;
	width: 70px; /* width of outer circle */
	height: 70px; /* height of outer circle */
	border: 12px double rgba(0,0,0,0.1); /* style and color of circles */
	border-radius: 50%;
	content: '';
	opacity: 0;
	-webkit-transform: translateX(-50%) translateY(-50%) scale(0.2);
	-moz-transform: translateX(-50%) translateY(-50%) scale(0.2);
	transform: translateX(-50%) translateY(-50%) scale(0.2);
}

td.category a:after{ /* inner circle specific CSS */
	width: 60px; /* width of inner circle */
	height: 60px; /* width of inner circle */
	border-width: 6px;
	-webkit-transform: translateX(-50%) translateY(-50%) scale(0.8);
	-moz-transform: translateX(-50%) translateY(-50%) scale(0.8);
	transform: translateX(-50%) translateY(-50%) scale(0.8);
}

td.category a:hover:before, td.category a:hover:after{
	-webkit-animation: pulsate 1.2s infinite; /* animation name duration
loop etc */
	-moz-animation: pulsate 1.2s infinite;
	-ms-animation: pulsate 1.2s infinite;
	animation: pulsate 1.2s infinite;
}
@-webkit-keyframes pulsate{

  30%{
	opacity: 1;
	-webkit-transform: translateX(-50%) translateY(-50%) scale(1);
  }

	100%{
	opacity: 0.3;
	-webkit-transform: translateX(-50%) translateY(-50%) scale(0.5);
	}

}

@-moz-keyframes pulsate{

  30%{
	opacity: 1;
	-moz-transform: translateX(-50%) translateY(-50%) scale(1);
  }

	100%{
	opacity: 0.3;
	-moz-transform: translateX(-50%) translateY(-50%) scale(0.5);
	}

}

@-ms-keyframes pulsate{

  30%{
	opacity: 1;
	-ms-transform: translateX(-50%) translateY(-50%) scale(1);
  }

	100%{
	opacity: 0.3;
	-ms-transform: translateX(-50%) translateY(-50%) scale(0.5);
	}

}

@-keyframes pulsate{

  30%{
	opacity: 1;
	transform: translateX(-50%) translateY(-50%) scale(1);
  }

	100%{
	opacity: 0.3;
	transform: translateX(-50%) translateY(-50%) scale(0.5);
	}

}


.category img{width: 100px; height: 100px;}
.main { display: table-cell; padding: 0px 20px 20px 20px;
vertical-align: top; }

#searchinput { width: 200px; }
Merge branch 'master' of
https://github.com/cca-team3-webproject/rep-sakdagu.git
Merge remote-tracking branch 'origin/zaha'

Conflicts:
	sakdagu/WebContent/css/body.css
women.png