253 src/apps/main/assets/css/style.css → src/apps/main/assets/css/main.scss
View file
@@ -1,4 +1,9 @@
@import url("https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css");
@import url("https://fonts.googleapis.com/css?family=Roboto:100,300,400,700,900");
@import url("https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css");


// =================================== [ UNIVERSAL STYLES ]

body {
font-family: "Roboto", sans-serif;
@@ -8,27 +13,17 @@ body {
height: 100%;
}

hr.style1 {
border-top: 1px solid #8c8b8b;
}

.top-banner {
background-color: #f7f6f6;
height: 15%;
padding-left: 20%;
padding-right: 20%;
a {
text-decoration: none;
font-color: "#ff5d55";
}

.top-banner-login {
height: 10%;
padding-left: 20%;
padding-right: 20%;
a:hover{
text-decoration:none;
}

.top-banner-each {
padding-top: 5%;
padding-bottom: 5%;
text-align:center;
hr.style1 {
border-top: 1px solid #8c8b8b;
}

.btn-teal {
@@ -69,74 +64,17 @@ hr.style1 {
background-color: #ff3823;
}

.front-splash {
text-align: center;
padding: 100;
}

h1.front-splash-font {
font-size: 72px;
font-weight: bold;
margin-bottom: 5%;
color: "#f7f6f6" !important;
}

#search {
border: 0px;
border-radius: 15px;
font-size: 20px;
padding: 15px;
boxShadow: 0px;
width: 300px;
opacity: 0.5;
background-color: "white";
display: inline;
}

.login {
text-align: center;
padding-top: 5%;
}

input:focus, button:focus {
outline: none;
}

.clubprofileheader {
margin-top: 50pt;
margin-bottom: 30pt;
}

.clubprofilelogo {
max-width: 256px;
}

.clubprofilename {
font-size: 30pt;
font-weight: bold;
}

.clubprofilesection {
margin-bottom: 30pt;
}
// =================================== [ HOMEPAGE ]

h1.clubprofilesection {
color: #00bcd4;
font-weight: bold;
}

hr.clubprofilesection {
border-style: solid;
}

p.clubprofilesection {
color: #000000;
margin: 0 0 0 0;
font-weight: normal;
.front-splash {
text-align: center;
padding: 100;
}

/* HomePage CSS */

.home-initial-picture {
height: "50%";
background-image: url("../images/homepage/front.jpg");
@@ -197,6 +135,11 @@ p.clubprofilesection {
height: 8%;
}

.pic-sizes {
max-height: 100%;
max-width: 100%;
}

.background-cover-center {
background-size: cover;
background-repeat: no-repeat;
@@ -244,24 +187,162 @@ p.clubprofilesection {
color: "white";
}

a {
text-decoration: none;
font-color: "#ff5d55";
h1.front-splash-font {
font-size: 72px;
font-weight: bold;
margin-bottom: 5%;
color: "#f7f6f6" !important;
}

a:hover{
text-decoration:none;
.top-banner {
background-color: #f7f6f6;
height: 15%;
padding-left: 20%;
padding-right: 20%;
}

.pic-sizes {
max-height: 100%;
max-width: 100%;
.top-banner-login {
height: 10%;
padding-left: 20%;
padding-right: 20%;
}

.top-banner-each {
padding-top: 5%;
padding-bottom: 5%;
text-align:center;
}

// is this even used for anything?
#search {
border: 0px;
border-radius: 15px;
font-size: 20px;
padding: 15px;
box-shadow: 0px;
width: 300px;
opacity: 0.5;
background-color: "white";
display: inline;
}

// =================================== [ HEADER ]

.header-explore {
font-weight: 700;
font-size: 1.2em;
}

.header-find {
font-weight: 300;
font-size: 1.2em;
}

.header-main a {
color: #ff5d55;
}

.header-signup a {
color: #ffffff;
}

// is this used?
.header-login {
text-align: center;
padding-top: 5%;
}

.header-clubprofile {
margin-top: 50pt;
margin-bottom: 30pt;
}

// =================================== [ CLUB PROFILE ]


.clubprofile-logo {
max-width: 256px;
}

.clubprofile-name {
font-size: 30pt;
font-weight: bold;
}

.clubprofile-section {
margin-bottom: 30pt;
}

h1.clubprofilesection {
color: #00bcd4;
font-weight: bold;
}

hr.clubprofile-section {
border-style: solid;
}

p.clubprofile-section {
color: #000000;
margin: 0 0 0 0;
font-weight: normal;
}

// is this even used?
#advanced-search {
font-size: 20px;
background: transparent;
border: none;
border-bottom: 5px solid #72bec9;
width: 90%;
}

// =================================== [ SEARCH RESULTS ]


.searchresults-box {
box-shadow: 10px 10px 15px #aaaaaa;
padding: 20px 0px 20px 40px;
margin: 0px 0px 20px 0px;
color: #ffffff;
}

.searchresults-categories {
background-color: #72bec9;
}

.searchresults-vibes {
background-color: #e16e69;
}

// =================================== [ JOIN US ]

.joinus-signUpButton {
margin-bottom: 25px;
padding: 15px 0px 15px 0px;
width: 100%;
display: block;
color: white;
font-size: 1.2em;
box-shadow: 5px 5px 20px gray;
}

#joinus-facebook {
background-color: #037aff;
}

#joinus-google {
background-color: #eb4a45;
}

#joinus-uci {
background-color: #2196f3;
}

.joinus {
background-image: url("../images/joinus/treecamp.jpg");
background-size: cover;
height: 100%;
width: 100%;
position: fixed;
}
3 src/apps/main/assets/css/search.css
View file

This file was deleted.

28 src/apps/main/assets/css/signup.scss
View file

This file was deleted.

BIN +6 KB src/apps/main/assets/images/.DS_Store
View file
Binary file not shown.
BIN -39.1 KB src/apps/main/assets/images/search-icon.png
View file
Deleted file not rendered
9 src/apps/main/components/Header.js
View file
@@ -2,8 +2,7 @@

import React, { Component } from "react";
import { Row, Col, Button } from "reactstrap";
import logo from "../assets/images/site-logo/entirelogo.png";
import "../assets/css/header.scss";
import logo from "../assets/images/site-logo/clubtree-stroke.png";
import PropTypes from "prop-types";

export default class Header extends Component {
@@ -18,9 +17,9 @@ export default class Header extends Component {
generateLinkStyle = (type) => {
switch (type) {
case "signup":
return "signup";
return "header-signup";
default:
return "main";
return "header-main";
}
}

@@ -33,7 +32,7 @@ export default class Header extends Component {
</Col>
<Col>
<span className={this.generateLinkStyle(this.props.type)}>
<span className="explore"><a href="/search">EXPLORE</a></span>&nbsp; | &nbsp;<span className="find"><a href="/advancedsearch">FEATURED</a></span>
<span className="header-explore"><a href="/search">EXPLORE</a></span>&nbsp; | &nbsp;<span className="header-find"><a href="/advancedsearch">FEATURED</a></span>
</span>
</Col>
{ (this.props.type !== "signup") ?
7 src/apps/main/components/SignUp/ChooseSignUpOption.js
View file
@@ -1,15 +1,14 @@
/* @flow */

import React, { Component } from "react";
import "../../assets/css/signup.scss";

export default class ChooseSignUpOption extends Component {
render () {
return (
<div>
<button className="btn signUpButton" id="facebook">Join us with Facebook</button>
<button className="btn signUpButton" id="google">Join us with Google</button>
<button className="btn signUpButton" id="uci">Join us with your UC Irvine ID</button>
<button className="btn joinus-signUpButton" id="joinus-facebook">Join us with Facebook</button>
<button className="btn joinus-signUpButton" id="joinus-google">Join us with Google</button>
<button className="btn joinus-signUpButton" id="joinus-uci">Join us with your UC Irvine ID</button>
</div>
);
}
2 src/apps/main/containers/AdvancedSearch.js
View file
@@ -4,8 +4,6 @@ import React, { Component } from "react";
import { bindActionCreators } from "redux";
import { connect } from "react-redux";
import Helmet from "react-helmet";
import "compiled/bootstrap/dist/css/bootstrap.css";
import "../assets/css/style.css";

import Header from "../components/Header";
import SearchBar from "../components/SearchBar";
3 src/apps/main/containers/ClubCreation.js
View file
@@ -4,9 +4,6 @@ import React, { Component } from "react";
import { bindActionCreators } from "redux";
import { connect } from "react-redux";
import Helmet from "react-helmet";
import "compiled/bootstrap/dist/css/bootstrap.css";
import "../assets/css/style.css";

import Header from "../components/Header";

import Step1 from "../components/ClubCreation/Step1";
2 src/apps/main/containers/ClubProfile.js
View file
@@ -4,8 +4,6 @@ import React, { Component } from "react";
import { bindActionCreators } from "redux";
import { connect } from "react-redux";
import Helmet from "react-helmet";
import "compiled/bootstrap/dist/css/bootstrap.css";
import "../assets/css/style.css";

import Header from "../components/Header";
import ProfileHeader from "../components/ClubProfile/ProfileHeader";
1 src/apps/main/containers/HomeApp.js
View file
@@ -4,7 +4,6 @@ import React, { Component } from "react";
import { bindActionCreators } from "redux";
import { connect } from "react-redux";
import Helmet from "react-helmet";
import "compiled/bootstrap/dist/css/bootstrap.css";

import FrontPage from "../components/FrontPage";

4 src/apps/main/containers/SearchResults.js
View file
@@ -5,10 +5,6 @@ import { bindActionCreators } from "redux";
import { connect } from "react-redux";
import Helmet from "react-helmet";
import { Row, Col } from "reactstrap";

import "compiled/bootstrap/dist/css/bootstrap.css";
import "../assets/css/search.css";

import Header from "../components/Header";
import CategoriesCheckbox from "../components/SearchResults/CategoriesCheckbox";
import VibeSelector from "../components/VibeSelector";
4 src/apps/main/containers/SignUp.js
View file
@@ -7,8 +7,6 @@ import Helmet from "react-helmet";

import Header from "../components/Header";
import ChooseSignUpOption from "../components/SignUp/ChooseSignUpOption";
import "compiled/bootstrap/dist/css/bootstrap.css";
import "../assets/css/signup.scss";

export class SignUp extends Component {
/**
@@ -45,7 +43,7 @@ export class SignUp extends Component {

render () {
return (
<div>
<div className="joinus">
<Helmet title="SignUp"/>
<Header type="signup"/>
<div style={{