Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make toolbar use flex #311

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+77 −55
Open

Make toolbar use flex #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 76 additions & 54 deletions dist/infragram.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,106 +1,128 @@
/* https://github.com/theleagueof/junction */
@font-face {
font-family:'junctionregular';
src:url("https://raw.githubusercontent.com/theleagueof/junction/master/_webfonts/junction-webfont.eot");
src:url("https://raw.githubusercontent.com/theleagueof/junction/master/_webfonts/junction-webfont.eot?#iefix") format("embedded-opentype"),
url("https://raw.githubusercontent.com/theleagueof/junction/master/_webfonts/junction-webfont.woff") format("woff"),
url("https://raw.githubusercontent.com/theleagueof/junction/master/_webfonts/junction-webfont.ttf") format("truetype"),
url("https://raw.githubusercontent.com/theleagueof/junction/master/_webfonts/junction-webfont.svg#junctionregular") format("svg");
font-family: "junctionregular";
src: url("https://raw.githubusercontent.com/theleagueof/junction/master/_webfonts/junction-webfont.eot");
src: url("https://raw.githubusercontent.com/theleagueof/junction/master/_webfonts/junction-webfont.eot?#iefix")
format("embedded-opentype"),
url("https://raw.githubusercontent.com/theleagueof/junction/master/_webfonts/junction-webfont.woff")
format("woff"),
url("https://raw.githubusercontent.com/theleagueof/junction/master/_webfonts/junction-webfont.ttf")
format("truetype"),
url("https://raw.githubusercontent.com/theleagueof/junction/master/_webfonts/junction-webfont.svg#junctionregular")
format("svg");
}

h1,h2,h3,h4,h5,h6{
font-family: junctionregular, "lucida grande", "lucida sans console", sans-serif;
font-weight:normal
h1,
h2,
h3,
h4,
h5,
h6 {
font-family: junctionregular, "lucida grande", "lucida sans console",
sans-serif;
font-weight: normal;
}

body { padding-top: 20px; }
span.group { display: inline-block; }
body {
padding-top: 20px;
}
span.group {
display: inline-block;
}

footer.footer {
clear: both;
padding-top: 10px;
clear: both;
padding-top: 10px;
}

div#image-container {
text-align: center;
text-align: center;
}

div#image-container canvas#image {
margin: 0px auto;
margin: 0px auto;
}

div#colorbar-container {
display: inline-block;
width: 70%;
display: inline-block;
width: 70%;
}

div#colorbar-container canvas#colorbar {
width: 80%;
height: 2em;
vertical-align: middle;
width: 80%;
height: 2em;
vertical-align: middle;
}

#toolbar {
clear:both;
background:#eee;
margin-bottom:10px;
clear: both;
background: #eee;
display: flex;
justify-content: center;
width: 100%;
flex-wrap: wrap;
margin-bottom: 10px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;

}

#toolbar .zone {
margin:6px 0 6px 6px;
padding:0 12px 0 6px;
border-right:1px solid #ddd;
float:left;
}
#toolbar .zone.last {
border:none;
margin: 6px 0 6px 6px;
padding: 0 12px 0 6px;
border-right: 1px solid #ddd;
float: left;
}

#toolbar .zone p {
color:#bbb;
font-weight:bold;
font-size:10px;
margin-bottom:0;
color: #bbb;
font-weight: bold;
font-size: 10px;
margin-bottom: 0;
}

span#overlay-save-info {
display: block;
margin-left: auto;
margin-right: auto;
}

#image {
background:#ddd;
width:800px;
height:600px;
background: #ddd;
width: 800px;
height: 600px;
}

@media (max-width: 700px){
@media (max-width: 700px) {
#image {
width:100%;
height:auto;
width: 100%;
height: auto;
}
}
#overlay-container {
position:absolute;
display: inline-block;
overflow:hidden;
width:800px;
height:600px;
position: absolute;
display: inline-block;
overflow: hidden;
width: 800px;
height: 600px;
}

#overlay-save-btn {
margin-top:2px;
margin-top: 2px;
}

#overlay-img {
opacity:0.5;
opacity: 0.5;
}

ul.dropdown-menu li:hover{
ul.dropdown-menu li:hover {
cursor: pointer;
background-color: #e0e0e0;
}
#file-sel {
position:absolute;
left:0;
width:55px;
height:44px;
opacity:0;
position: absolute;
left: 0;
width: 55px;
height: 44px;
opacity: 0;
}
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ <h1><img src="assets/infragram-logo.png" alt="Infragram logo image." style="floa
<input id="overlay-slider" type="range" min="10" max="50" value="100"/>
<span id="overlay-size" style="color:#ccc;"></span>
<button id="overlay-save-btn" class="btn btn-primary">Save</button>
<br />
<span id="overlay-save-info" style="color:green; display: none;">Size saved!</span>
</div>
</div>
Expand All @@ -164,7 +165,6 @@ <h1><img src="assets/infragram-logo.png" alt="Infragram logo image." style="floa
<button onClick="openInSequencer()" type="button" class="btn btn-primary btn-lg">Export</button>
</div>

<br style="clear:both;" />

</div>

Expand Down