aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/static
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/static')
-rw-r--r--mediagoblin/static/css/audio.css3
-rw-r--r--mediagoblin/static/css/base.css75
l---------mediagoblin/static/extlib/video-js2
-rw-r--r--mediagoblin/static/images/small-gavroche.pngbin0 -> 4599 bytes
-rw-r--r--mediagoblin/static/images/small-gavroche.xcfbin0 -> 392752 bytes
l---------mediagoblin/static/js/extlib/html5slider.js1
l---------mediagoblin/static/js/extlib/jquery.js2
7 files changed, 74 insertions, 9 deletions
diff --git a/mediagoblin/static/css/audio.css b/mediagoblin/static/css/audio.css
index e007a0e1..5c50e727 100644
--- a/mediagoblin/static/css/audio.css
+++ b/mediagoblin/static/css/audio.css
@@ -1,6 +1,9 @@
.audio-spectrogram {
position: relative;
}
+.audio-spectrogram > img {
+ width: 100%;
+}
.playhead {
position: absolute;
top: 0;
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 0bd58738..f8726708 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -25,7 +25,7 @@
src: local('Lato Regular'), local('Lato-Regular'), url('../fonts/Lato-Regular.ttf') format('truetype');
}
-body {
+html, body {
background-color: #161616;
color: #C3C3C3;
padding: 0;
@@ -110,6 +110,23 @@ input, textarea {
/* website structure */
+#wrap {
+ min-height: 100%;
+ height: auto;
+
+ /* This must be equal to the footer height + 5px */
+ margin-bottom: -35px;
+}
+
+#wrap:after {
+ content: "";
+ display: block;
+}
+
+footer, #wrap:after {
+ height: 30px;
+}
+
header {
width: 100%;
padding: 0;
@@ -176,9 +193,7 @@ a.logo {
footer {
width: 100%;
- height: 30px;
border-top: 1px solid #333;
- bottom: 0px;
padding: 8px 0;
text-align: center;
font-size: 0.875em;
@@ -196,14 +211,20 @@ footer {
}
.media_image_container {
- display: flex;
- justify-content: center;
}
.media_image {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
max-width: 100%;
}
+.media_other_container {
+ display: flex;
+ justify-content: center;
+}
+
.media_pane {
/* in place for possible future wide view */
/* border-bottom: 1px solid #333333;*/
@@ -872,7 +893,12 @@ pre {
margin-left:3px;
margin-right:3px;
}
+ #thingy_view {
+ width:640px;
+ height:640px;
+ }
}
+
/* Tablet Portrait size to standard 960 (devices and browsers) */
@media only screen and (min-width: 768px) and (max-width: 959px) {
.container .three.columns.media_thumbnail {
@@ -881,7 +907,7 @@ pre {
margin-right:2px;
}
.media_thumbnail.thumb_entry img {
- margin-left: -16.5px;
+ max-width:100%;
}
.thumb_gallery {
margin-left: 0;
@@ -889,7 +915,12 @@ pre {
}
.navigation_button {
}
+ #thingy_view {
+ width:508px;
+ height:508px;
+ }
}
+
/* All Mobile Sizes (devices and browser) */
@media screen and (max-width: 767px) {
.thumb_row {
@@ -931,6 +962,22 @@ pre {
}
}
+/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
+@media only screen and (min-width: 480px) and (max-width: 767px) {
+ #thingy_view {
+ width:420px;
+ height:420px;
+ }
+}
+
+/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
+@media only screen and (max-width: 479px) {
+ #thingy_view {
+ width:300px;
+ height:300px;
+ }
+}
+
p.verifier {
text-align:center;
font-size:50px;
@@ -950,3 +997,19 @@ table.metadata_editor tr td {
table.metadata_editor tr td.form_field_input input {
width:350px;
}
+
+.application {
+ min-height: 30px;
+ margin-left: 70px;
+}
+
+.application-icon {
+ position: absolute;
+ left: 12px;
+ width: 50px;
+ height: 50px;
+}
+
+.application-button {
+ float: right;
+}
diff --git a/mediagoblin/static/extlib/video-js b/mediagoblin/static/extlib/video-js
index 65652d6e..58401be0 120000
--- a/mediagoblin/static/extlib/video-js
+++ b/mediagoblin/static/extlib/video-js
@@ -1 +1 @@
-../../../extlib/video-js/ \ No newline at end of file
+../../../extlib/video.js/dist/video-js \ No newline at end of file
diff --git a/mediagoblin/static/images/small-gavroche.png b/mediagoblin/static/images/small-gavroche.png
new file mode 100644
index 00000000..13192d97
--- /dev/null
+++ b/mediagoblin/static/images/small-gavroche.png
Binary files differ
diff --git a/mediagoblin/static/images/small-gavroche.xcf b/mediagoblin/static/images/small-gavroche.xcf
new file mode 100644
index 00000000..0291d2e1
--- /dev/null
+++ b/mediagoblin/static/images/small-gavroche.xcf
Binary files differ
diff --git a/mediagoblin/static/js/extlib/html5slider.js b/mediagoblin/static/js/extlib/html5slider.js
deleted file mode 120000
index feae2cb8..00000000
--- a/mediagoblin/static/js/extlib/html5slider.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../extlib/html5slider/html5slider.js \ No newline at end of file
diff --git a/mediagoblin/static/js/extlib/jquery.js b/mediagoblin/static/js/extlib/jquery.js
index d78f5cc3..8c711f27 120000
--- a/mediagoblin/static/js/extlib/jquery.js
+++ b/mediagoblin/static/js/extlib/jquery.js
@@ -1 +1 @@
-../../../../extlib/jquery/jquery.js \ No newline at end of file
+../../../../extlib/jquery/dist/jquery.js \ No newline at end of file