Auto stash before merge of "responsive" and "origin/responsive"

parent da96e96e
......@@ -5,11 +5,11 @@
.chooser {
position: relative;
background: #333;
grid-column-start: 1;
grid-column-end: 1;
grid-row-start: 3;
grid-row-end: 5;
background-color: #f3f3f3;
}
.artworkArea {
......
......@@ -6,7 +6,8 @@ function Tabs(props) {
const classname = props.activeTab === props.id ? "active" : ""; //Check which tab is active and prepares value for className
return(
<div id={props.id} onClick = {props.onClick} className={classname}>Category{parseInt(props.id)+1}</div>
<div id={this.props.id} onClick = {this.props.onClick} className={classname}>Combo {parseInt(this.props.id)+1}</div>
)
}
......
/* Add a black background color to the top navigation */
.navbar {
background-color: #333;
overflow: hidden;
width: 100%;
background-color: #333;
overflow: hidden;
width: 100%;
}
/* Style the links inside the navigation bar */
.navbar div {
float: left;
color: #f2f2f2;
text-align: center;
padding: 14px 16px;
text-decoration: none;
font-size: 17px;
font-family: "Helvetica";
float: left;
color: #f2f2f2;
text-align: center;
padding: 14px 16px;
text-decoration: none;
font-size: 17px;
font-family: "Helvetica";
}
/* Change the color of links on hover */
.navbar div:hover {
background-color: #ddd;
color: black;
background-color: #ddd;
color: black;
cursor: pointer;
}
/* Add a color to the active/current link */
.navbar div.active {
background-color: #A20C25;
color: white;
background-color: #A20C25;
color: white;
}
......@@ -10,6 +10,14 @@
-ms-appearance: radio;
}
.Category-component > input:hover {
cursor: pointer;
}
.Category-component > label {
margin: 0 0 0 5px;
}
.Category-component > label:hover {
cursor: pointer;
}
\ No newline at end of file
......@@ -2,7 +2,6 @@
display: grid;
padding-top: 40%;
width: 100%;
font-family: sans-serif;
}
@media screen and (max-width: 960px) {
......
......@@ -6,9 +6,9 @@
margin: 10px;
padding: 5px;
font-size: 1rem;
background: white;
background: #A20C25;
color: white;
border: none;
box-shadow: 0 0 3px goldenrod;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
......
......@@ -2,8 +2,16 @@
width: 60%;
margin: 10px auto;
border-radius: 5px;
color: white;
}
.Media-component h3 {
color: white;
margin: 3px 3px;
}
@media screen and (max-width: 480px) {
.Media-component {
width: 80%;
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment