Resolve Merge
This commit is contained in:
parent
775b6f9bee
commit
500785d867
@ -1,16 +1,16 @@
|
|||||||
.text-large {
|
.text-large {
|
||||||
font-size: 1.2rem;
|
font-size: 1.2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-very-large {
|
.text-very-large {
|
||||||
font-size: 2.4rem;
|
font-size: 2.4rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* show content beneath sidebar */
|
/* show content beneath sidebar */
|
||||||
.content {
|
.content {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: left;
|
float: left;
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
width: 80%;
|
width: 80%;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user