Skip to content

added things #21

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

Open
honeycomb80 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added things #21

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
7 changes: 7 additions & 0 deletions app/assets/javascripts/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
$(document).ready(function(){
$('newreleasebox').animate({top:'+=10em'},500);
});




// $(document).ready(funciton(){
// $('.albumbox').perfectScrollbar('update');
// });
Expand Down
34 changes: 18 additions & 16 deletions app/assets/stylesheets/application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,18 @@ body {
font-family: 'Signika', sans-serif;
font-size: 1.5em;
text-align: center;
width: 49%;
width: 49.5%;
/*border-radius: .3em;*/
border: 2px, rgba(192, 57, 43, 1);
position: absolute;
right: 33%;
top: 2.35em;
right: 40%;
top: 3em;
}

.button {
position: absolute;
right: 22%;
top: 3.3em;
right: 29%;
top: 4.3em;
font-family: 'Signika', sans-serif;
font-size: 1.1em;
height: 1.8em;
Expand All @@ -142,8 +142,8 @@ body {
position: absolute;
width: 61%;
height: 10em;
top: 6.2em;
left: 17.5%;
top: 8em;
left: 10%;
background-color: rgba(189,189,189,.8);
z-index: -1;
/*border-radius: .5em;*/
Expand All @@ -157,14 +157,15 @@ body {
/*line-height: 1.5;*/
font-size: 2em;
left: 1%;
top: -10%;
}

.concertsbox {
position: absolute;
width: 61%;
height: 15em;
top: 16.6em;
left: 17.5%;
top: 19em;
left: 10%;
background-color: rgba(189,189,189,.8);
z-index: -1;
/*border-radius: .5em;*/
Expand All @@ -177,12 +178,12 @@ body {
}

#map-canvas {
top: 16.6em;
top: 19em;
position: absolute;
height: 15em;
width: 15em;
float: right;
right: 21.5%;
right: 29%;
/*margin-top: 340px;*/
/*padding: 20px;*/

Expand All @@ -201,8 +202,8 @@ body {
position: absolute;
width: 61%;
height: 10em;
top: 27.1em;
left: 17.5%;
top: 8em;
left: 10%;
background-color: rgba(189,189,189,.8);
z-index: -1;
/*border-radius: .5em;*/
Expand Down Expand Up @@ -255,11 +256,12 @@ body {
position: absolute;
width: 61%;
height: 11em;
top: 47.1em;
left: 17.5%;
top: 35em;
left: 10%;
background-color: rgba(189,189,189,.8);
z-index: -1;
/*border-radius: .5em;*/
overflow: scroll;
overflow-x: scroll;
overflow-y: hidden;
/*text-overflow: ellipsis;*/
}
13 changes: 7 additions & 6 deletions app/views/bands/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
<button class="button" id="submit" type="submit">Add</button>
</form>

<div class="albumbox">
<h2 class="headline1" id='albumheader'>New Artist's Albums</h2>
<div class="albumlist">
<ul id='albums'></ul>
</div>
</div>

<div class="newreleasebox">
<h2 class="headline1">New Releases</h2>
<ul class= "recentalbums" id='recentalbums'></ul>
Expand All @@ -24,12 +31,6 @@
</div>
</div>

<div class="albumbox">
<h2 class="headline1" id='albumheader'>New Artist's Albums</h2>
<div class="albumlist">
<ul id='albums'></ul>
</div>
</div>
</div>
<br>
<br>
Expand Down