diff --git a/_layouts/default.html b/_layouts/default.html index dfefd4f..d407ba7 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -18,7 +18,7 @@ body{ -{% if page.collection == 'tracks' %} +{% if page.collection == 'tracks' or page.url == '/music/' %}
{{ content }}
diff --git a/_sass/isotope.scss b/_sass/isotope.scss index 002018f..e40fc0d 100644 --- a/_sass/isotope.scss +++ b/_sass/isotope.scss @@ -3,13 +3,14 @@ /* ---- button ---- */ .button { + display: inline-block; padding: 10px 18px; - margin-bottom: 10px; - background: #EEE; + margin: 0 10px 10px 0; + background: rgba(65, 106, 0, 0.473); border: none; - border-radius: 3px; - color: #222; + border-radius: 300px; + font-size: 16px; text-shadow: 0 1px white; transition: all .2s ease; @@ -23,7 +24,12 @@ .button:active, .button.is-checked { - background-color: #28F; + background: linear-gradient(230deg, rgba(255, 0, 255, 0.902), rgba(66, 107, 0, 0.902)); + background-size: 1000% 1000%; + + -webkit-animation: AnimationName 30s ease infinite; + -moz-animation: AnimationName 30s ease infinite; + animation: AnimationName 30s ease infinite; } .button.is-checked { @@ -37,16 +43,21 @@ /* ---- button-group ---- */ - - -.button-group .button:first-child { - border-radius: 0.5em 0 0 0.5em; -} - -.button-group .button:last-child { - border-radius: 0 0.5em 0.5em 0; +.button-group{ + display: flex; + flex-wrap: wrap; + justify-content: center; } +// .button-group .button:first-child { +// border-radius: 0.5em 0 0 0.5em; +// } + +// .button-group .button:last-child { +// border-radius: 0 0.5em 0.5em 0; +// } + + diff --git a/_sass/main.scss b/_sass/main.scss index bb72049..970c210 100644 --- a/_sass/main.scss +++ b/_sass/main.scss @@ -151,11 +151,9 @@ a:hover { .musiflex { display: flex; flex-wrap: wrap; + justify-content: center; margin: 0; padding: 0; - - - background-repeat: repeat; } .trackcontainer { @@ -292,6 +290,7 @@ min-height: 80vh; margin-bottom: auto; } #navigation { + z-index: 10000; position: fixed; bottom: 10px; right: 10px; diff --git a/_tracks/2006-04-06-badboys3.md b/_tracks/2006-04-06-badboys3.md index 093ed68..23d0e8f 100644 --- a/_tracks/2006-04-06-badboys3.md +++ b/_tracks/2006-04-06-badboys3.md @@ -12,7 +12,6 @@ categories: - reset - vocals - english - - test duration: 207000 --- diff --git a/music.html b/music.html index e84e37d..4def3bb 100644 --- a/music.html +++ b/music.html @@ -6,7 +6,7 @@ image: /assets/img/world.svg --- {% include navmenu.html %} -
+
@@ -82,4 +82,22 @@ image: /assets/img/world.svg $(this).addClass('is-checked'); }); }); - \ No newline at end of file + + \ No newline at end of file