Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share

app/assets/stylesheets/style.css.erb

@@ -32,7 +32,6 @@
 	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
 	-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
 	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;	
-	
 	background-image: -moz-linear-gradient(top, #5282A6, #133757);
 	background-image: -ms-linear-gradient(top, #5282A6, #133757);
 	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5282A6), to(#133757));
@@ -40,15 +39,6 @@
 	background-image: -o-linear-gradient(top, #5282A6, #133757);
 	background-image: linear-gradient(top, #5282A6, #133757);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5282A6', endColorstr='#133757', GradientType=0);
-	/*
-	background-image: -moz-linear-gradient(top, #545b60, #191a1c);
-	background-image: -ms-linear-gradient(top, #545b60, #191a1c);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#545b60), to(#191a1c));
-	background-image: -webkit-linear-gradient(top, #545b60, #191a1c);
-	background-image: -o-linear-gradient(top, #545b60, #191a1c);
-	background-image: linear-gradient(top, #545b60, #191a1c);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#545b60', endColorstr='#191a1c', GradientType=0);
-	*/
 }
 #orbit-bar .navbar-search {
 	left: 28px;
@@ -62,25 +52,20 @@
 }
 #orbit-bar .search-query {
 	padding: 7px 9px 5px;
-	height: 10px;
+	height: 11px;
     margin-top: 3px;
     border: 1px solid #333333;
     font-size: 11px;
-	/*background-color: rgba(255, 255, 255, 0.8);
+    line-height: 21px;
-	color: #333;
-	text-shadow: 0px 1px 0px #FFF;*/
 	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3) inset, 0 1px 0 rgba(255, 255, 255, 0.15);
 }
 #orbit-bar .search-query:focus {
-	/*background-color: rgba(255, 255, 255, 0.9);
-	text-shadow: 0px 1px 0px #FFF;*/
 	background-position: 5px 2px;
 }
 #orbit-bar .container {
 	width:100%;
 }
 #orbit-bar .orbit-logo .brand {
-	/* background: url(<%= asset_path 'orbit-bar.png' %>) no-repeat -162px -5px; */
 	background: url(<%= asset_path 'nccu_logo.png' %>) no-repeat 6px 0px;
 	text-indent:-9999px;
 	padding: 5px 20px 4px;
@@ -118,8 +103,7 @@
 	background-position: -10px -10px;
 }
 #orbit-bar .nav > li > a.orbit-bar-desktop {
-	background-position: -73px -42px;
+	background-position: -73px -42px;width: 48px;
-	width: 48px;
 }
 #orbit-bar .nav > li > a.orbit-bar-member {
 	background-position: -4px -37px;
@@ -190,7 +174,7 @@
 	margin: 0;
 }
 #orbit-bar .bar-login .dropdown-menu .log .span2 {
-	width: 183px;
+	width: 182px;
 }
 #orbit-bar .bar-login .dropdown-menu .log .forgot {
 	margin-bottom: 20px;
@@ -286,18 +270,9 @@
 	background-color: #FFF;
 	margin-left:160px;
 	padding-top: 32px;
-	/*padding-bottom: 18px;*/
-	position: relative;
 	padding-bottom: 45px;
-	/*min-height: 100%;*/
+	position: relative;
 }
-/*#main-wrap > .form-actions {
-	background-color: #FFF;
-	text-align: center;
-    padding: 17px 20px 0;
-	margin: 0;
-	border-top: none;
-}*/
 #main-wrap .subnav {
 	height: auto;
 	min-height: 36px;
@@ -378,7 +353,6 @@
 #post-body .editor {
 }
 #post-body-content {
-	/*margin-right: 320px;*/
 	padding: 8px 0 8px 6px;
 }
 .filter .accordion-heading > a:hover {
@@ -581,6 +555,22 @@
 	/*background-color: #AF0045;
 	border-left: 2px solid #AF0045;*/
 }
+.gender {
+	position: absolute;
+	border-radius: 0 0 5px 0;
+	border-width: 10px;
+	margin: 0;
+	border-style: solid;
+	z-index: 10;
+	bottom: 0;
+	right: 0;
+}
+.gender.male {
+	border-color: transparent #41B1D5 #41B1D5 transparent;
+}
+.gender.female {
+	border-color: transparent #DB186E #DB186E transparent;
+}
 .user-info .roles-nav {
 	margin: 0;
 	position: relative;
@@ -642,6 +632,20 @@
 	min-width: 220px;
 	display: inline-block;
 	float: left;
+	position: relative;
+}
+.user-info-basic .gender {
+	border-radius: 0;
+	top: 0;
+	left: 0;
+	right: auto;
+	bottom: auto;
+}
+.user-info-basic .gender.male {
+	border-color: #41B1D5 transparent transparent #41B1D5;
+}
+.user-info-basic .gender.female {
+	border-color: #DB186E transparent transparent #DB186E;
 }
 .user-info-roles {
 	padding: 20px;
@@ -655,7 +659,7 @@
 	margin-right: 10px;
 }
 .user-avatar .reflective {
-	background-image: url(img/reflective.png);
+	background-image: url(<%= asset_path 'reflective.png' %>);
 	background-repeat: no-repeat;
 	background-position: 0;
 	height: 80px;
@@ -663,7 +667,7 @@
 	position: absolute;
 }
 .user .user-avatar .reflective {
-	background-image: url(img/reflective.png);
+	background-image: url(<%= asset_path 'reflective.png' %>);
 	background-repeat: no-repeat;
 	background-position: 0 -20px;
 	height: 80px;
@@ -855,6 +859,7 @@
 .site-map .map-block ul {
 	margin: 0px;
 	list-style: none;
+	width: 220px \9;
 }
 .site-map .map-block li {
 	font-size: 12px;
@@ -929,6 +934,27 @@
     margin-top: 2px;
 }
 
+.modal.alert-error {
+	color: #B94A48;
+	background-color: #F2DEDE;
+	border-color: #EED3D7;
+}
+.news_paragraph p {
+    line-height: 20px;
+}
+.nav-tabs>li>.edit, .nav-tabs>li>.edit:hover {
+	background-color: #333;
+	color: #FFF;
+	padding-right: 12px;
+}
+.nav-tabs li .icons-pencil {
+	float: right;
+	margin-top: 8px;
+}
+.nav-tabs li a {
+	padding-right: 32px;
+}
+
 
 /*icons*/
 .the-icons i:after {