Front end and api #42

Merged
bones7242 merged 6 commits from front-end-and-api into master 2017-06-27 04:43:38 +02:00
3 changed files with 83 additions and 35 deletions
Showing only changes of commit 135a0c5e46 - Show all commits

View file

@ -25,6 +25,18 @@
width: 22%;
}
footer {
width: 100%;
margin-bottom: 2px;
padding-bottom: 2px;
border-bottom: 1px lightgrey solid;
margin-top: 2px;
padding-top: 2px;
border-top: 1px lightgrey solid;
text-align: center;
color: grey;
}
/* panels */
.panel {
@ -83,3 +95,57 @@ h4 {
.toggle-link {
float: right;
}
@media (max-width: 1250px) {
.wrapper {
margin-left: 10%;
width:80%;
}
}
@media (max-width: 1000px) {
.wrapper {
margin-left: 10%;
width:80%;
}
.main {
float: none;
width: 100%;
margin-right: 0px;
padding-right: 0px;
border-right: 0px;
margin-bottom: 5px;
}
.sidebar {
float: none;
width: 100%;
}
}
@media (max-width: 750px ) {
.col-left, .col-right {
float: none;
margin: 0px;
padding: 0px;
width: 100%;
}
.col-right {
padding-top: 20px;
}
}
@media (max-width: 475px) {
.wrapper {
margin: 0px;
width: 100%;
}
}

View file

@ -25,24 +25,6 @@
margin: 5px 15px 5px 0px;
}
/* meme */
canvas {
background-color: white;
width: 100%;
height: auto;
}
/* publish */
#drop-zone {
border: 1px dashed lightgrey;
padding: 1em;
height: 6em;
}
#image-preview {
display: none;
}
/* all claims */
.all-claims-item {
@ -58,21 +40,23 @@ canvas {
margin: 5px 30px 5px 0px;
}
/* footer */
footer {
width: 100%;
margin-bottom: 2px;
padding-bottom: 2px;
border-bottom: 1px lightgrey solid;
margin-top: 2px;
padding-top: 2px;
border-top: 1px lightgrey solid;
text-align: center;
color: grey;
/* publish */
#drop-zone {
border: 1px dashed lightgrey;
padding: 1em;
height: 6em;
}
/* meme fodder */
#image-preview {
display: none;
}
/* meme */
canvas {
background-color: white;
width: 100%;
height: auto;
}
.meme-fodder-img {
width: 21%;

View file

@ -15,13 +15,11 @@
<input type="text" id="publish-name" placeholder="Your claim name" class="form-control">
<p>
<label for="publish-license">License:</label>
<br/>
<select type="text" id="publish-license" name="license" value="license">
<option value="Public Domain">Public Domain</option>
<option value="Creative Commons">Creative Commons</option>
</select>
</p>
<p>
<br />
<input type="checkbox" id="publish-nsfw">
<label for="publish-nsfw">NSFW</label>
</p>